5.4.0-beta.2: iOS 180, Android 159, Desktop 15

* android, desktop: support calls on desktop and moved www dir to different root

* add page title, fix links on Android, change timeouts

* using worker in desktop Chrome and Safari

* ui changes

* end call button in app bar

* fix android

* a lot of enhancements

* fix after merge master

* layout

* sound play on call

---------

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,7 +1,7 @@
 name: Bug
 description: File a bug report/issue
 title: "[Bug]: "
-labels: ["type:bug", "type:triage"]
+labels: ["bug", "triage"]
 body:
 - type: checkboxes
   attributes:

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,7 +1,7 @@
 name: Feature
 description: Suggest your feature
 title: "[Feature]: "
-labels: ["type:enhancement", "type:triage"]
+labels: ["enhancement", "triage"]
 body:
 - type: checkboxes
   attributes:

.github/ISSUE_TEMPLATE/question.yml

@@ -1,7 +1,7 @@
 name: Question
 description: Ask your question
 title: "[Q]: "
-labels: ["type:question", "type:triage"]
+labels: ["question", "triage"]
 body:
 - type: markdown
   attributes:

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
       - users
     tags:
       - "v*"
+      - "!*-fdroid"
   pull_request:
 
 jobs:
@@ -16,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build changelog
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v1
+        uses: mikepenz/release-changelog-builder-action@v4
         with:
           configuration: .github/changelog_conf.json
           failOnError: true
@@ -52,15 +53,19 @@ jobs:
           - os: ubuntu-20.04
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-20_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-20_04-x86_64.deb
           - os: ubuntu-22.04
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-ubuntu-22_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
           - os: macos-latest
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-macos-x86-64
+            desktop_asset_name: simplex-desktop-macos-x86_64.dmg
           - os: windows-latest
             cache_path: C:/cabal
             asset_name: simplex-chat-windows-x86-64
+            desktop_asset_name: simplex-desktop-windows-x86_64.msi
     steps:
       - name: Configure pagefile (Windows)
         if: matrix.os == 'windows-latest'
@@ -71,16 +76,16 @@ jobs:
           disk-root: "C:"
 
       - name: Clone project
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v1
+        uses: haskell-actions/setup@v2
         with:
-          ghc-version: "8.10.7"
-          cabal-version: "latest"
+          ghc-version: "9.6.2"
+          cabal-version: "3.10.1.0"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ${{ matrix.cache_path }}
@@ -99,6 +104,10 @@ jobs:
           echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
           echo "    flags: +openssl"                                        >> cabal.project.local
 
+      - name: Install AppImage dependencies
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        run: sudo apt install -y desktop-file-utils
+
       - name: Install pkg-config for Mac
         if: matrix.os == 'macos-latest'
         run: brew install pkg-config
@@ -111,13 +120,135 @@ jobs:
           echo "package direct-sqlcipher" >> cabal.project.local
           echo "    flags: +openssl"      >> cabal.project.local
 
-      - name: Unix build
-        id: unix_build
+      - name: Unix build CLI
+        id: unix_cli_build
         if: matrix.os != 'windows-latest'
         shell: bash
         run: |
           cabal build --enable-tests
-          echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)"
+          path=$(cabal list-bin simplex-chat)
+          echo "bin_path=$path" >> $GITHUB_OUTPUT
+          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+
+      - name: Unix upload CLI binary to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.unix_cli_build.outputs.bin_path }}
+          asset_name: ${{ matrix.asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Unix update CLI binary hash
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          append_body: true
+          body: |
+            ${{ steps.unix_cli_build.outputs.bin_hash }}
+
+      - name: Setup Java
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Linux build desktop
+        id: linux_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        shell: bash
+        run: |
+          scripts/desktop/build-lib-linux.sh
+          cd apps/multiplatform
+          ./gradlew packageDeb
+          path=$(echo $PWD/release/main/deb/simplex_*_amd64.deb)
+          echo "package_path=$path" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+      
+      - name: Linux make AppImage
+        id: linux_appimage_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        shell: bash
+        run: |
+          scripts/desktop/make-appimage-linux.sh
+          path=$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)
+          echo "appimage_path=$path" >> $GITHUB_OUTPUT
+          echo "appimage_hash=$(echo SHA2-512\(simplex-desktop-x86_64.AppImage\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+
+      - name: Mac build desktop
+        id: mac_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        shell: bash
+        env:
+          APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
+          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
+          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
+        run: |
+          scripts/ci/build-desktop-mac.sh
+          path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
+          echo "package_path=$path" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+
+      - name: Linux upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.linux_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Linux update desktop package hash
+        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          append_body: true
+          body: |
+            ${{ steps.linux_desktop_build.outputs.package_hash }}
+
+      - name: Linux upload AppImage to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.linux_appimage_build.outputs.appimage_path }}
+          asset_name: simplex-desktop-x86_64.AppImage
+          tag: ${{ github.ref }}
+
+      - name: Linux update AppImage hash
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04'
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          append_body: true
+          body: |
+            ${{ steps.linux_appimage_build.outputs.appimage_hash }}
+
+      - name: Mac upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.mac_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Mac update desktop package hash
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          append_body: true
+          body: |
+            ${{ steps.mac_desktop_build.outputs.package_hash }}
 
       - name: Unix test
         if: matrix.os != 'windows-latest'
@@ -125,33 +256,25 @@ jobs:
         shell: bash
         run: cabal test --test-show-details=direct
 
-      - name: Unix upload binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.unix_build.outputs.bin_path }}
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
-
       # Unix /
 
       # / Windows
-
-      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
-      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
+      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
 
       - name: Windows build
         id: windows_build
         if: matrix.os == 'windows-latest'
-        shell: cmd
+        shell: bash
         run: |
+          rm -rf dist-newstyle/src/direct-sq*
+          sed -i "s/, unix /--, unix /" simplex-chat.cabal
           cabal build --enable-tests
-          cabal list-bin simplex-chat > tmp_bin_path
-          set /p bin_path= < tmp_bin_path
-          echo ::set-output name=bin_path::%bin_path%
+          rm -rf dist-newstyle/src/direct-sq*
+          path=$(cabal list-bin simplex-chat | tail -n 1)
+          echo "bin_path=$path" >> $GITHUB_OUTPUT
+          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
-      - name: Windows upload binary to release
+      - name: Windows upload CLI binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
         uses: svenstaro/upload-release-action@v2
         with:
@@ -160,4 +283,47 @@ jobs:
           asset_name: ${{ matrix.asset_name }}
           tag: ${{ github.ref }}
 
+      - name: Windows update CLI binary hash
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          append_body: true
+          body: |
+            ${{ steps.windows_build.outputs.bin_hash }}
+
+      - name: Windows build desktop
+        id: windows_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        env:
+          SIMPLEX_CI_REPO_URL: ${{ secrets.SIMPLEX_CI_REPO_URL }}
+        shell: bash
+        run: |
+          scripts/desktop/build-lib-windows.sh
+          cd apps/multiplatform
+          ./gradlew packageMsi
+          path=$(echo $PWD/release/main/msi/*imple*.msi | sed 's#/\([a-z]\)#\1:#' | sed 's#/#\\#g')
+          echo "package_path=$path" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+      
+      - name: Windows upload desktop package to release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.windows_desktop_build.outputs.package_path }}
+          asset_name: ${{ matrix.desktop_asset_name }}
+          tag: ${{ github.ref }}
+
+      - name: Windows update desktop package hash
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          append_body: true
+          body: |
+            ${{ steps.windows_desktop_build.outputs.package_hash }}
+
       # Windows /

.github/workflows/web.yml

@@ -9,6 +9,7 @@ on:
       - website/**
       - images/**
       - blog/**
+      - docs/**
       - .github/workflows/web.yml
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -53,6 +53,7 @@ website/src/docs/
 website/translations.json
 website/src/img/images/
 website/src/images/
+website/src/js/lottie.min.js
 # Generated files
 website/package/generated*
 

Dockerfile

@@ -8,12 +8,12 @@ RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/
     chmod +x /usr/bin/ghcup
 
 # Install ghc
-RUN ghcup install ghc 8.10.7
+RUN ghcup install ghc 9.6.2
 # Install cabal
-RUN ghcup install cabal
+RUN ghcup install cabal 3.10.1.0
 # Set both as default
-RUN ghcup set ghc 8.10.7 && \
-    ghcup set cabal
+RUN ghcup set ghc 9.6.2 && \
+    ghcup set cabal 3.10.1.0
 
 COPY . /project
 WORKDIR /project

PRIVACY.md

@@ -6,27 +6,63 @@ If you believe that some of the clauses in this document are not aligned with ou
 
 ## Privacy Policy
 
-SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and end-to-end encryption to provide secure end-to-end encrypted messaging via private connections. SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol that allows establishing private connection without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
+SimpleX Chat Ltd. ("SimpleX Chat") uses the best industry practices for security and encryption to provide secure [end-to-end encrypted](./docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the servers via [man-in-the-middle attack](./docs/GLOSSARY.md#man-in-the-middle-attack).
 
-SimpleX Chat security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
+SimpleX Chat is built on top of SimpleX messaging and application platform that uses a new message routing protocol allowing to establish private connections without having any kind of addresses that identify its users - we don't use emails, phone numbers, usernames, identity keys or any other user identifiers to pass messages between the users.
+
+SimpleX Chat security assessment was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
 ### Information you provide
 
-We do not store user profiles. The profile you create in the app is local to your device. When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
+#### User profiles
 
-Messages. SimpleX Chat cannot decrypt or otherwise access the content or even size of your messages (each message is padded to a fixed size of 16kb). SimpleX Chat temporarily stores end-to-end encrypted messages on its servers for delivery to the devices that are offline, these messages are permanently removed as soon as they are delivered. Your message history is stored only on your own devices.
+We do not store user profiles. The profile you create in the app is local to your device.
 
-Connections with other users. When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on our servers, or on the servers that you configured in the app, in case it allows such configuration (SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default). At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by a set of anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages. The exception to that is when you choose to use instant push notifications in our iOS app, because the design of push notifications requires storing the device token on notification server, and the server can observe how many messaging queues your device uses, and approximate how many messages are sent to each queue. It does not allow though to determine the actual addresses of these queues, as a separate address is used to subscibe to the notifications (unless notification and messaging servers exchange information), and who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers. It also does not allow to see message content or sizes, as the actual messages are not sent via the notification service, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot see it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
+When you create a user profile, no records are created on our servers, and we have no access to any part of your profile information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all the data and the private connections you create with other users.
+
+#### Messages and Files
+
+SimpleX Chat cannot decrypt or otherwise access the content or even the size of your messages and files you send or receive. Each message is padded to a fixed size of 16kb. Each file is sent in chunks of 256kb, 1mb or 8mb via all or some of the configured file servers. Both messages and files are sent end-to-end encrypted, and the servers do not have technical means to compromise this encryption, because part of the [key exchange](./docs/GLOSSARY.md#key-exchange) happens out-of-band.
+
+Your message history is stored only on your own device and the devices of your contacts. While the recipients' devices are offline SimpleX Chat temporarily stores end-to-end encrypted messages on the messaging (SMP) servers that are preset in the app or chosen by the users.
+
+The messages are permanently removed from the preset servers as soon as they are delivered. Undelivered messages are deleted after the time that is configured in the messaging servers you use (21 days for preset messaging servers).
+
+The files are stored on file (XFTP) servers for the time configured in the file servers you use (48 hours for preset file servers).
+
+If a messaging or file servers are restarted, the encrypted message or the record of the file can be stored in a backup file until it is overwritten by the next restart (usually within 1 week).
+
+#### Connections with other users
+
+When you create a connection with another user, two messaging queues (you can think about them as about mailboxes) are created on chosen messaging servers, that can be the preset servers or the servers that you configured in the app, in case it allows such configuration. SimpleX uses separate queues for direct and response messages, that the client applications prefer to create on two different servers, in case you have more than one server configured in the app, which is the default.
+
+At the time of updating this document all our client applications allow configuring the servers. Our servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow us to establish that these queues are related to your device or your profile - the access to each queue is authorized by two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.
+
+#### iOS Push Notifications
+
+When you choose to use instant push notifications in SimpleX iOS app, because the design of push notifications requires storing the device token on notification server, the notifications server can observe how many messaging queues your device has notifications enabled for, and approximately how many messages are sent to each queue.
+
+Notification server cannot observe the actual addresses of these queues, as a separate address is used to subscribe to the notifications. It also cannot observe who, or even how many contacts, send messages to you, as notifications are delivered to your device end-to-end encrypted by the messaging servers.
+
+It also does not allow to see message content or sizes, as the actual messages are not sent via the notification server, only the fact that the message is available and where it can be received from (the latter information is encrypted, so that the notification server cannot observe it). You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
+
+#### Another information stored on the servers
 
 Additional technical information can be stored on our servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX Chat limits this additional technical information to the minimum required to operate the Services.
 
-User Support. If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.
+#### SimpleX Directory Service
+
+[SimpleX directory service](./docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the group. You can connect to SimpleX Directory Service via [this address](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).
+
+#### User Support.
+
+If you contact SimpleX Chat any personal data you may share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion), when it is possible.
 
 ### Information we may share
 
 We operate our Services using third parties. While we do not share any user data, these third party may access the encrypted user data as it is stored or transmitted via our servers.
 
-We use Third party to provide email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according their privacy policies and terms of service.
+We use a third party for email services - if you ask for support via email, your and SimpleX Chat email providers may access these emails according to their privacy policies and terms of service.
 
 The cases when SimpleX Chat may need to share the data we temporarily store on the servers:
 
@@ -39,19 +75,19 @@ At the time of updating this document, we have never provided or have been reque
 
 ### Updates
 
-We will update this privacy policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.
+We will update this Privacy Policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our Services confirms your acceptance of our updated Privacy Policy.
 
-Please also read our Terms of Service.
+Please also read our Terms of Service below.
 
-If you have questions about our Privacy Policy please contact us at chat@simplex.chat.
+If you have questions about our Privacy Policy please contact us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
 
 ## Terms of Service
 
-You accept to our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").
+You accept our Terms of Service ("Terms") by installing or using any of our apps or services ("Services").
 
 **Minimal age**. You must be at least 13 years old to use our Services. The minimum age to use our Services without parental approval may be higher in your country.
 
-**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we do cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or cyphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
+**Accessing the servers**. For the efficiency of the network access, the apps access all queues you create on any server via the same network (TCP/IP) connection. Our servers do not collect information about which queues were accessed via the same connection, so we cannot establish which queues belong to the same users. Whoever might observe your network traffic would know which servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or ciphertext in common. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
 
 **Privacy of user data**. We do not retain any data we transmit for any longer than necessary to provide the Services. We only collect aggregate statistics across all users, not per user - we do not have information about how many people use SimpleX Chat (we only know an approximate number of app installations and the aggregate traffic through our servers). In any case, we do not and will not sell or in any way monetize user data.
 
@@ -67,15 +103,17 @@ You accept to our Terms of Service ("Terms") by installing or using any of our a
 
 **Keeping your data secure**. SimpleX Chat is the first messaging platform that is 100% private by design - we neither have ability to access your messages, nor we have information about who you communicate with. That means that you are solely responsible for keeping your device and your user profile safe and secure. If you lose your phone or remove the app, you will not be able to recover the lost data, unless you made a back up.
 
-**Storing the messages on the device**. Currently the messages are stored in the database on your device without encryption. It means that if you make a backup of the app and store it unecrypted, the backup provider may be able to access the messages.
+**Storing the messages on the device**. The messages are stored in the encrypted database on your device. Whether and how database passphrase is stored is determined by the configuration of the application you use. Legacy databases created prior to 2023 or in CLI (terminal) app may remain unencrypted, and it will be indicated in the app. In this case, if you make a backup of the app data and store it unencrypted, the backup provider may be able to access the messages. Please note, that the beta version of desktop app currently stores the database passphrase in the configuration file in plaintext, so you may need to remove passphrase from the device via the app configuration.
+
+**Storing the files on the device**. The files are stored on your device unencrypted. If you make a backup of the app data and store it unencrypted, the backup provider will be able to access the files.
 
 **No Access to Emergency Services**. Our Services do not provide access to emergency service providers like the police, fire department, hospitals, or other public safety organizations. Make sure you can contact emergency service providers through a mobile, fixed-line telephone, or other service.
 
 **Third-party services**. Our Services may allow you to access, use, or interact with third-party websites, apps, content, and other products and services. When you use third-party services, their terms and privacy policies govern your use of those services.
 
-**Your Rights**. You own the mesasges and information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices.
+**Your Rights**. You own the messages and the information you transmit through our Services. Your recipients are able to retain the messages you receive from you; there is no technical ability to delete data from their devices. While there are various app features that allow deleting messages from the recipients' devices, such as _disappearing messages_ and _full message deletion_, their functioning on your recipients' devices cannot be guaranteed or enforced, as the device may be offline or have a modified version of the app.
 
-**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 licence](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)
+**License**. SimpleX Chat grants you a limited, revocable, non-exclusive, and non-transferable license to use our Services in accordance with these Terms. The source-code of services is available and can be used under [AGPL v3 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE)
 
 **SimpleX Chat Rights**. We own all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with our Services. You may not use our copyrights, trademarks, domains, logos, and other intellectual property rights unless you have our written permission, and unless under an open-source license distributed together with the source code. To report copyright, trademark, or other intellectual property infringement, please contact chat@simplex.chat.
 
@@ -93,4 +131,4 @@ You accept to our Terms of Service ("Terms") by installing or using any of our a
 
 **Ending these Terms**. You may end these Terms with SimpleX Chat at any time by deleting SimpleX Chat app(s) from your device and discontinuing use of our Services. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the terms, Enforcing the terms, and Ending these Terms will survive termination of your relationship with SimpleX Chat.
 
-Updated November 8, 2022
+Updated August 17, 2023

README.md

@@ -2,7 +2,7 @@
 [![GitHub downloads](https://img.shields.io/github/downloads/simplex-chat/simplex-chat/total)](https://github.com/simplex-chat/simplex-chat/releases)
 [![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)
 [![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
-[![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)](https://mastodon.social/@simplex)
+<a rel="me" href="https://mastodon.social/@simplex">![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)</a>
 
 | 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md) |
 
@@ -15,7 +15,7 @@
 ## Welcome to SimpleX Chat!
 
 1. 📲 [Install the app](#install-the-app).
-2. ↔️ [Connect to the team](#connect-to-the-team-via-the-app) and [join user groups](#join-user-groups).
+2. ↔️ [Connect to the team](#connect-to-the-team), [join user groups](#join-user-groups) and [follow our updates](#follow-our-updates).
 3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
 4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
 5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
@@ -40,21 +40,29 @@
 - 🚀 [TestFlight preview for iOS](https://testflight.apple.com/join/DWuT2LQu) with the new features 1-2 weeks earlier - **limited to 10,000 users**!
 - 🖥 Available as a terminal (console) [app / CLI](#zap-quick-installation-of-a-terminal-app) on Linux, MacOS, Windows.
 
-## Connect to the team via the app
+## Connect to the team
+
+You can connect to the team via the app using "chat with the developers button" available when you have no conversations in the profile, "Send questions and ideas" in the app settings or via our [SimpleX address](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion). Please connect to:
 
 - to ask any questions
 - to suggest any improvements
 - to share anything relevant
 
+We are replying the questions manually, so it is not instant – it can take up to 24 hours.
+
+If you are interested in helping us to integrate open-source language models, and in [joining our team](./docs/JOIN_TEAM.md), please get in touch.
+
 ## Join user groups
 
+You can join the groups created by other users via the new [directory service](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion). We are not responsible for the content shared in these groups.
+
 **Please note**: The groups below are created for the users to be able to ask questions, make suggestions and ask questions about SimpleX Chat only.
 
 You also can:
 - criticize the app, and make comparisons with other messengers.
 - share new messengers you think could be interesting for privacy, as long as you don't spam.
 - share some privacy related publications, infrequently.
-- having preliminary approved with the admin in direct message, share the link to a group you created.
+- having preliminary approved with the admin in direct message, share the link to a group you created, but only once. Once the group has more than 10 members it can be submitted to [SimpleX Directory Service](./docs/DIRECTORY.md) where the new users will be able to discover it.
 
 You must:
 - be polite to other users
@@ -64,7 +72,14 @@ You must:
 
 Messages not following these rules will be deleted, the right to send messages may be revoked, and the access to the new members to the group may be temporarily restricted, to prevent re-joining under a different name - our imperfect group moderation does not have a better solution at the moment.
 
-You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-3](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fp-j-D_PrY2UMDchFHEUtbSES0nmzCnvD%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA3gBfMjB_GDEmKQwjNdqGbnX91yfuZ7nRJgQijsx5Khc%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%2262MvNZ_Ec2mmlS8V0QNtLQ%3D%3D%22%7D)
+You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-4](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2Fw2GlucRXtRVgYnbt_9ZP-kmt76DekxxS%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA0tJhTyMGUxznwmjb7aT24P1I1Wry_iURTuhOFlMb1Eo%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22WoPxjFqGEDlVazECOSi2dg%3D%3D%22%7D)
+
+There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) for developers who build on SimpleX platform:
+
+- chat bots and automations
+- integrations with other apps
+- social apps and services
+- etc.
 
 There are groups in other languages, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users:
 
@@ -72,6 +87,15 @@ There are groups in other languages, that we have the apps interface translated
 
 You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.
 
+## Follow our updates
+
+We publish our updates and releases via:
+
+- [Reddit](https://www.reddit.com/r/SimpleXChat/), [Twitter](https://twitter.com/SimpleXChat), [Lemmy](https://lemmy.ml/c/simplex), [Mastodon](https://mastodon.social/@simplex) and [Nostr](https://snort.social/p/npub1exv22uulqnmlluszc4yk92jhs2e5ajcs6mu3t00a6avzjcalj9csm7d828).
+- SimpleX Chat [team profile](#connect-to-the-team).
+- [blog](https://simplex.chat/blog/) and [RSS feed](https://simplex.chat/feed.rss).
+- [mailing list](https://simplex.chat/#join-simplex), very rarely.
+
 ## Make a private connection
 
 You need to share a link with your friend or scan a QR code from their phone, in person or during a video call, to make a connection and start messaging.
@@ -95,17 +119,22 @@ Join our translators to help SimpleX grow!
 |locale|language |contributor|[Android](https://play.google.com/store/apps/details?id=chat.simplex.app) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084)|[website](https://simplex.chat)|Github docs|
 |:----:|:-------:|:---------:|:---------:|:---------:|:---------:|
 |🇬🇧 en|English   | |✓|✓|✓|✓|
-|ar|العربية   |[jermanuts](https://github.com/jermanuts)||[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
+|ar|العربية   |[jermanuts](https://github.com/jermanuts)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/ar/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ar/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/ar/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ar/)||
+|🇧🇬 bg|Български | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/bg/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/bg/)<br>[![ios app](https://hosted.weblate.org/widget/simplex-chat/ios/bg/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/bg/)|||
 |🇨🇿 cs|Čeština   |[zen0bit](https://github.com/zen0bit)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/cs/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/cs/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/cs/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/cs/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/cs/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/cs/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/cs)|
 |🇩🇪 de|Deutsch   |[mlanp](https://github.com/mlanp)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/de/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/de/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/de/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/de/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/de/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/de/)||
 |🇪🇸 es|Español   |[Mateyhv](https://github.com/Mateyhv)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/es/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/es/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/es/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/es/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/es/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/es/)||
+|🇫🇮 fi|Suomi     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/fi/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fi/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fi/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fi/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fi/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fi/)||
 |🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
+|🇮🇱 he|עִברִית     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/he/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/he/)<br>-|||
 |🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
-|🇯🇵 ja|Japanese  ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|||
+|🇯🇵 ja|日本語     | |[![android app](https://hosted.weblate.org/widgets/simplex-chat/ja/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ja/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ja/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ja/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/ja/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/ja/)||
 |🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
-|🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
+|🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/pl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
 |🇧🇷 pt-BR|Português||[![android app](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/pt_BR/)<br>-|[![website](https://hosted.weblate.org/widgets/simplex-chat/pt_BR/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/pt_BR/)||
 |🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
+|🇹🇭 th|ภาษาไทย   |[titapa-punpun](https://github.com/titapa-punpun)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/th/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/th/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/th/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/th/)|||
+|🇺🇦 uk|Українська| |[![android app](https://hosted.weblate.org/widgets/simplex-chat/uk/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/uk/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/uk/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/uk/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/uk/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/uk/)||
 |🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||
 
 Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!
@@ -133,11 +162,14 @@ It is possible to donate via:
 
 - [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
 - [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
-- Monero address: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
-- Bitcoin address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- BCH address: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
-- Ethereum address: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
-- Solana address: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
+- Monero: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
+- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- USDT:
+  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
+- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
 
 Thank you,
 
@@ -157,7 +189,7 @@ SimpleX Chat founder
 - [News and updates](#news-and-updates)
 - [Quick installation of a terminal app](#zap-quick-installation-of-a-terminal-app)
 - [SimpleX Platform design](#simplex-platform-design)
-- [Privacy: technical details and limitations](#privacy-technical-details-and-limitations)
+- [Privacy and security: technical details and limitations](#privacy-and-security-technical-details-and-limitations)
 - [For developers](#for-developers)
 - [Roadmap](#roadmap)
 - [Disclaimers, Security contact, License](#disclaimers)
@@ -198,22 +230,18 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 ## News and updates
 
-Recent updates:
+Recent and important updates:
+
+[Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
+
+[Jul 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
 
 [May 23, 2023. SimpleX Chat: v5.1 released with message reactions and self-destruct passcode](./blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.md).
 
 [Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).
 
-[Mar 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.md).
-
 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
 
-[Feb 4, 2023. v4.5 released - with multiple user profiles, message draft, transport isolation and Italian interface](./blog/20230204-simplex-chat-v4-5-user-chat-profiles.md).
-
-[Jan 3, 2023. v4.4 released - with disappearing messages, "live" messages, connection security verifications, GIFs and stickers and with French interface language](./blog/20230103-simplex-chat-v4.4-disappearing-messages.md).
-
-[Dec 6, 2022. November reviews and v4.3 released - with instant voice messages, irreversible deletion of sent messages and improved server configuration](./blog/20221206-simplex-chat-v4.3-voice-messages.md).
-
 [Nov 8, 2022. Security audit by Trail of Bits, the new website and v4.2 released](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
 [Sep 28, 2022. v4.0: encrypted local chat database and many other changes](./blog/20220928-simplex-chat-v4-encrypted-database.md).
@@ -246,7 +274,7 @@ See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/stable/p
 
 See [SimpleX Chat Protocol](./docs/protocol/simplex-chat.md) for the format of messages sent between chat clients over [SimpleX Messaging Protocol](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/simplex-messaging.md).
 
-## Privacy: technical details and limitations
+## Privacy and security: technical details and limitations
 
 SimpleX Chat is a work in progress – we are releasing improvements as they are ready. You have to decide if the current state is good enough for your usage scenario.
 
@@ -259,18 +287,23 @@ What is already implemented:
 3. [Double ratchet](./docs/GLOSSARY.md#double-ratchet-algorithm) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with [forward secrecy](./docs/GLOSSARY.md#forward-secrecy) (each message is encrypted by its own ephemeral key) and [break-in recovery](./docs/GLOSSARY.md#post-compromise-security) (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial [key agreement](./docs/GLOSSARY.md#key-agreement-protocol), initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
 4. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
 5. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
-6. Starting from v2 of SMP protocol (the current version is v4) all message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
+6. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
 7. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
 8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
 9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
 10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
 11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
+12. Manual messaging queue rotations to move conversation to another SMP relay.
+13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
+14. Local files encryption, except videos (to be added later).
 
-We plan to add soon:
+We plan to add:
 
-1. Automatic message queue rotation. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
-2. Local files encryption. Currently the images and files you send and receive are stored in the app unencrypted, you can delete them via `Settings / Database passphrase & export`.
-3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+1. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+2. Post-quantum resistant key exchange in double ratchet protocol.
+3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
 
 ## For developers
 
@@ -283,6 +316,8 @@ You can:
 
 If you are considering developing with SimpleX platform please get in touch for any advice and support.
 
+Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) group to ask any questions and share your success stories.
+
 ## Roadmap
 
 - ✅ Easy to deploy SimpleX server with in-memory message storage, without any dependencies.
@@ -328,23 +363,27 @@ If you are considering developing with SimpleX platform please get in touch for
 - ✅ Message reactions
 - ✅ Message editing history
 - ✅ Reduced battery and traffic usage in large groups.
-- 🏗 Desktop client.
-- 🏗 Message delivery confirmation (with sender opt-in or opt-out per contact, TBC).
+- ✅ Message delivery confirmation (with sender opt-out per contact).
+- ✅ Desktop client.
+- ✅ Encryption of local files stored in the app.
+- 🏗 Using mobile profiles from the desktop app.
+- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- Post-quantum resistant key exchange in double ratchet protocol.
+- Large groups, communities and public channels.
+- Privacy & security slider - a simple way to set all settings at once.
+- Improve sending videos (including encryption of locally stored videos).
+- Improve experience for the new users.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
-- Local app files encryption.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
-- Large groups, communities and public channels.
 - Feeds/broadcasts.
 - Ephemeral/disappearing/OTR conversations with the existing contacts.
 - Privately share your location.
 - Web widgets for custom interactivity in the chats.
 - Programmable chat automations / rules (automatic replies/forward/deletion/sending, reminders, etc.).
-- Supporting the same profile on multiple devices.
 - Privacy-preserving identity server for optional DNS-based contact/group addresses to simplify connection and discovery, but not used to deliver messages:
   - keep all your contacts and groups even if you lose the domain.
   - the server doesn't have information about your contacts and groups.
-- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - High capacity multi-node SMP relays.
 
 ## Disclaimers

apps/android/.gitignore

@@ -1,20 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-/.idea/deploymentTargetDropDown.xml
-/.idea/misc.xml
-/.idea/uiDesigner.xml
-/.idea/kotlinc.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
-local.properties
-app/src/main/cpp/libs/

apps/android/.idea/.name

@@ -1 +0,0 @@
-SimpleX

apps/android/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

apps/android/.idea/gradle.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

apps/android/.idea/inspectionProfiles/Project_Default.xml

@@ -1,20 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="previewFile" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

apps/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>

apps/android/app/build.gradle

@@ -1,242 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization'
-}
-
-android {
-    compileSdk 32
-
-    defaultConfig {
-        applicationId "chat.simplex.app"
-        minSdk 26
-        targetSdk 32
-        // !!!
-        // skip version code after release to F-Droid, as it uses two version codes
-        versionCode 123
-        versionName "5.1.1"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
-        }
-        externalNativeBuild {
-            cmake {
-                cppFlags ''
-            }
-        }
-        manifestPlaceholders.app_name = "@string/app_name"
-        manifestPlaceholders.provider_authorities = "chat.simplex.app.provider"
-        manifestPlaceholders.extract_native_libs = compression_level != "0"
-    }
-
-    buildTypes {
-        debug {
-            applicationIdSuffix "$application_id_suffix"
-            debuggable new Boolean("$enable_debuggable")
-            manifestPlaceholders.app_name = "$app_name"
-            // Provider can't be the same for different apps on the same device
-            manifestPlaceholders.provider_authorities = "chat.simplex.app${application_id_suffix}.provider"
-        }
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-        freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi"
-        freeCompilerArgs += "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi"
-        freeCompilerArgs += "-opt-in=androidx.compose.ui.text.ExperimentalTextApi"
-        freeCompilerArgs += "-opt-in=androidx.compose.material.ExperimentalMaterialApi"
-        freeCompilerArgs += "-opt-in=com.google.accompanist.insets.ExperimentalAnimatedInsets"
-        freeCompilerArgs += "-opt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi"
-        freeCompilerArgs += "-opt-in=kotlinx.serialization.InternalSerializationApi"
-        freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
-    }
-    externalNativeBuild {
-        cmake {
-            path file('src/main/cpp/CMakeLists.txt')
-        }
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-        jniLibs.useLegacyPackaging = compression_level != "0"
-    }
-    def isRelease = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("release") }) != null
-    def isBundle = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("bundle") }) != null
-//    if (isRelease) {
-        // Comma separated list of languages that will be included in the apk
-    android.defaultConfig.resConfigs(
-        "en",
-        "cs",
-        "de",
-        "es",
-        "fr",
-        "it",
-        "ja",
-        "nl",
-        "pl",
-        "pt-rBR",
-        "ru",
-        "zh-rCN"
-    )
-//    }
-    if (isBundle) {
-        defaultConfig.ndk.abiFilters 'arm64-v8a', 'armeabi-v7a'
-    } else {
-        splits {
-            abi {
-                enable true
-                reset()
-                if (isRelease) {
-                    include 'arm64-v8a', 'armeabi-v7a'
-                } else {
-                    include 'arm64-v8a', 'armeabi-v7a'
-                    universalApk false
-                }
-            }
-        }
-    }
-}
-
-dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
-    implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
-    implementation 'androidx.activity:activity-compose:1.4.0'
-    implementation 'androidx.fragment:fragment:1.4.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.3.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
-    implementation 'com.charleskorn.kaml:kaml:0.43.0'
-    //implementation "androidx.compose.material:material-icons-extended:$compose_version"
-    implementation "androidx.compose.ui:ui-util:$compose_version"
-    implementation "androidx.navigation:navigation-compose:2.4.1"
-    implementation "com.google.accompanist:accompanist-insets:0.23.0"
-    implementation 'androidx.webkit:webkit:1.4.0'
-    implementation "com.godaddy.android.colorpicker:compose-color-picker:0.4.2"
-
-    def work_version = "2.7.1"
-    implementation "androidx.work:work-runtime-ktx:$work_version"
-    implementation "androidx.work:work-multiprocess:$work_version"
-
-    def camerax_version = "1.1.0-beta01"
-    implementation "androidx.camera:camera-core:${camerax_version}"
-    implementation "androidx.camera:camera-camera2:${camerax_version}"
-    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
-    implementation "androidx.camera:camera-view:${camerax_version}"
-
-    //Barcode
-    implementation 'org.boofcv:boofcv-android:0.40.1'
-    implementation 'org.boofcv:boofcv-core:0.40.1'
-
-    //Camera Permission
-    implementation "com.google.accompanist:accompanist-permissions:0.23.0"
-    implementation "com.google.accompanist:accompanist-pager:0.25.1"
-
-    // Link Previews
-    implementation 'org.jsoup:jsoup:1.13.1'
-
-    // Biometric authentication
-    implementation 'androidx.biometric:biometric:1.2.0-alpha04'
-
-    // GIFs support
-    implementation "io.coil-kt:coil-compose:2.1.0"
-    implementation "io.coil-kt:coil-gif:2.1.0"
-
-    // Video support
-    implementation "com.google.android.exoplayer:exoplayer:2.17.1"
-
-    // Wheel picker
-    implementation 'com.github.zj565061763:compose-wheel-picker:1.0.0-alpha10'
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-}
-
-// Don't do anything if no compression is needed
-if (compression_level != "0") {
-    tasks.whenTaskAdded { task ->
-        if (task.name == 'packageDebug') {
-            task.finalizedBy compressApk
-        } else if (task.name == 'packageRelease') {
-            task.finalizedBy compressApk
-        }
-    }
-}
-
-tasks.register("compressApk") {
-    doLast {
-        def isRelease = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("release") }) != null
-        def buildType
-        if (isRelease) {
-            buildType = "release"
-        } else {
-            buildType = "debug"
-        }
-        def javaHome = System.properties['java.home'] ?: org.gradle.internal.jvm.Jvm.current().getJavaHome()
-        def sdkDir = android.getSdkDirectory().getAbsolutePath()
-        def keyAlias = ""
-        def keyPassword = ""
-        def storeFile = ""
-        def storePassword = ""
-        if (project.properties['android.injected.signing.key.alias'] != null) {
-            keyAlias = project.properties['android.injected.signing.key.alias']
-            keyPassword = project.properties['android.injected.signing.key.password']
-            storeFile = project.properties['android.injected.signing.store.file']
-            storePassword = project.properties['android.injected.signing.store.password']
-        } else if (android.signingConfigs.hasProperty(buildType)) {
-            def gradleConfig = android.signingConfigs[buildType]
-            keyAlias = gradleConfig.keyAlias
-            keyPassword = gradleConfig.keyPassword
-            storeFile = gradleConfig.storeFile
-            storePassword = gradleConfig.storePassword
-        } else {
-            // There is no signing config for current build type, can't sign the apk
-            println("No signing configs for this build type: $buildType")
-            return
-        }
-
-        def outputDir = tasks["package${buildType.capitalize()}"].outputs.files.last()
-
-        exec {
-            workingDir '../../../scripts/android'
-            setEnvironment(['JAVA_HOME': "$javaHome"])
-            commandLine './compress-and-sign-apk.sh',  \
-                     "$compression_level",  \
-                     "$outputDir",  \
-                     "$sdkDir",  \
-                     "$storeFile",  \
-                     "$storePassword",  \
-                     "$keyAlias",  \
-                     "$keyPassword"
-        }
-
-        if (project.properties['android.injected.signing.key.alias'] != null && buildType == 'release') {
-            new File(outputDir, "app-release.apk").renameTo(new File(outputDir, "simplex.apk"))
-            new File(outputDir, "app-armeabi-v7a-release.apk").renameTo(new File(outputDir, "simplex-armv7a.apk"))
-            new File(outputDir, "app-arm64-v8a-release.apk").renameTo(new File(outputDir, "simplex.apk"))
-        }
-
-        // View all gradle properties set
-        // project.properties.each { k, v -> println "$k -> $v" }
-    }
-}

apps/android/app/src/main/cpp/simplex-api.c

@@ -1,111 +0,0 @@
-#include <jni.h>
-
-// from the RTS
-void hs_init(int * argc, char **argv[]);
-
-// from android-support
-void setLineBuffering(void);
-int pipe_std_to_socket(const char * name);
-
-extern void __svfscanf(void){};
-extern void __vfwscanf(void){};
-extern void __memset_chk_fail(void){};
-extern void __strcpy_chk_generic(void){};
-extern void __strcat_chk_generic(void){};
-extern void __libc_globals(void){};
-extern void __rel_iplt_start(void){};
-
-// Android 9 only, not 13
-extern void reallocarray(void){};
-
-JNIEXPORT jint JNICALL
-Java_chat_simplex_app_SimplexAppKt_pipeStdOutToSocket(JNIEnv *env, __unused jclass clazz, jstring socket_name) {
-    const char *name = (*env)->GetStringUTFChars(env, socket_name, JNI_FALSE);
-    int ret = pipe_std_to_socket(name);
-    (*env)->ReleaseStringUTFChars(env, socket_name, name);
-    return ret;
-}
-
-JNIEXPORT void JNICALL
-Java_chat_simplex_app_SimplexAppKt_initHS(__unused JNIEnv *env, __unused jclass clazz) {
-    hs_init(NULL, NULL);
-    setLineBuffering();
-}
-
-// from simplex-chat
-typedef long* chat_ctrl;
-
-extern char *chat_migrate_init(const char *path, const char *key, const char *confirm, chat_ctrl *ctrl);
-extern char *chat_send_cmd(chat_ctrl ctrl, const char *cmd);
-extern char *chat_recv_msg(chat_ctrl ctrl); // deprecated
-extern char *chat_recv_msg_wait(chat_ctrl ctrl, const int wait);
-extern char *chat_parse_markdown(const char *str);
-extern char *chat_parse_server(const char *str);
-extern char *chat_password_hash(const char *pwd, const char *salt);
-
-JNIEXPORT jobjectArray JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatMigrateInit(JNIEnv *env, __unused jclass clazz, jstring dbPath, jstring dbKey, jstring confirm) {
-    const char *_dbPath = (*env)->GetStringUTFChars(env, dbPath, JNI_FALSE);
-    const char *_dbKey = (*env)->GetStringUTFChars(env, dbKey, JNI_FALSE);
-    const char *_confirm = (*env)->GetStringUTFChars(env, confirm, JNI_FALSE);
-    jlong _ctrl = (jlong) 0;
-    jstring res = (*env)->NewStringUTF(env, chat_migrate_init(_dbPath, _dbKey, _confirm, &_ctrl));
-    (*env)->ReleaseStringUTFChars(env, dbPath, _dbPath);
-    (*env)->ReleaseStringUTFChars(env, dbKey, _dbKey);
-    (*env)->ReleaseStringUTFChars(env, dbKey, _confirm);
-
-    // Creating array of Object's (boxed values can be passed, eg. Long instead of long)
-    jobjectArray ret = (jobjectArray)(*env)->NewObjectArray(env, 2, (*env)->FindClass(env, "java/lang/Object"), NULL);
-    // Java's String
-    (*env)->SetObjectArrayElement(env, ret, 0, res);
-    // Java's Long
-    (*env)->SetObjectArrayElement(env, ret, 1,
-        (*env)->NewObject(env, (*env)->FindClass(env, "java/lang/Long"),
-        (*env)->GetMethodID(env, (*env)->FindClass(env, "java/lang/Long"), "<init>", "(J)V"),
-        _ctrl));
-    return ret;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatSendCmd(JNIEnv *env, __unused jclass clazz, jlong controller, jstring msg) {
-    const char *_msg = (*env)->GetStringUTFChars(env, msg, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_send_cmd((void*)controller, _msg));
-    (*env)->ReleaseStringUTFChars(env, msg, _msg);
-    return res;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatRecvMsg(JNIEnv *env, __unused jclass clazz, jlong controller) {
-    return (*env)->NewStringUTF(env, chat_recv_msg((void*)controller));
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatRecvMsgWait(JNIEnv *env, __unused jclass clazz, jlong controller, jint wait) {
-    return (*env)->NewStringUTF(env, chat_recv_msg_wait((void*)controller, wait));
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatParseMarkdown(JNIEnv *env, __unused jclass clazz, jstring str) {
-    const char *_str = (*env)->GetStringUTFChars(env, str, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_parse_markdown(_str));
-    (*env)->ReleaseStringUTFChars(env, str, _str);
-    return res;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatParseServer(JNIEnv *env, __unused jclass clazz, jstring str) {
-    const char *_str = (*env)->GetStringUTFChars(env, str, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_parse_server(_str));
-    (*env)->ReleaseStringUTFChars(env, str, _str);
-    return res;
-}
-
-JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatPasswordHash(JNIEnv *env, __unused jclass clazz, jstring pwd, jstring salt) {
-    const char *_pwd = (*env)->GetStringUTFChars(env, pwd, JNI_FALSE);
-    const char *_salt = (*env)->GetStringUTFChars(env, salt, JNI_FALSE);
-    jstring res = (*env)->NewStringUTF(env, chat_password_hash(_pwd, _salt));
-    (*env)->ReleaseStringUTFChars(env, pwd, _pwd);
-    (*env)->ReleaseStringUTFChars(env, salt, _salt);
-    return res;
-}

apps/android/app/src/main/java/chat/simplex/app/BackupAgent.kt

@@ -1,18 +0,0 @@
-package chat.simplex.app
-
-import android.app.backup.BackupAgentHelper
-import android.app.backup.FullBackupDataOutput
-import android.content.Context
-import chat.simplex.app.model.AppPreferences
-import chat.simplex.app.model.AppPreferences.Companion.SHARED_PREFS_PRIVACY_FULL_BACKUP
-
-class BackupAgent: BackupAgentHelper() {
-  override fun onFullBackup(data: FullBackupDataOutput?) {
-    if (applicationContext
-        .getSharedPreferences(AppPreferences.SHARED_PREFS_ID, Context.MODE_PRIVATE)
-        .getBoolean(SHARED_PREFS_PRIVACY_FULL_BACKUP, true)
-    ) {
-      super.onFullBackup(data)
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt

@@ -1,719 +0,0 @@
-package chat.simplex.app
-
-import android.app.Application
-import android.content.Intent
-import android.net.Uri
-import android.os.*
-import android.os.SystemClock.elapsedRealtime
-import android.util.Log
-import android.view.WindowManager
-import androidx.activity.compose.setContent
-import androidx.activity.viewModels
-import androidx.compose.animation.core.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.*
-import chat.simplex.app.MainActivity.Companion.enteredBackground
-import chat.simplex.app.model.*
-import chat.simplex.app.model.NtfManager.Companion.getUserIdFromIntent
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.SplashView
-import chat.simplex.app.views.call.ActiveCallView
-import chat.simplex.app.views.call.IncomingCallAlertView
-import chat.simplex.app.views.chat.ChatView
-import chat.simplex.app.views.chat.group.ProgressIndicator
-import chat.simplex.app.views.chatlist.*
-import chat.simplex.app.views.database.DatabaseErrorView
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.helpers.DatabaseUtils.ksSelfDestructPassword
-import chat.simplex.app.views.localauth.SetAppPasscodeView
-import chat.simplex.app.views.newchat.*
-import chat.simplex.app.views.onboarding.*
-import chat.simplex.app.views.usersettings.LAMode
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.distinctUntilChanged
-
-class MainActivity: FragmentActivity() {
-  companion object {
-    /**
-     * We don't want these values to be bound to Activity lifecycle since activities are changed often, for example, when a user
-     * clicks on new message in notification. In this case savedInstanceState will be null (this prevents restoring the values)
-     * See [SimplexService.onTaskRemoved] for another part of the logic which nullifies the values when app closed by the user
-     * */
-    val userAuthorized = mutableStateOf<Boolean?>(null)
-    val enteredBackground = mutableStateOf<Long?>(null)
-    // Remember result and show it after orientation change
-    private val laFailed = mutableStateOf(false)
-
-    fun clearAuthState() {
-      userAuthorized.value = null
-      enteredBackground.value = null
-    }
-  }
-  private val vm by viewModels<SimplexViewModel>()
-  private val destroyedAfterBackPress = mutableStateOf(false)
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    // testJson()
-    val m = vm.chatModel
-    applyAppLocale(m.controller.appPrefs.appLanguage)
-    // When call ended and orientation changes, it re-process old intent, it's unneeded.
-    // Only needed to be processed on first creation of activity
-    if (savedInstanceState == null) {
-      processNotificationIntent(intent, m)
-      processIntent(intent, m)
-      processExternalIntent(intent, m)
-    }
-    if (m.controller.appPrefs.privacyProtectScreen.get()) {
-      Log.d(TAG, "onCreate: set FLAG_SECURE")
-      window.setFlags(
-        WindowManager.LayoutParams.FLAG_SECURE,
-        WindowManager.LayoutParams.FLAG_SECURE
-      )
-    }
-    setContent {
-      SimpleXTheme {
-        Surface(color = MaterialTheme.colors.background) {
-          MainPage(
-            m,
-            userAuthorized,
-            laFailed,
-            destroyedAfterBackPress,
-            ::runAuthenticate,
-            ::setPerformLA,
-            showLANotice = { showLANotice(m.controller.appPrefs.laNoticeShown, this) }
-          )
-        }
-      }
-    }
-    SimplexApp.context.schedulePeriodicServiceRestartWorker()
-    SimplexApp.context.schedulePeriodicWakeUp()
-  }
-
-  override fun onNewIntent(intent: Intent?) {
-    super.onNewIntent(intent)
-    processIntent(intent, vm.chatModel)
-    processExternalIntent(intent, vm.chatModel)
-  }
-
-  override fun onResume() {
-    super.onResume()
-    val enteredBackgroundVal = enteredBackground.value
-    val delay = vm.chatModel.controller.appPrefs.laLockDelay.get()
-    if (enteredBackgroundVal == null || elapsedRealtime() - enteredBackgroundVal >= delay * 1000) {
-      if (userAuthorized.value != false) {
-        /** [runAuthenticate] will be called in [MainPage] if needed. Making like this prevents double showing of passcode on start */
-        setAuthState()
-      } else if (!vm.chatModel.activeCallViewIsVisible.value) {
-        runAuthenticate()
-      }
-    }
-  }
-
-  override fun onPause() {
-    super.onPause()
-    /**
-    * When new activity is created after a click on notification, the old one receives onPause before
-    * recreation but receives onStop after recreation. So using both (onPause and onStop) to prevent
-    * unwanted multiple auth dialogs from [runAuthenticate]
-    * */
-    enteredBackground.value = elapsedRealtime()
-  }
-
-  override fun onStop() {
-    super.onStop()
-    VideoPlayer.stopAll()
-    enteredBackground.value = elapsedRealtime()
-  }
-
-  override fun onBackPressed() {
-    if (
-      onBackPressedDispatcher.hasEnabledCallbacks() // Has something to do in a backstack
-      || Build.VERSION.SDK_INT >= Build.VERSION_CODES.R // Android 11 or above
-      || isTaskRoot // there are still other tasks after we reach the main (home) activity
-    ) {
-      // https://medium.com/mobile-app-development-publication/the-risk-of-android-strandhogg-security-issue-and-how-it-can-be-mitigated-80d2ddb4af06
-      super.onBackPressed()
-    }
-
-    if (!onBackPressedDispatcher.hasEnabledCallbacks() && vm.chatModel.controller.appPrefs.performLA.get()) {
-      // When pressed Back and there is no one wants to process the back event, clear auth state to force re-auth on launch
-      clearAuthState()
-      laFailed.value = true
-      destroyedAfterBackPress.value = true
-    }
-    if (!onBackPressedDispatcher.hasEnabledCallbacks()) {
-      // Drop shared content
-      SimplexApp.context.chatModel.sharedContent.value = null
-    }
-  }
-
-  private fun setAuthState() {
-    userAuthorized.value = !vm.chatModel.controller.appPrefs.performLA.get()
-  }
-
-  private fun runAuthenticate() {
-    val m = vm.chatModel
-    setAuthState()
-    if (userAuthorized.value == false) {
-      // To make Main thread free in order to allow to Compose to show blank view that hiding content underneath of it faster on slow devices
-      CoroutineScope(Dispatchers.Default).launch {
-        delay(50)
-        withContext(Dispatchers.Main) {
-          authenticate(
-            if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-              generalGetString(R.string.auth_unlock)
-            else
-              generalGetString(R.string.la_enter_app_passcode),
-            if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-              generalGetString(R.string.auth_log_in_using_credential)
-            else
-              generalGetString(R.string.auth_unlock),
-            selfDestruct = true,
-            this@MainActivity,
-            completed = { laResult ->
-              when (laResult) {
-                LAResult.Success ->
-                  userAuthorized.value = true
-                is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-                is LAResult.Error -> {
-                  laFailed.value = true
-                  if (m.controller.appPrefs.laMode.get() == LAMode.PASSCODE) {
-                    laFailedAlert()
-                  }
-                }
-                is LAResult.Unavailable -> {
-                  userAuthorized.value = true
-                  m.performLA.value = false
-                  m.controller.appPrefs.performLA.set(false)
-                  laUnavailableTurningOffAlert()
-                }
-              }
-            }
-          )
-        }
-      }
-    }
-  }
-
-  private fun showLANotice(laNoticeShown: SharedPreference<Boolean>, activity: FragmentActivity) {
-    Log.d(TAG, "showLANotice")
-    if (!laNoticeShown.get()) {
-      laNoticeShown.set(true)
-      AlertManager.shared.showAlertDialog(
-        title = generalGetString(R.string.la_notice_title_simplex_lock),
-        text = generalGetString(R.string.la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled),
-        confirmText = generalGetString(R.string.la_notice_turn_on),
-        onConfirm = {
-          withBGApi { // to remove this call, change ordering of onConfirm call in AlertManager
-            showChooseLAMode(laNoticeShown, activity)
-          }
-        }
-      )
-    }
-  }
-
-  private fun showChooseLAMode(laNoticeShown: SharedPreference<Boolean>, activity: FragmentActivity) {
-    Log.d(TAG, "showLANotice")
-    laNoticeShown.set(true)
-    AlertManager.shared.showAlertDialogStacked(
-      title = generalGetString(R.string.la_lock_mode),
-      text = null,
-      confirmText = generalGetString(R.string.la_lock_mode_passcode),
-      dismissText = generalGetString(R.string.la_lock_mode_system),
-      onConfirm = {
-        AlertManager.shared.hideAlert()
-        setPasscode()
-      },
-      onDismiss = {
-        AlertManager.shared.hideAlert()
-        initialEnableLA(activity)
-      }
-    )
-  }
-
-  private fun initialEnableLA(activity: FragmentActivity) {
-    val m = vm.chatModel
-    val appPrefs = m.controller.appPrefs
-    m.controller.appPrefs.laMode.set(LAMode.SYSTEM)
-    authenticate(
-      generalGetString(R.string.auth_enable_simplex_lock),
-      generalGetString(R.string.auth_confirm_credential),
-      activity = activity,
-      completed = { laResult ->
-        when (laResult) {
-          LAResult.Success -> {
-            m.performLA.value = true
-            appPrefs.performLA.set(true)
-            laTurnedOnAlert()
-          }
-          is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-          is LAResult.Error -> {
-            m.performLA.value = false
-            appPrefs.performLA.set(false)
-            laFailedAlert()
-          }
-          is LAResult.Unavailable -> {
-            m.performLA.value = false
-            appPrefs.performLA.set(false)
-            m.showAdvertiseLAUnavailableAlert.value = true
-          }
-        }
-      }
-    )
-  }
-
-  private fun setPasscode() {
-    val chatModel = vm.chatModel
-    val appPrefs = chatModel.controller.appPrefs
-    ModalManager.shared.showCustomModal { close ->
-      Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-        SetAppPasscodeView(
-          submit = {
-            chatModel.performLA.value = true
-            appPrefs.performLA.set(true)
-            appPrefs.laMode.set(LAMode.PASSCODE)
-            laTurnedOnAlert()
-          },
-          cancel = {
-            chatModel.performLA.value = false
-            appPrefs.performLA.set(false)
-            laPasscodeNotSetAlert()
-          },
-          close = close
-        )
-      }
-    }
-  }
-
-  private fun setPerformLA(on: Boolean, activity: FragmentActivity) {
-    vm.chatModel.controller.appPrefs.laNoticeShown.set(true)
-    if (on) {
-      enableLA(activity)
-    } else {
-      disableLA(activity)
-    }
-  }
-
-  private fun enableLA(activity: FragmentActivity) {
-    val m = vm.chatModel
-    authenticate(
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_enable_simplex_lock)
-      else
-        generalGetString(R.string.new_passcode),
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_confirm_credential)
-      else
-        "",
-      activity = activity,
-      completed = { laResult ->
-        val prefPerformLA = m.controller.appPrefs.performLA
-        when (laResult) {
-          LAResult.Success -> {
-            m.performLA.value = true
-            prefPerformLA.set(true)
-            laTurnedOnAlert()
-          }
-          is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-          is LAResult.Error -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laFailedAlert()
-          }
-          is LAResult.Unavailable -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laUnavailableInstructionAlert()
-          }
-        }
-      }
-    )
-  }
-
-  private fun disableLA(activity: FragmentActivity) {
-    val m = vm.chatModel
-    authenticate(
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_disable_simplex_lock)
-      else
-        generalGetString(R.string.la_enter_app_passcode),
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_confirm_credential)
-      else
-        generalGetString(R.string.auth_disable_simplex_lock),
-      activity = activity,
-      completed = { laResult ->
-        val prefPerformLA = m.controller.appPrefs.performLA
-        val selfDestructPref = m.controller.appPrefs.selfDestruct
-        when (laResult) {
-          LAResult.Success -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            ksAppPassword.remove()
-            selfDestructPref.set(false)
-            ksSelfDestructPassword.remove()
-          }
-          is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-          is LAResult.Error -> {
-            m.performLA.value = true
-            prefPerformLA.set(true)
-            laFailedAlert()
-          }
-          is LAResult.Unavailable -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laUnavailableTurningOffAlert()
-          }
-        }
-      }
-    )
-  }
-}
-
-class SimplexViewModel(application: Application): AndroidViewModel(application) {
-  val app = getApplication<SimplexApp>()
-  val chatModel = app.chatModel
-}
-
-@Composable
-fun MainPage(
-  chatModel: ChatModel,
-  userAuthorized: MutableState<Boolean?>,
-  laFailed: MutableState<Boolean>,
-  destroyedAfterBackPress: MutableState<Boolean>,
-  runAuthenticate: () -> Unit,
-  setPerformLA: (Boolean, FragmentActivity) -> Unit,
-  showLANotice: () -> Unit
-) {
-  var showChatDatabaseError by rememberSaveable {
-    mutableStateOf(chatModel.chatDbStatus.value != DBMigrationResult.OK && chatModel.chatDbStatus.value != null)
-  }
-  LaunchedEffect(chatModel.chatDbStatus.value) {
-    showChatDatabaseError = chatModel.chatDbStatus.value != DBMigrationResult.OK && chatModel.chatDbStatus.value != null
-  }
-
-  var showAdvertiseLAAlert by remember { mutableStateOf(false) }
-  LaunchedEffect(showAdvertiseLAAlert) {
-    if (
-      !chatModel.controller.appPrefs.laNoticeShown.get()
-      && showAdvertiseLAAlert
-      && chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete
-      && chatModel.chats.isNotEmpty()
-      && chatModel.activeCallInvitation.value == null
-    ) {
-      showLANotice()
-    }
-  }
-  LaunchedEffect(chatModel.showAdvertiseLAUnavailableAlert.value) {
-    if (chatModel.showAdvertiseLAUnavailableAlert.value) {
-      laUnavailableInstructionAlert()
-    }
-  }
-  LaunchedEffect(chatModel.clearOverlays.value) {
-    if (chatModel.clearOverlays.value) {
-      ModalManager.shared.closeModals()
-      chatModel.clearOverlays.value = false
-    }
-  }
-
-  @Composable
-  fun AuthView() {
-    Surface(color = MaterialTheme.colors.background) {
-      Box(
-        Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center
-      ) {
-        SimpleButton(
-          stringResource(R.string.auth_unlock),
-          icon = painterResource(R.drawable.ic_lock),
-          click = {
-            laFailed.value = false
-            runAuthenticate()
-          }
-        )
-      }
-    }
-  }
-
-  Box {
-    val onboarding = chatModel.onboardingStage.value
-    val userCreated = chatModel.userCreated.value
-    var showInitializationView by remember { mutableStateOf(false) }
-    when {
-      chatModel.chatDbStatus.value == null && showInitializationView -> InitializationView()
-      showChatDatabaseError -> {
-        chatModel.chatDbStatus.value?.let {
-          DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
-        }
-      }
-      onboarding == null || userCreated == null -> SplashView()
-      onboarding == OnboardingStage.OnboardingComplete && userCreated -> {
-        Box {
-            showAdvertiseLAAlert = true
-            BoxWithConstraints {
-              var currentChatId by rememberSaveable { mutableStateOf(chatModel.chatId.value) }
-              val offset = remember { Animatable(if (chatModel.chatId.value == null) 0f else maxWidth.value) }
-              Box(
-                Modifier
-                  .graphicsLayer {
-                    translationX = -offset.value.dp.toPx()
-                  }
-              ) {
-                  val stopped = chatModel.chatRunning.value == false
-                  if (chatModel.sharedContent.value == null)
-                    ChatListView(chatModel, setPerformLA, stopped)
-                  else
-                    ShareListView(chatModel, stopped)
-              }
-              val scope = rememberCoroutineScope()
-              val onComposed: () -> Unit = {
-                scope.launch {
-                  offset.animateTo(
-                    if (chatModel.chatId.value == null) 0f else maxWidth.value,
-                    chatListAnimationSpec()
-                  )
-                  if (offset.value == 0f) {
-                    currentChatId = null
-                  }
-                }
-              }
-              LaunchedEffect(Unit) {
-                launch {
-                  snapshotFlow { chatModel.chatId.value }
-                    .distinctUntilChanged()
-                    .collect {
-                      if (it != null) currentChatId = it
-                      else onComposed()
-                    }
-                }
-              }
-              Box (Modifier.graphicsLayer { translationX = maxWidth.toPx() - offset.value.dp.toPx() }) Box2@ {
-                currentChatId?.let {
-                  ChatView(it, chatModel, onComposed)
-                }
-              }
-            }
-          }
-      }
-      onboarding == OnboardingStage.Step1_SimpleXInfo -> SimpleXInfo(chatModel, onboarding = true)
-      onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel) {}
-      onboarding == OnboardingStage.Step3_CreateSimpleXAddress -> CreateSimpleXAddress(chatModel)
-      onboarding == OnboardingStage.Step4_SetNotificationsMode -> SetNotificationsMode(chatModel)
-    }
-    ModalManager.shared.showInView()
-    val unauthorized = remember { derivedStateOf { userAuthorized.value != true } }
-    if (unauthorized.value && !(chatModel.activeCallViewIsVisible.value && chatModel.showCallView.value)) {
-      LaunchedEffect(Unit) {
-        // With these constrains when user presses back button while on ChatList, activity destroys and shows auth request
-        // while the screen moves to a launcher. Detect it and prevent showing the auth
-        if (!(destroyedAfterBackPress.value && chatModel.controller.appPrefs.laMode.get() == LAMode.SYSTEM)) {
-          runAuthenticate()
-        }
-      }
-      if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
-        AuthView()
-      } else {
-        SplashView()
-      }
-    } else if (chatModel.showCallView.value) {
-      ActiveCallView(chatModel)
-    }
-    ModalManager.shared.showPasscodeInView()
-    val invitation = chatModel.activeCallInvitation.value
-    if (invitation != null) IncomingCallAlertView(invitation, chatModel)
-    AlertManager.shared.showInView()
-
-    LaunchedEffect(Unit) {
-      delay(1000)
-      if (chatModel.chatDbStatus.value == null) {
-        showInitializationView = true
-      }
-    }
-  }
-
-  DisposableEffectOnRotate {
-    // When using lock delay = 0 and screen rotates, the app will be locked which is not useful.
-    // Let's prolong the unlocked period to 3 sec for screen rotation to take place
-    if (chatModel.controller.appPrefs.laLockDelay.get() == 0) {
-      enteredBackground.value = elapsedRealtime() + 3000
-    }
-  }
-}
-
-@Composable
-private fun InitializationView() {
-  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-      CircularProgressIndicator(
-        Modifier
-          .padding(bottom = DEFAULT_PADDING)
-          .size(30.dp),
-        color = MaterialTheme.colors.secondary,
-        strokeWidth = 2.5.dp
-      )
-      Text(stringResource(R.string.opening_database))
-    }
-  }
-}
-
-fun processNotificationIntent(intent: Intent?, chatModel: ChatModel) {
-  val userId = getUserIdFromIntent(intent)
-  when (intent?.action) {
-    NtfManager.OpenChatAction -> {
-      val chatId = intent.getStringExtra("chatId")
-      Log.d(TAG, "processNotificationIntent: OpenChatAction $chatId")
-      if (chatId != null) {
-        withBGApi {
-          awaitChatStartedIfNeeded(chatModel)
-          if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
-            chatModel.controller.changeActiveUser(userId, null)
-          }
-          val cInfo = chatModel.getChat(chatId)?.chatInfo
-          chatModel.clearOverlays.value = true
-          if (cInfo != null) openChat(cInfo, chatModel)
-        }
-      }
-    }
-    NtfManager.ShowChatsAction -> {
-      Log.d(TAG, "processNotificationIntent: ShowChatsAction")
-      withBGApi {
-        awaitChatStartedIfNeeded(chatModel)
-        if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
-          chatModel.controller.changeActiveUser(userId, null)
-        }
-        chatModel.chatId.value = null
-        chatModel.clearOverlays.value = true
-      }
-    }
-    NtfManager.AcceptCallAction -> {
-      val chatId = intent.getStringExtra("chatId")
-      if (chatId == null || chatId == "") return
-      Log.d(TAG, "processNotificationIntent: AcceptCallAction $chatId")
-      chatModel.clearOverlays.value = true
-      val invitation = chatModel.callInvitations[chatId]
-      if (invitation == null) {
-        AlertManager.shared.showAlertMsg(generalGetString(R.string.call_already_ended))
-      } else {
-        chatModel.callManager.acceptIncomingCall(invitation = invitation)
-      }
-    }
-  }
-}
-
-fun processIntent(intent: Intent?, chatModel: ChatModel) {
-  when (intent?.action) {
-    "android.intent.action.VIEW" -> {
-      val uri = intent.data
-      if (uri != null) connectIfOpenedViaUri(uri, chatModel)
-    }
-  }
-}
-
-fun processExternalIntent(intent: Intent?, chatModel: ChatModel) {
-  when (intent?.action) {
-    Intent.ACTION_SEND -> {
-      // Close active chat and show a list of chats
-      chatModel.chatId.value = null
-      chatModel.clearOverlays.value = true
-      when {
-        intent.type == "text/plain" -> {
-          val text = intent.getStringExtra(Intent.EXTRA_TEXT)
-          if (text != null) {
-            chatModel.sharedContent.value = SharedContent.Text(text)
-          }
-        }
-        isMediaIntent(intent) -> {
-          val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
-          if (uri != null) {
-            chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", listOf(uri))
-          } // All other mime types
-        }
-        else -> {
-          val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
-          if (uri != null) {
-            chatModel.sharedContent.value = SharedContent.File(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uri)
-          }
-        }
-      }
-    }
-    Intent.ACTION_SEND_MULTIPLE -> {
-      // Close active chat and show a list of chats
-      chatModel.chatId.value = null
-      chatModel.clearOverlays.value = true
-      Log.e(TAG, "ACTION_SEND_MULTIPLE ${intent.type}")
-      when {
-        isMediaIntent(intent) -> {
-          val uris = intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM) as? List<Uri>
-          if (uris != null) {
-            chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uris)
-          } // All other mime types
-        }
-        else -> {}
-      }
-    }
-  }
-}
-
-fun isMediaIntent(intent: Intent): Boolean =
-  intent.type?.startsWith("image/") == true || intent.type?.startsWith("video/") == true
-
-fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
-  Log.d(TAG, "connectIfOpenedViaUri: opened via link")
-  if (chatModel.currentUser.value == null) {
-    chatModel.appOpenUrl.value = uri
-  } else {
-    withUriAction(uri) { linkType ->
-      val title = when (linkType) {
-        ConnectionLinkType.CONTACT -> generalGetString(R.string.connect_via_contact_link)
-        ConnectionLinkType.INVITATION -> generalGetString(R.string.connect_via_invitation_link)
-        ConnectionLinkType.GROUP -> generalGetString(R.string.connect_via_group_link)
-      }
-      AlertManager.shared.showAlertDialog(
-        title = title,
-        text = if (linkType == ConnectionLinkType.GROUP)
-          generalGetString(R.string.you_will_join_group)
-        else
-          generalGetString(R.string.profile_will_be_sent_to_contact_sending_link),
-        confirmText = generalGetString(R.string.connect_via_link_verb),
-        onConfirm = {
-          withApi {
-            Log.d(TAG, "connectIfOpenedViaUri: connecting")
-            connectViaUri(chatModel, linkType, uri)
-          }
-        }
-      )
-    }
-  }
-}
-
-suspend fun awaitChatStartedIfNeeded(chatModel: ChatModel, timeout: Long = 30_000) {
-  // Still decrypting database
-  if (chatModel.chatRunning.value == null) {
-    val step = 50L
-    for (i in 0..(timeout / step)) {
-      if (chatModel.chatRunning.value == true || chatModel.onboardingStage.value == OnboardingStage.Step1_SimpleXInfo) {
-        break
-      }
-      delay(step)
-    }
-  }
-}
-
-//fun testJson() {
-//  val str: String = """
-//  """.trimIndent()
-//
-//  println(json.decodeFromString<APIResponse>(str))
-//}

apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt

@@ -1,271 +0,0 @@
-package chat.simplex.app
-
-import android.app.Application
-import android.net.LocalServerSocket
-import android.util.Log
-import androidx.lifecycle.*
-import androidx.work.*
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.DefaultTheme
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.onboarding.OnboardingStage
-import chat.simplex.app.views.usersettings.NotificationsMode
-import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
-import java.io.*
-import java.util.*
-import java.util.concurrent.Semaphore
-import java.util.concurrent.TimeUnit
-import kotlin.concurrent.thread
-
-const val TAG = "SIMPLEX"
-
-// ghc's rts
-external fun initHS()
-// android-support
-external fun pipeStdOutToSocket(socketName: String) : Int
-
-// SimpleX API
-typealias ChatCtrl = Long
-external fun chatMigrateInit(dbPath: String, dbKey: String, confirm: String): Array<Any>
-external fun chatSendCmd(ctrl: ChatCtrl, msg: String): String
-external fun chatRecvMsg(ctrl: ChatCtrl): String
-external fun chatRecvMsgWait(ctrl: ChatCtrl, timeout: Int): String
-external fun chatParseMarkdown(str: String): String
-external fun chatParseServer(str: String): String
-external fun chatPasswordHash(pwd: String, salt: String): String
-
-class SimplexApp: Application(), LifecycleEventObserver {
-  var isAppOnForeground: Boolean = false
-
-  val defaultLocale: Locale = Locale.getDefault()
-
-  suspend fun initChatController(useKey: String? = null, confirmMigrations: MigrationConfirmation? = null, startChat: Boolean = true) {
-    val dbKey = useKey ?: DatabaseUtils.useDatabaseKey()
-    val dbAbsolutePathPrefix = getFilesDirectory(SimplexApp.context)
-    val confirm = confirmMigrations ?: if (appPreferences.confirmDBUpgrades.get()) MigrationConfirmation.Error else MigrationConfirmation.YesUp
-    val migrated: Array<Any> = chatMigrateInit(dbAbsolutePathPrefix, dbKey, confirm.value)
-    val res: DBMigrationResult = kotlin.runCatching {
-      json.decodeFromString<DBMigrationResult>(migrated[0] as String)
-    }.getOrElse { DBMigrationResult.Unknown(migrated[0] as String) }
-    val ctrl = if (res is DBMigrationResult.OK) {
-      migrated[1] as Long
-    } else null
-    chatController.ctrl = ctrl
-    chatModel.chatDbEncrypted.value = dbKey != ""
-    chatModel.chatDbStatus.value = res
-    if (res != DBMigrationResult.OK) {
-      Log.d(TAG, "Unable to migrate successfully: $res")
-    } else if (startChat) {
-      // If we migrated successfully means previous re-encryption process on database level finished successfully too
-      if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)
-      val user = chatController.apiGetActiveUser()
-      if (user == null) {
-        chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-        chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
-        chatModel.currentUser.value = null
-        chatModel.users.clear()
-      } else {
-        val savedOnboardingStage = appPreferences.onboardingStage.get()
-        chatModel.onboardingStage.value = if (listOf(OnboardingStage.Step1_SimpleXInfo, OnboardingStage.Step2_CreateProfile).contains(savedOnboardingStage) && chatModel.users.size == 1) {
-          OnboardingStage.Step3_CreateSimpleXAddress
-        } else {
-          savedOnboardingStage
-        }
-        chatController.startChat(user)
-        // Prevents from showing "Enable notifications" alert when onboarding wasn't complete yet
-        if (chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete) {
-          chatController.showBackgroundServiceNoticeIfNeeded()
-          if (appPreferences.notificationsMode.get() == NotificationsMode.SERVICE.name)
-            SimplexService.start(applicationContext)
-        }
-      }
-    }
-  }
-
-  val chatModel: ChatModel
-    get() = chatController.chatModel
-
-  private val ntfManager: NtfManager by lazy {
-    NtfManager(applicationContext, appPreferences)
-  }
-
-  private val appPreferences: AppPreferences by lazy {
-    AppPreferences(applicationContext)
-  }
-
-  val chatController: ChatController by lazy {
-    ChatController(0L, ntfManager, applicationContext, appPreferences)
-  }
-
-
-  override fun onCreate() {
-    super.onCreate()
-    context = this
-    context.getDir("temp", MODE_PRIVATE).deleteRecursively()
-    withBGApi {
-      initChatController()
-      runMigrations()
-    }
-    ProcessLifecycleOwner.get().lifecycle.addObserver(this@SimplexApp)
-  }
-
-  override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
-    Log.d(TAG, "onStateChanged: $event")
-    withApi {
-      when (event) {
-        Lifecycle.Event.ON_START -> {
-          isAppOnForeground = true
-          if (chatModel.chatRunning.value == true) {
-            kotlin.runCatching {
-              val currentUserId = chatModel.currentUser.value?.userId
-              val chats = ArrayList(chatController.apiGetChats())
-              /** Active user can be changed in background while [ChatController.apiGetChats] is executing */
-              if (chatModel.currentUser.value?.userId == currentUserId) {
-                val currentChatId = chatModel.chatId.value
-                val oldStats = if (currentChatId != null) chatModel.getChat(currentChatId)?.chatStats else null
-                if (oldStats != null) {
-                  val indexOfCurrentChat = chats.indexOfFirst { it.id == currentChatId }
-                  /** Pass old chatStats because unreadCounter can be changed already while [ChatController.apiGetChats] is executing */
-                  if (indexOfCurrentChat >= 0) chats[indexOfCurrentChat] = chats[indexOfCurrentChat].copy(chatStats = oldStats)
-                }
-                chatModel.updateChats(chats)
-              }
-            }.onFailure { Log.e(TAG, it.stackTraceToString()) }
-          }
-        }
-        Lifecycle.Event.ON_RESUME -> {
-          isAppOnForeground = true
-          if (chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete) {
-            chatController.showBackgroundServiceNoticeIfNeeded()
-          }
-          /**
-           * We're starting service here instead of in [Lifecycle.Event.ON_START] because
-           * after calling [ChatController.showBackgroundServiceNoticeIfNeeded] notification mode in prefs can be changed.
-           * It can happen when app was started and a user enables battery optimization while app in background
-           * */
-          if (chatModel.chatRunning.value != false &&
-            chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete &&
-            appPreferences.notificationsMode.get() == NotificationsMode.SERVICE.name
-          ) {
-            SimplexService.start(applicationContext)
-          }
-        }
-        else -> isAppOnForeground = false
-      }
-    }
-  }
-
-  fun allowToStartServiceAfterAppExit() = with(chatModel.controller) {
-    appPrefs.notificationsMode.get() == NotificationsMode.SERVICE.name &&
-        (!NotificationsMode.SERVICE.requiresIgnoringBattery || isIgnoringBatteryOptimizations(chatModel.controller.appContext))
-  }
-
-  private fun allowToStartPeriodically() = with(chatModel.controller) {
-    appPrefs.notificationsMode.get() == NotificationsMode.PERIODIC.name &&
-        (!NotificationsMode.PERIODIC.requiresIgnoringBattery || isIgnoringBatteryOptimizations(chatModel.controller.appContext))
-  }
-
-  /*
-  * It takes 1-10 milliseconds to process this function. Better to do it in a background thread
-  * */
-  fun schedulePeriodicServiceRestartWorker() = CoroutineScope(Dispatchers.Default).launch {
-    if (!allowToStartServiceAfterAppExit()) {
-      return@launch
-    }
-    val workerVersion = chatController.appPrefs.autoRestartWorkerVersion.get()
-    val workPolicy = if (workerVersion == SimplexService.SERVICE_START_WORKER_VERSION) {
-      Log.d(TAG, "ServiceStartWorker version matches: choosing KEEP as existing work policy")
-      ExistingPeriodicWorkPolicy.KEEP
-    } else {
-      Log.d(TAG, "ServiceStartWorker version DOES NOT MATCH: choosing REPLACE as existing work policy")
-      chatController.appPrefs.autoRestartWorkerVersion.set(SimplexService.SERVICE_START_WORKER_VERSION)
-      ExistingPeriodicWorkPolicy.REPLACE
-    }
-    val work = PeriodicWorkRequestBuilder<SimplexService.ServiceStartWorker>(SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES, TimeUnit.MINUTES)
-      .addTag(SimplexService.TAG)
-      .addTag(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC)
-      .build()
-    Log.d(TAG, "ServiceStartWorker: Scheduling period work every ${SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES} minutes")
-    WorkManager.getInstance(context)?.enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
-  }
-
-  fun schedulePeriodicWakeUp() = CoroutineScope(Dispatchers.Default).launch {
-    if (!allowToStartPeriodically()) {
-      return@launch
-    }
-    MessagesFetcherWorker.scheduleWork()
-  }
-
-  private fun runMigrations() {
-    val lastMigration = chatModel.controller.appPrefs.lastMigratedVersionCode
-    if (lastMigration.get() < BuildConfig.VERSION_CODE) {
-      while (true) {
-        if (lastMigration.get() < 117) {
-          if (chatModel.controller.appPrefs.currentTheme.get() == DefaultTheme.DARK.name) {
-            chatModel.controller.appPrefs.currentTheme.set(DefaultTheme.SIMPLEX.name)
-          }
-          lastMigration.set(117)
-        } else {
-          lastMigration.set(BuildConfig.VERSION_CODE)
-          break
-        }
-      }
-    }
-  }
-
-  companion object {
-    lateinit var context: SimplexApp private set
-
-    init {
-      val socketName = BuildConfig.APPLICATION_ID + ".local.socket.address.listen.native.cmd2"
-      val s = Semaphore(0)
-      thread(name="stdout/stderr pipe") {
-        Log.d(TAG, "starting server")
-        var server: LocalServerSocket? = null
-        for (i in 0..100) {
-          try {
-            server = LocalServerSocket(socketName + i)
-            break
-          } catch (e: IOException) {
-            Log.e(TAG, e.stackTraceToString())
-          }
-        }
-        if (server == null) {
-          throw Error("Unable to setup local server socket. Contact developers")
-        }
-        Log.d(TAG, "started server")
-        s.release()
-        val receiver = server.accept()
-        Log.d(TAG, "started receiver")
-        val logbuffer = FifoQueue<String>(500)
-        if (receiver != null) {
-          val inStream = receiver.inputStream
-          val inStreamReader = InputStreamReader(inStream)
-          val input = BufferedReader(inStreamReader)
-          Log.d(TAG, "starting receiver loop")
-          while (true) {
-            val line = input.readLine() ?: break
-            Log.w("$TAG (stdout/stderr)", line)
-            logbuffer.add(line)
-          }
-          Log.w(TAG, "exited receiver loop")
-        }
-      }
-
-      System.loadLibrary("app-lib")
-
-      s.acquire()
-      pipeStdOutToSocket(socketName)
-
-      initHS()
-    }
-  }
-}
-
-class FifoQueue<E>(private var capacity: Int) : LinkedList<E>() {
-  override fun add(element: E): Boolean {
-    if(size > capacity) removeFirst()
-    return super.add(element)
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/SimplexService.kt

@@ -1,342 +0,0 @@
-package chat.simplex.app
-
-import android.app.*
-import android.content.*
-import android.content.pm.PackageManager
-import android.os.*
-import android.provider.Settings
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import androidx.work.*
-import chat.simplex.app.model.ChatController
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.*
-
-// based on:
-// https://robertohuertas.com/2019/06/29/android_foreground_services/
-// https://github.com/binwiederhier/ntfy-android/blob/main/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
-
-class SimplexService: Service() {
-  private var wakeLock: PowerManager.WakeLock? = null
-  private var isStartingService = false
-  private var notificationManager: NotificationManager? = null
-  private var serviceNotification: Notification? = null
-
-  override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-    Log.d(TAG, "onStartCommand startId: $startId")
-    if (intent != null) {
-      val action = intent.action
-      Log.d(TAG, "intent action $action")
-      when (action) {
-        Action.START.name -> startService()
-        else -> Log.e(TAG, "No action in the intent")
-      }
-    } else {
-      Log.d(TAG, "null intent. Probably restarted by the system.")
-    }
-    return START_STICKY // to restart if killed
-  }
-
-  override fun onCreate() {
-    super.onCreate()
-    Log.d(TAG, "Simplex service created")
-    val title = getString(R.string.simplex_service_notification_title)
-    val text = getString(R.string.simplex_service_notification_text)
-    notificationManager = createNotificationChannel()
-    serviceNotification = createNotification(title, text)
-    startForeground(SIMPLEX_SERVICE_ID, serviceNotification)
-    /**
-     * The reason [stopAfterStart] exists is because when the service is not called [startForeground] yet, and
-     * we call [stopSelf] on the same service, [ForegroundServiceDidNotStartInTimeException] will be thrown.
-     * To prevent that, we can call [stopSelf] only when the service made [startForeground] call
-     * */
-    if (stopAfterStart) {
-      stopForeground(true)
-      stopSelf()
-    } else {
-      isServiceStarted = true
-    }
-  }
-
-  override fun onDestroy() {
-    Log.d(TAG, "Simplex service destroyed")
-    try {
-      wakeLock?.let {
-        while (it.isHeld) it.release() // release all, in case acquired more than once
-      }
-      wakeLock = null
-    } catch (e: Exception) {
-      Log.d(TAG, "Exception while releasing wakelock: ${e.message}")
-    }
-    isServiceStarted = false
-    stopAfterStart = false
-    saveServiceState(this, ServiceState.STOPPED)
-
-    // If notification service is enabled and battery optimization is disabled, restart the service
-    if (SimplexApp.context.allowToStartServiceAfterAppExit())
-      sendBroadcast(Intent(this, AutoRestartReceiver::class.java))
-    super.onDestroy()
-  }
-
-  private fun startService() {
-    Log.d(TAG, "SimplexService startService")
-    if (wakeLock != null || isStartingService) return
-    val self = this
-    isStartingService = true
-    withApi {
-      val chatController = (application as SimplexApp).chatController
-      waitDbMigrationEnds(chatController)
-      try {
-        Log.w(TAG, "Starting foreground service")
-        val chatDbStatus = chatController.chatModel.chatDbStatus.value
-        if (chatDbStatus != DBMigrationResult.OK) {
-          Log.w(chat.simplex.app.TAG, "SimplexService: problem with the database: $chatDbStatus")
-          showPassphraseNotification(chatDbStatus)
-          safeStopService(self)
-          return@withApi
-        }
-        saveServiceState(self, ServiceState.STARTED)
-        wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
-          newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TAG).apply {
-            acquire()
-          }
-        }
-      } finally {
-        isStartingService = false
-      }
-    }
-  }
-
-  private fun createNotificationChannel(): NotificationManager? {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      val channel = NotificationChannel(NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW).let {
-        it.setShowBadge(false) // no long-press badge
-        it
-      }
-      notificationManager.createNotificationChannel(channel)
-      return notificationManager
-    }
-    return null
-  }
-
-  private fun createNotification(title: String, text: String): Notification {
-    val pendingIntent: PendingIntent = Intent(this, MainActivity::class.java).let { notificationIntent ->
-      PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
-    }
-
-    val builder =  NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
-      .setSmallIcon(R.drawable.ntf_service_icon)
-      .setColor(0x88FFFF)
-      .setContentTitle(title)
-      .setContentText(text)
-      .setContentIntent(pendingIntent)
-      .setSilent(true)
-      .setShowWhen(false) // no date/time
-
-    // Shows a button which opens notification channel settings
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-      val setupIntent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
-      setupIntent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
-      setupIntent.putExtra(Settings.EXTRA_CHANNEL_ID, NOTIFICATION_CHANNEL_ID)
-      val setup = PendingIntent.getActivity(this, 0, setupIntent, flags)
-      builder.addAction(0, getString(R.string.hide_notification), setup)
-    }
-
-    return builder.build()
-  }
-
-  override fun onBind(intent: Intent): IBinder? {
-    return null // no binding
-  }
-
-  // re-schedules the task when "Clear recent apps" is pressed
-  override fun onTaskRemoved(rootIntent: Intent) {
-    // Just to make sure that after restart of the app the user will need to re-authenticate
-    MainActivity.clearAuthState()
-
-    // If notification service isn't enabled or battery optimization isn't disabled, we shouldn't restart the service
-    if (!SimplexApp.context.allowToStartServiceAfterAppExit()) {
-      return
-    }
-
-    val restartServiceIntent = Intent(applicationContext, SimplexService::class.java).also {
-      it.setPackage(packageName)
-    };
-    val restartServicePendingIntent: PendingIntent = PendingIntent.getService(this, 1, restartServiceIntent, PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE);
-    applicationContext.getSystemService(Context.ALARM_SERVICE);
-    val alarmService: AlarmManager = applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager;
-    alarmService.set(AlarmManager.ELAPSED_REALTIME, SystemClock.elapsedRealtime() + 1000, restartServicePendingIntent);
-  }
-
-  // restart on reboot
-  class StartReceiver: BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-      Log.d(TAG, "StartReceiver: onReceive called")
-      scheduleStart(context)
-    }
-    companion object {
-      fun toggleReceiver(enable: Boolean) {
-        Log.d(TAG, "StartReceiver: toggleReceiver enabled: $enable")
-        val component = ComponentName(BuildConfig.APPLICATION_ID, StartReceiver::class.java.name)
-        SimplexApp.context.packageManager.setComponentEnabledSetting(
-          component,
-          if (enable) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-          PackageManager.DONT_KILL_APP
-        )
-      }
-    }
-  }
-
-  // restart on destruction
-  class AutoRestartReceiver: BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-      Log.d(TAG, "AutoRestartReceiver: onReceive called")
-      scheduleStart(context)
-    }
-  }
-
-  class ServiceStartWorker(private val context: Context, params: WorkerParameters): CoroutineWorker(context, params) {
-    override suspend fun doWork(): Result {
-      val id = this.id
-      if (context.applicationContext !is Application) {
-        Log.d(TAG, "ServiceStartWorker: Failed, no application found (work ID: $id)")
-        return Result.failure()
-      }
-      if (getServiceState(context) == ServiceState.STARTED) {
-        Log.d(TAG, "ServiceStartWorker: Starting foreground service (work ID: $id)")
-        start(context)
-      }
-      return Result.success()
-    }
-  }
-
-  enum class Action {
-    START,
-  }
-
-  enum class ServiceState {
-    STARTED,
-    STOPPED,
-  }
-
-  companion object {
-    const val TAG = "SIMPLEX_SERVICE"
-    const val NOTIFICATION_CHANNEL_ID = "chat.simplex.app.SIMPLEX_SERVICE_NOTIFICATION"
-    const val NOTIFICATION_CHANNEL_NAME = "SimpleX Chat service"
-    const val SIMPLEX_SERVICE_ID = 6789
-    const val SERVICE_START_WORKER_VERSION = BuildConfig.VERSION_CODE
-    const val SERVICE_START_WORKER_INTERVAL_MINUTES = 3 * 60L
-    const val SERVICE_START_WORKER_WORK_NAME_PERIODIC = "SimplexAutoRestartWorkerPeriodic" // Do not change!
-
-    private const val PASSPHRASE_NOTIFICATION_ID = 1535
-
-    private const val WAKE_LOCK_TAG = "SimplexService::lock"
-    private const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_SERVICE_PREFS"
-    private const val SHARED_PREFS_SERVICE_STATE = "SIMPLEX_SERVICE_STATE"
-    private const val WORK_NAME_ONCE = "ServiceStartWorkerOnce"
-
-    private var isServiceStarted = false
-    private var stopAfterStart = false
-
-    fun scheduleStart(context: Context) {
-      Log.d(TAG, "Enqueuing work to start subscriber service")
-      val workManager = WorkManager.getInstance(context)
-      val startServiceRequest = OneTimeWorkRequest.Builder(ServiceStartWorker::class.java).build()
-      workManager.enqueueUniqueWork(WORK_NAME_ONCE, ExistingWorkPolicy.KEEP, startServiceRequest) // Unique avoids races!
-    }
-
-    suspend fun start(context: Context) = serviceAction(context, Action.START)
-
-    /**
-     * If there is a need to stop the service, use this function only. It makes sure that the service will be stopped without an
-     * exception related to foreground services lifecycle
-     * */
-    fun safeStopService(context: Context) {
-      if (isServiceStarted) {
-        context.stopService(Intent(context, SimplexService::class.java))
-      } else {
-        stopAfterStart = true
-      }
-    }
-
-    private suspend fun serviceAction(context: Context, action: Action) {
-      Log.d(TAG, "SimplexService serviceAction: ${action.name}")
-      withContext(Dispatchers.IO) {
-        Intent(context, SimplexService::class.java).also {
-          it.action = action.name
-          ContextCompat.startForegroundService(context, it)
-        }
-      }
-    }
-
-    fun restart(context: Context) {
-      Intent(context, SimplexService::class.java).also { intent ->
-        context.stopService(intent) // Service will auto-restart
-      }
-    }
-
-    fun saveServiceState(context: Context, state: ServiceState) {
-      getPreferences(context).edit()
-        .putString(SHARED_PREFS_SERVICE_STATE, state.name)
-        .apply()
-    }
-
-    fun getServiceState(context: Context): ServiceState {
-      val value = getPreferences(context)
-        .getString(SHARED_PREFS_SERVICE_STATE, ServiceState.STOPPED.name)
-      return ServiceState.valueOf(value!!)
-    }
-
-    fun showPassphraseNotification(chatDbStatus: DBMigrationResult?) {
-      val pendingIntent: PendingIntent = Intent(SimplexApp.context, MainActivity::class.java).let { notificationIntent ->
-        PendingIntent.getActivity(SimplexApp.context, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
-      }
-
-      val title = when(chatDbStatus) {
-        is DBMigrationResult.ErrorNotADatabase -> generalGetString(R.string.enter_passphrase_notification_title)
-        is DBMigrationResult.OK -> return
-        else -> generalGetString(R.string.database_initialization_error_title)
-      }
-
-      val description = when(chatDbStatus) {
-        is DBMigrationResult.ErrorNotADatabase -> generalGetString(R.string.enter_passphrase_notification_desc)
-        is DBMigrationResult.OK -> return
-        else -> generalGetString(R.string.database_initialization_error_desc)
-      }
-
-      val builder =  NotificationCompat.Builder(SimplexApp.context, NOTIFICATION_CHANNEL_ID)
-        .setSmallIcon(R.drawable.ntf_service_icon)
-        .setColor(0x88FFFF)
-        .setContentTitle(title)
-        .setContentText(description)
-        .setContentIntent(pendingIntent)
-        .setSilent(true)
-        .setShowWhen(false)
-
-      val notificationManager = SimplexApp.context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      notificationManager.notify(PASSPHRASE_NOTIFICATION_ID, builder.build())
-    }
-
-    fun cancelPassphraseNotification() {
-      val notificationManager = SimplexApp.context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      notificationManager.cancel(PASSPHRASE_NOTIFICATION_ID)
-    }
-
-    /*
-    * When the app starts the database is in migration process. It can take from seconds to tens of seconds.
-    * It happens in background thread, so other places that relies on database should wait til the end of migration
-    * */
-    suspend fun waitDbMigrationEnds(chatController: ChatController) {
-      var maxWaitTime = 50_000
-      while (chatController.chatModel.chatDbStatus.value == null && maxWaitTime > 0) {
-        delay(50)
-        maxWaitTime -= 50
-      }
-    }
-
-    private fun getPreferences(context: Context): SharedPreferences = context.getSharedPreferences(SHARED_PREFS_ID, Context.MODE_PRIVATE)
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/WelcomeView.kt

@@ -1,191 +0,0 @@
-package chat.simplex.app.views
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.*
-import androidx.compose.material.MaterialTheme.colors
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.*
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.style.*
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.Profile
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.onboarding.OnboardingStage
-import chat.simplex.app.views.onboarding.ReadableText
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.distinctUntilChanged
-
-fun isValidDisplayName(name: String) : Boolean {
-  return (name.firstOrNull { it.isWhitespace() }) == null && !name.startsWith("@") && !name.startsWith("#")
-}
-
-@Composable
-fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
-  val displayName = rememberSaveable { mutableStateOf("") }
-  val fullName = rememberSaveable { mutableStateOf("") }
-  val focusRequester = remember { FocusRequester() }
-
-  Column(
-    modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
-  ) {
-    /*CloseSheetBar(close = {
-      if (chatModel.users.isEmpty()) {
-        chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
-      } else {
-        close()
-      }
-    })*/
-    Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-      AppBarTitle(stringResource(R.string.create_profile), bottomPadding = DEFAULT_PADDING)
-      ReadableText(R.string.your_profile_is_stored_on_your_device, TextAlign.Center, padding = PaddingValues(), style = MaterialTheme.typography.body1)
-      ReadableText(R.string.profile_is_only_shared_with_your_contacts, TextAlign.Center, style = MaterialTheme.typography.body1)
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-        Text(
-          stringResource(R.string.display_name),
-          fontSize = 16.sp
-        )
-        if (!isValidDisplayName(displayName.value)) {
-          Text(
-            stringResource(R.string.no_spaces),
-            fontSize = 16.sp,
-            color = Color.Red
-          )
-        }
-      }
-      ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Text(
-        stringResource(R.string.full_name_optional__prompt),
-        fontSize = 16.sp,
-        modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
-      )
-      ProfileNameField(fullName, "", ::isValidDisplayName)
-    }
-    Spacer(Modifier.fillMaxHeight().weight(1f))
-    Row {
-      if (chatModel.users.isEmpty()) {
-        SimpleButtonDecorated(
-          text = stringResource(R.string.about_simplex),
-          icon = painterResource(R.drawable.ic_arrow_back_ios_new),
-          textDecoration = TextDecoration.None,
-          fontWeight = FontWeight.Medium
-        ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }
-      }
-      Spacer(Modifier.fillMaxWidth().weight(1f))
-      val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
-      val createModifier: Modifier
-      val createColor: Color
-      if (enabled) {
-        createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value, close) }.padding(8.dp)
-        createColor = MaterialTheme.colors.primary
-      } else {
-        createModifier = Modifier.padding(8.dp)
-        createColor = MaterialTheme.colors.secondary
-      }
-      Surface(shape = RoundedCornerShape(20.dp), color = Color.Transparent) {
-        Row(verticalAlignment = Alignment.CenterVertically, modifier = createModifier) {
-          Text(stringResource(R.string.create_profile_button), style = MaterialTheme.typography.caption, color = createColor, fontWeight = FontWeight.Medium)
-          Icon(painterResource(R.drawable.ic_arrow_forward_ios), stringResource(R.string.create_profile_button), tint = createColor)
-        }
-      }
-    }
-
-    LaunchedEffect(Unit) {
-      delay(300)
-      focusRequester.requestFocus()
-    }
-  }
-}
-
-fun createProfile(chatModel: ChatModel, displayName: String, fullName: String, close: () -> Unit) {
-  withApi {
-    val user = chatModel.controller.apiCreateActiveUser(
-      Profile(displayName, fullName, null)
-    ) ?: return@withApi
-    chatModel.currentUser.value = user
-    if (chatModel.users.isEmpty()) {
-      chatModel.controller.startChat(user)
-      chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
-      chatModel.onboardingStage.value = OnboardingStage.Step3_CreateSimpleXAddress
-    } else {
-      val users = chatModel.controller.listUsers()
-      chatModel.users.clear()
-      chatModel.users.addAll(users)
-      chatModel.controller.getUserChatData()
-      // the next two lines are only needed for failure case when because of the database error the app gets stuck on on-boarding screen,
-      // this will get it unstuck.
-      chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.OnboardingComplete)
-      chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
-      close()
-    }
-  }
-}
-
-@Composable
-fun ProfileNameField(name: MutableState<String>, placeholder: String = "", isValid: (String) -> Boolean = { true }, focusRequester: FocusRequester? = null) {
-  var valid by rememberSaveable { mutableStateOf(true) }
-  var focused by rememberSaveable { mutableStateOf(false) }
-  val strokeColor by remember {
-    derivedStateOf {
-      if (valid) {
-        if (focused) {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.6f)
-        } else {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.3f)
-        }
-      } else Color.Red
-    }
-  }
-  val modifier = Modifier
-    .fillMaxWidth()
-    .padding(horizontal = DEFAULT_PADDING)
-    .navigationBarsWithImePadding()
-    .onFocusChanged { focused = it.isFocused }
-  Box(
-    Modifier
-      .fillMaxWidth()
-      .height(52.dp)
-      .border(border = BorderStroke(1.dp, strokeColor), shape = RoundedCornerShape(50)),
-    contentAlignment = Alignment.Center
-  ) {
-    BasicTextField(
-      value = name.value,
-      onValueChange = { name.value = it },
-      modifier = if (focusRequester == null) modifier else modifier.focusRequester(focusRequester),
-      textStyle = TextStyle(fontSize = 18.sp, color = colors.onBackground),
-      keyboardOptions = KeyboardOptions(
-        capitalization = KeyboardCapitalization.None,
-        autoCorrect = false
-      ),
-      singleLine = true,
-      cursorBrush = SolidColor(MaterialTheme.colors.secondary)
-    )
-  }
-  LaunchedEffect(Unit) {
-    snapshotFlow { name.value }
-      .distinctUntilChanged()
-      .collect {
-        valid = isValid(it)
-      }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt

@@ -1,488 +0,0 @@
-package chat.simplex.app.views.chat
-
-import InfoRow
-import InfoRowEllipsis
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionItemView
-import SectionItemViewWithIcon
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import TextIconSpaced
-import android.widget.Toast
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
-import chat.simplex.app.views.usersettings.*
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.*
-import kotlinx.datetime.Clock
-
-@Composable
-fun ChatInfoView(
-  chatModel: ChatModel,
-  contact: Contact,
-  connStats: ConnectionStats?,
-  customUserProfile: Profile?,
-  localAlias: String,
-  connectionCode: String?,
-  close: () -> Unit,
-) {
-  BackHandler(onBack = close)
-  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
-  val developerTools = chatModel.controller.appPrefs.developerTools.get()
-  if (chat != null) {
-    val contactNetworkStatus = remember(chatModel.networkStatuses.toMap()) {
-      mutableStateOf(chatModel.contactNetworkStatus(contact))
-    }
-    ChatInfoLayout(
-      chat,
-      contact,
-      connStats,
-      contactNetworkStatus.value,
-      customUserProfile,
-      localAlias,
-      connectionCode,
-      developerTools,
-      onLocalAliasChanged = {
-        setContactAlias(chat.chatInfo.apiId, it, chatModel)
-      },
-      openPreferences = {
-        ModalManager.shared.showCustomModal { close ->
-          val user = chatModel.currentUser.value
-          if (user != null) {
-            ContactPreferencesView(chatModel, user, contact.contactId, close)
-          }
-        }
-      },
-      deleteContact = { deleteContactDialog(chat.chatInfo, chatModel, close) },
-      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) },
-      switchContactAddress = {
-        showSwitchContactAddressAlert(chatModel, contact.contactId)
-      },
-      verifyClicked = {
-        ModalManager.shared.showModalCloseable { close ->
-          remember { derivedStateOf { (chatModel.getContactChat(contact.contactId)?.chatInfo as? ChatInfo.Direct)?.contact } }.value?.let { ct ->
-            VerifyCodeView(
-              ct.displayName,
-              connectionCode,
-              ct.verified,
-              verify = { code ->
-                chatModel.controller.apiVerifyContact(ct.contactId, code)?.let { r ->
-                  val (verified, existingCode) = r
-                  chatModel.updateContact(
-                    ct.copy(
-                      activeConn = ct.activeConn.copy(
-                        connectionCode = if (verified) SecurityCode(existingCode, Clock.System.now()) else null
-                      )
-                    )
-                  )
-                  r
-                }
-              },
-              close,
-            )
-          }
-        }
-      }
-    )
-  }
-}
-
-fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.delete_contact_question),
-    text = generalGetString(R.string.delete_contact_all_messages_deleted_cannot_undo_warning),
-    confirmText = generalGetString(R.string.delete_verb),
-    onConfirm = {
-      withApi {
-        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
-        if (r) {
-          chatModel.removeChat(chatInfo.id)
-          chatModel.chatId.value = null
-          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
-          close?.invoke()
-        }
-      }
-    },
-    destructive = true,
-  )
-}
-
-fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.clear_chat_question),
-    text = generalGetString(R.string.clear_chat_warning),
-    confirmText = generalGetString(R.string.clear_verb),
-    onConfirm = {
-      withApi {
-        val updatedChatInfo = chatModel.controller.apiClearChat(chatInfo.chatType, chatInfo.apiId)
-        if (updatedChatInfo != null) {
-          chatModel.clearChat(updatedChatInfo)
-          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
-          close?.invoke()
-        }
-      }
-    },
-    destructive = true,
-  )
-}
-
-@Composable
-fun ChatInfoLayout(
-  chat: Chat,
-  contact: Contact,
-  connStats: ConnectionStats?,
-  contactNetworkStatus: NetworkStatus,
-  customUserProfile: Profile?,
-  localAlias: String,
-  connectionCode: String?,
-  developerTools: Boolean,
-  onLocalAliasChanged: (String) -> Unit,
-  openPreferences: () -> Unit,
-  deleteContact: () -> Unit,
-  clearChat: () -> Unit,
-  switchContactAddress: () -> Unit,
-  verifyClicked: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
-  ) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      ChatInfoHeader(chat.chatInfo, contact)
-    }
-
-    LocalAliasEditor(localAlias, updateValue = onLocalAliasChanged)
-    SectionSpacer()
-    if (customUserProfile != null) {
-      SectionView(generalGetString(R.string.incognito).uppercase()) {
-        InfoRow(generalGetString(R.string.incognito_random_profile), customUserProfile.chatViewName)
-      }
-      SectionDividerSpaced()
-    }
-
-    SectionView {
-      if (connectionCode != null) {
-        VerifyCodeButton(contact.verified, verifyClicked)
-      }
-      ContactPreferencesButton(openPreferences)
-    }
-
-    SectionDividerSpaced()
-    if (contact.contactLink != null) {
-      val context = LocalContext.current
-      SectionView(stringResource(R.string.address_section_title).uppercase()) {
-        QRCode(contact.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-        ShareAddressButton { shareText(context, contact.contactLink) }
-        SectionTextFooter(stringResource(R.string.you_can_share_this_address_with_your_contacts).format(contact.displayName))
-      }
-      SectionDividerSpaced()
-    }
-
-    SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
-      SwitchAddressButton(switchContactAddress)
-      if (connStats != null) {
-        SectionItemView({
-          AlertManager.shared.showAlertMsg(
-            generalGetString(R.string.network_status),
-            contactNetworkStatus.statusExplanation
-          )}) {
-          NetworkStatusRow(contactNetworkStatus)
-        }
-        val rcvServers = connStats.rcvServers
-        if (rcvServers != null && rcvServers.isNotEmpty()) {
-          SimplexServers(stringResource(R.string.receiving_via), rcvServers)
-        }
-        val sndServers = connStats.sndServers
-        if (sndServers != null && sndServers.isNotEmpty()) {
-          SimplexServers(stringResource(R.string.sending_via), sndServers)
-        }
-      }
-    }
-    SectionDividerSpaced()
-    SectionView {
-      ClearChatButton(clearChat)
-      DeleteContactButton(deleteContact)
-    }
-
-    if (developerTools) {
-      SectionDividerSpaced()
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), chat.chatInfo.localDisplayName)
-        InfoRow(stringResource(R.string.info_row_database_id), chat.chatInfo.apiId.toString())
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-fun ChatInfoHeader(cInfo: ChatInfo, contact: Contact) {
-  Column(
-    Modifier.padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    ChatInfoImage(cInfo, size = 192.dp, iconColor = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
-    Row(Modifier.padding(bottom = 8.dp), verticalAlignment = Alignment.CenterVertically) {
-      if (contact.verified) {
-        Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = MaterialTheme.colors.secondary)
-      }
-      Text(
-        contact.profile.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-      )
-    }
-    if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName && cInfo.fullName != contact.profile.displayName) {
-      Text(
-        cInfo.fullName, style = MaterialTheme.typography.h2,
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 2,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-  }
-}
-
-@Composable
-fun LocalAliasEditor(
-  initialValue: String,
-  center: Boolean = true,
-  leadingIcon: Boolean = false,
-  focus: Boolean = false,
-  updateValue: (String) -> Unit
-) {
-  var value by rememberSaveable { mutableStateOf(initialValue) }
-  val modifier = if (center)
-    Modifier.padding(horizontal = if (!leadingIcon) DEFAULT_PADDING else 0.dp).widthIn(min = 100.dp)
-  else
-    Modifier.padding(horizontal = if (!leadingIcon) DEFAULT_PADDING else 0.dp).fillMaxWidth()
-  Row(Modifier.fillMaxWidth(), horizontalArrangement = if (center) Arrangement.Center else Arrangement.Start) {
-    DefaultBasicTextField(
-      modifier,
-      value,
-      {
-        Text(
-          generalGetString(R.string.text_field_set_contact_placeholder),
-          textAlign = if (center) TextAlign.Center else TextAlign.Start,
-          color = MaterialTheme.colors.secondary
-        )
-      },
-      leadingIcon = if (leadingIcon) {
-        { Icon(painterResource(R.drawable.ic_edit_filled), null, Modifier.padding(start = 7.dp)) }
-      } else null,
-      color = MaterialTheme.colors.secondary,
-      focus = focus,
-      textStyle = TextStyle.Default.copy(textAlign = if (value.isEmpty() || !center) TextAlign.Start else TextAlign.Center),
-      keyboardActions = KeyboardActions(onDone = { updateValue(value) })
-    ) {
-      value = it
-    }
-  }
-  LaunchedEffect(Unit) {
-    snapshotFlow { value }
-      .onEach { delay(500) } // wait a little after every new character, don't emit until user stops typing
-      .conflate() // get the latest value
-      .filter { it == value } // don't process old ones
-      .collect {
-        updateValue(value)
-      }
-  }
-  DisposableEffect(Unit) {
-    onDispose { updateValue(value) } // just in case snapshotFlow will be canceled when user presses Back too fast
-  }
-}
-
-@Composable
-private fun NetworkStatusRow(networkStatus: NetworkStatus) {
-  Row(
-    Modifier.fillMaxSize(),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Row(
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(4.dp)
-    ) {
-      Text(stringResource(R.string.network_status))
-      Icon(
-        painterResource(R.drawable.ic_info),
-        stringResource(R.string.network_status),
-        tint = MaterialTheme.colors.primary
-      )
-    }
-
-    Row(
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(4.dp)
-    ) {
-      Text(
-        networkStatus.statusString,
-        color = MaterialTheme.colors.secondary
-      )
-      ServerImage(networkStatus)
-    }
-  }
-}
-
-@Composable
-private fun ServerImage(networkStatus: NetworkStatus) {
-  Box(Modifier.size(18.dp)) {
-    when (networkStatus) {
-      is NetworkStatus.Connected ->
-        Icon(painterResource(R.drawable.ic_circle_filled), stringResource(R.string.icon_descr_server_status_connected), tint = MaterialTheme.colors.primaryVariant)
-      is NetworkStatus.Disconnected ->
-        Icon(painterResource(R.drawable.ic_pending_filled), stringResource(R.string.icon_descr_server_status_disconnected), tint = MaterialTheme.colors.secondary)
-      is NetworkStatus.Error ->
-        Icon(painterResource(R.drawable.ic_error_filled), stringResource(R.string.icon_descr_server_status_error), tint = MaterialTheme.colors.secondary)
-      else -> Icon(painterResource(R.drawable.ic_circle), stringResource(R.string.icon_descr_server_status_pending), tint = MaterialTheme.colors.secondary)
-    }
-  }
-}
-
-@Composable
-fun SimplexServers(text: String, servers: List<String>) {
-  val info = servers.joinToString(separator = ", ") { it.substringAfter("@") }
-  val clipboardManager: ClipboardManager = LocalClipboardManager.current
-  InfoRowEllipsis(text, info) {
-    clipboardManager.setText(AnnotatedString(servers.joinToString(separator = ",")))
-    Toast.makeText(SimplexApp.context, generalGetString(R.string.copied), Toast.LENGTH_SHORT).show()
-  }
-}
-
-@Composable
-fun SwitchAddressButton(onClick: () -> Unit) {
-  SectionItemView(onClick) {
-    Text(stringResource(R.string.switch_receiving_address), color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-fun VerifyCodeButton(contactVerified: Boolean, onClick: () -> Unit) {
-  SettingsActionItem(
-    if (contactVerified) painterResource(R.drawable.ic_verified_user) else painterResource(R.drawable.ic_shield),
-    stringResource(if (contactVerified) R.string.view_security_code else R.string.verify_security_code),
-    click = onClick,
-    iconColor = MaterialTheme.colors.secondary,
-  )
-}
-
-@Composable
-private fun ContactPreferencesButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_toggle_on),
-    stringResource(R.string.contact_preferences),
-    click = onClick
-  )
-}
-
-@Composable
-fun ClearChatButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_settings_backup_restore),
-    stringResource(R.string.clear_chat_button),
-    click = onClick,
-    textColor = WarningOrange,
-    iconColor = WarningOrange,
-  )
-}
-
-@Composable
-private fun DeleteContactButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_delete),
-    stringResource(R.string.button_delete_contact),
-    click = onClick,
-    textColor = Color.Red,
-    iconColor = Color.Red,
-  )
-}
-
-@Composable
-fun ShareAddressButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_share_filled),
-    stringResource(R.string.share_address),
-    onClick,
-    iconColor = MaterialTheme.colors.primary,
-    textColor = MaterialTheme.colors.primary,
-  )
-}
-
-private fun setContactAlias(contactApiId: Long, localAlias: String, chatModel: ChatModel) = withApi {
-  chatModel.controller.apiSetContactAlias(contactApiId, localAlias)?.let {
-    chatModel.updateContact(it)
-  }
-}
-
-private fun showSwitchContactAddressAlert(m: ChatModel, contactId: Long) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.switch_receiving_address_question),
-    text = generalGetString(R.string.switch_receiving_address_desc),
-    confirmText = generalGetString(R.string.switch_verb),
-    onConfirm = {
-      switchContactAddress(m, contactId)
-    },
-    destructive = true,
-  )
-}
-
-private fun switchContactAddress(m: ChatModel, contactId: Long) = withApi {
-  m.controller.apiSwitchContact(contactId)
-}
-
-@Preview
-@Composable
-fun PreviewChatInfoLayout() {
-  SimpleXTheme {
-    ChatInfoLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = arrayListOf()
-      ),
-      Contact.sampleData,
-      localAlias = "",
-      connectionCode = "123",
-      developerTools = false,
-      connStats = null,
-      contactNetworkStatus = NetworkStatus.Connected(),
-      onLocalAliasChanged = {},
-      customUserProfile = null,
-      openPreferences = {},
-      deleteContact = {},
-      clearChat = {},
-      switchContactAddress = {},
-      verifyClicked = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatItemInfoView.kt

@@ -1,186 +0,0 @@
-package chat.simplex.app.views.chat
-
-import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.CurrentColors
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.chat.item.ItemAction
-import chat.simplex.app.views.chat.item.MarkdownText
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun ChatItemInfoView(ci: ChatItem, ciInfo: ChatItemInfo, devTools: Boolean) {
-  val sent = ci.chatDir.sent
-  val appColors = CurrentColors.collectAsState().value.appColors
-  val itemColor = if (sent) appColors.sentMessage else appColors.receivedMessage
-  val context = LocalContext.current
-  val uriHandler = LocalUriHandler.current
-
-  @Composable
-  fun ItemVersionView(ciVersion: ChatItemVersion, current: Boolean) {
-    val showMenu = remember { mutableStateOf(false) }
-    val text = ciVersion.msgContent.text
-
-    @Composable
-    fun VersionText() {
-      if (text != "") {
-        MarkdownText(
-          text, if (text.isEmpty()) emptyList() else ciVersion.formattedText,
-          linkMode = SimplexLinkMode.DESCRIPTION, uriHandler = uriHandler,
-          onLinkLongClick = { showMenu.value = true }
-        )
-      } else {
-        Text(
-          generalGetString(R.string.item_info_no_text),
-          style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary, lineHeight = 22.sp, fontStyle = FontStyle.Italic)
-        )
-      }
-    }
-
-    Column {
-      Box(
-        Modifier.clip(RoundedCornerShape(18.dp)).background(itemColor).padding(bottom = 3.dp)
-          .combinedClickable(onLongClick = { showMenu.value = true }, onClick = {})
-      ) {
-        Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
-          VersionText()
-        }
-      }
-      Row(Modifier.padding(start = 12.dp, top = 3.dp, bottom = 16.dp)) {
-        Text(
-          localTimestamp(ciVersion.itemVersionTs),
-          fontSize = 12.sp,
-          color = MaterialTheme.colors.secondary,
-          modifier = Modifier.padding(end = 6.dp)
-        )
-        if (current && ci.meta.itemDeleted == null) {
-          Text(
-            stringResource(R.string.item_info_current),
-            fontSize = 12.sp,
-            color = MaterialTheme.colors.secondary
-          )
-        }
-      }
-      if (text != "") {
-        DefaultDropdownMenu(showMenu) {
-          ItemAction(stringResource(R.string.share_verb), painterResource(R.drawable.ic_share), onClick = {
-            shareText(context, text)
-            showMenu.value = false
-          })
-          ItemAction(stringResource(R.string.copy_verb), painterResource(R.drawable.ic_content_copy), onClick = {
-            copyText(context, text)
-            showMenu.value = false
-          })
-        }
-      }
-    }
-  }
-
-  Column(Modifier.fillMaxWidth().verticalScroll(rememberScrollState())) {
-    AppBarTitle(stringResource(if (sent) R.string.sent_message else R.string.received_message))
-    SectionView {
-      InfoRow(stringResource(R.string.info_row_sent_at), localTimestamp(ci.meta.itemTs))
-      if (!sent) {
-        InfoRow(stringResource(R.string.info_row_received_at), localTimestamp(ci.meta.createdAt))
-      }
-      when (val itemDeleted = ci.meta.itemDeleted) {
-        is CIDeleted.Deleted ->
-          if (itemDeleted.deletedTs != null) {
-            InfoRow(stringResource(R.string.info_row_deleted_at), localTimestamp(itemDeleted.deletedTs))
-          }
-        is CIDeleted.Moderated ->
-          if (itemDeleted.deletedTs != null) {
-            InfoRow(stringResource(R.string.info_row_moderated_at), localTimestamp(itemDeleted.deletedTs))
-          }
-        else -> {}
-      }
-      val deleteAt = ci.meta.itemTimed?.deleteAt
-      if (deleteAt != null) {
-        InfoRow(stringResource(R.string.info_row_disappears_at), localTimestamp(deleteAt))
-      }
-      if (devTools) {
-        InfoRow(stringResource(R.string.info_row_database_id), ci.meta.itemId.toString())
-        InfoRow(stringResource(R.string.info_row_updated_at), localTimestamp(ci.meta.updatedAt))
-      }
-    }
-    val versions = ciInfo.itemVersions
-    if (versions.isNotEmpty()) {
-      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = false)
-      SectionView(padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
-        Text(stringResource(R.string.edit_history), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = DEFAULT_PADDING))
-        versions.forEachIndexed { i, ciVersion ->
-          ItemVersionView(ciVersion, current = i == 0)
-        }
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-fun itemInfoShareText(ci: ChatItem, chatItemInfo: ChatItemInfo, devTools: Boolean): String {
-  val meta = ci.meta
-  val sent = ci.chatDir.sent
-  val shareText = mutableListOf<String>(generalGetString(if (sent) R.string.sent_message else R.string.received_message), "")
-
-  shareText.add(String.format(generalGetString(R.string.share_text_sent_at), localTimestamp(meta.itemTs)))
-  if (!ci.chatDir.sent) {
-    shareText.add(String.format(generalGetString(R.string.share_text_received_at), localTimestamp(meta.createdAt)))
-  }
-  when (val itemDeleted = ci.meta.itemDeleted) {
-    is CIDeleted.Deleted ->
-      if (itemDeleted.deletedTs != null) {
-        shareText.add(String.format(generalGetString(R.string.share_text_deleted_at), localTimestamp(itemDeleted.deletedTs)))
-      }
-    is CIDeleted.Moderated ->
-      if (itemDeleted.deletedTs != null) {
-        shareText.add(String.format(generalGetString(R.string.share_text_moderated_at), localTimestamp(itemDeleted.deletedTs)))
-      }
-    else -> {}
-  }
-  val deleteAt = ci.meta.itemTimed?.deleteAt
-  if (deleteAt != null) {
-    shareText.add(String.format(generalGetString(R.string.share_text_disappears_at), localTimestamp(deleteAt)))
-  }
-  if (devTools) {
-    shareText.add(String.format(generalGetString(R.string.share_text_database_id), meta.itemId))
-    shareText.add(String.format(generalGetString(R.string.share_text_updated_at), meta.updatedAt))
-  }
-  val versions = chatItemInfo.itemVersions
-  if (versions.isNotEmpty()) {
-    shareText.add("")
-    shareText.add(generalGetString(R.string.edit_history))
-    versions.forEachIndexed { index, itemVersion ->
-      val ts = localTimestamp(itemVersion.itemVersionTs)
-      shareText.add("")
-      shareText.add(
-        if (index == 0 && ci.meta.itemDeleted == null) {
-          String.format(generalGetString(R.string.current_version_timestamp), ts)
-        } else {
-          localTimestamp(itemVersion.itemVersionTs)
-        }
-      )
-      val t = itemVersion.msgContent.text
-      shareText.add(if (t != "") t else generalGetString(R.string.item_info_no_text))
-    }
-  }
-  return shareText.joinToString(separator = "\n")
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/ScanCodeView.kt

@@ -1,53 +0,0 @@
-package chat.simplex.app.views.chat
-
-import android.Manifest
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCodeScanner
-import com.google.accompanist.permissions.rememberPermissionState
-
-@Composable
-fun ScanCodeView(verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit, close: () -> Unit) {
-  val cameraPermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
-  LaunchedEffect(Unit) {
-    cameraPermissionState.launchPermissionRequest()
-  }
-  ScanCodeLayout(verifyCode, close)
-}
-
-@Composable
-private fun ScanCodeLayout(verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit, close: () -> Unit) {
-  Column(
-    Modifier
-      .fillMaxSize()
-      .padding(horizontal = DEFAULT_PADDING)
-  ) {
-    AppBarTitle(stringResource(R.string.scan_code), false)
-    Box(
-      Modifier
-        .fillMaxWidth()
-        .aspectRatio(ratio = 1F)
-        .padding(bottom = DEFAULT_PADDING)
-    ) {
-      QRCodeScanner { text ->
-        verifyCode(text) {
-          if (it) {
-            close()
-          } else {
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(R.string.incorrect_code)
-            )
-          }
-        }
-      }
-    }
-    Text(stringResource(R.string.scan_code_from_contacts_app))
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt

@@ -1,412 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionItemView
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import android.util.Log
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.*
-import chat.simplex.app.views.chatlist.cantInviteIncognitoAlert
-import chat.simplex.app.views.chatlist.setGroupMembers
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.*
-
-@Composable
-fun GroupChatInfoView(chatModel: ChatModel, groupLink: String?, groupLinkMemberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String?, GroupMemberRole?>) -> Unit, close: () -> Unit) {
-  BackHandler(onBack = close)
-  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
-  val developerTools = chatModel.controller.appPrefs.developerTools.get()
-  if (chat != null && chat.chatInfo is ChatInfo.Group) {
-    val groupInfo = chat.chatInfo.groupInfo
-    GroupChatInfoLayout(
-      chat,
-      groupInfo,
-      members = chatModel.groupMembers
-        .filter { it.memberStatus != GroupMemberStatus.MemLeft && it.memberStatus != GroupMemberStatus.MemRemoved }
-        .sortedBy { it.displayName.lowercase() },
-      developerTools,
-      groupLink,
-      addMembers = {
-        withApi {
-          setGroupMembers(groupInfo, chatModel)
-          ModalManager.shared.showModalCloseable(true) { close ->
-            AddGroupMembersView(groupInfo, false, chatModel, close)
-          }
-        }
-      },
-      showMemberInfo = { member ->
-        withApi {
-          val stats = chatModel.controller.apiGroupMemberInfo(groupInfo.groupId, member.groupMemberId)
-          val (_, code) = if (member.memberActive) {
-            try {
-              chatModel.controller.apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId)
-            } catch (e: Exception) {
-              Log.e(TAG, e.stackTraceToString())
-              member to null
-            }
-          } else {
-            member to null
-          }
-          ModalManager.shared.showModalCloseable(true) { closeCurrent ->
-            remember { derivedStateOf { chatModel.groupMembers.firstOrNull { it.memberId == member.memberId } } }.value?.let { mem ->
-              GroupMemberInfoView(groupInfo, mem, stats, code, chatModel, closeCurrent) {
-                closeCurrent()
-                close()
-              }
-            }
-          }
-        }
-      },
-      editGroupProfile = {
-        ModalManager.shared.showCustomModal { close -> GroupProfileView(groupInfo, chatModel, close) }
-      },
-      addOrEditWelcomeMessage = {
-        ModalManager.shared.showCustomModal { close -> GroupWelcomeView(chatModel, groupInfo, close) }
-      },
-      openPreferences = {
-        ModalManager.shared.showCustomModal { close ->
-          GroupPreferencesView(
-            chatModel,
-            chat.id,
-            close
-          )
-        }
-      },
-      deleteGroup = { deleteGroupDialog(chat.chatInfo, groupInfo, chatModel, close) },
-      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) },
-      leaveGroup = { leaveGroupDialog(groupInfo, chatModel, close) },
-      manageGroupLink = {
-          ModalManager.shared.showModal { GroupLinkView(chatModel, groupInfo, groupLink, groupLinkMemberRole, onGroupLinkUpdated) }
-      }
-    )
-  }
-}
-
-fun deleteGroupDialog(chatInfo: ChatInfo, groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  val alertTextKey =
-    if (groupInfo.membership.memberCurrent) R.string.delete_group_for_all_members_cannot_undo_warning
-    else R.string.delete_group_for_self_cannot_undo_warning
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.delete_group_question),
-    text = generalGetString(alertTextKey),
-    confirmText = generalGetString(R.string.delete_verb),
-    onConfirm = {
-      withApi {
-        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
-        if (r) {
-          chatModel.removeChat(chatInfo.id)
-          chatModel.chatId.value = null
-          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
-          close?.invoke()
-        }
-      }
-    },
-    destructive = true,
-  )
-}
-
-fun leaveGroupDialog(groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.leave_group_question),
-    text = generalGetString(R.string.you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved),
-    confirmText = generalGetString(R.string.leave_group_button),
-    onConfirm = {
-      withApi {
-        chatModel.controller.leaveGroup(groupInfo.groupId)
-        close?.invoke()
-      }
-    },
-    destructive = true,
-  )
-}
-
-@Composable
-fun GroupChatInfoLayout(
-  chat: Chat,
-  groupInfo: GroupInfo,
-  members: List<GroupMember>,
-  developerTools: Boolean,
-  groupLink: String?,
-  addMembers: () -> Unit,
-  showMemberInfo: (GroupMember) -> Unit,
-  editGroupProfile: () -> Unit,
-  addOrEditWelcomeMessage: () -> Unit,
-  openPreferences: () -> Unit,
-  deleteGroup: () -> Unit,
-  clearChat: () -> Unit,
-  leaveGroup: () -> Unit,
-  manageGroupLink: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
-  ) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      GroupChatInfoHeader(chat.chatInfo)
-    }
-    SectionSpacer()
-
-    SectionView {
-      if (groupInfo.canEdit) {
-        EditGroupProfileButton(editGroupProfile)
-      }
-      if (groupInfo.groupProfile.description != null || groupInfo.canEdit) {
-        AddOrEditWelcomeMessage(groupInfo.groupProfile.description, addOrEditWelcomeMessage)
-      }
-      GroupPreferencesButton(openPreferences)
-    }
-    SectionTextFooter(stringResource(R.string.only_group_owners_can_change_prefs))
-    SectionDividerSpaced(maxTopPadding = true)
-
-    SectionView(title = String.format(generalGetString(R.string.group_info_section_title_num_members), members.count() + 1)) {
-      if (groupInfo.canAddMembers) {
-        if (groupLink == null) {
-          CreateGroupLinkButton(manageGroupLink)
-        } else {
-          GroupLinkButton(manageGroupLink)
-        }
-
-        val onAddMembersClick = if (chat.chatInfo.incognito) ::cantInviteIncognitoAlert else addMembers
-        val tint = if (chat.chatInfo.incognito) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
-        AddMembersButton(tint, onAddMembersClick)
-      }
-      SectionItemView(minHeight = 54.dp) {
-        MemberRow(groupInfo.membership, user = true)
-      }
-      MembersList(members, showMemberInfo)
-    }
-    SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
-    SectionView {
-      ClearChatButton(clearChat)
-      if (groupInfo.canDelete) {
-        DeleteGroupButton(deleteGroup)
-      }
-      if (groupInfo.membership.memberCurrent) {
-        LeaveGroupButton(leaveGroup)
-      }
-    }
-
-    if (developerTools) {
-      SectionDividerSpaced()
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), groupInfo.localDisplayName)
-        InfoRow(stringResource(R.string.info_row_database_id), groupInfo.apiId.toString())
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun GroupChatInfoHeader(cInfo: ChatInfo) {
-  Column(
-    Modifier.padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    ChatInfoImage(cInfo, size = 192.dp, iconColor = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
-    Text(
-      cInfo.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-      color = MaterialTheme.colors.onBackground,
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis
-    )
-    if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName) {
-      Text(
-        cInfo.fullName, style = MaterialTheme.typography.h2,
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 2,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-  }
-}
-
-@Composable
-private fun GroupPreferencesButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_toggle_on),
-    stringResource(R.string.group_preferences),
-    click = onClick
-  )
-}
-
-@Composable
-private fun AddMembersButton(tint: Color = MaterialTheme.colors.primary, onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_add),
-    stringResource(R.string.button_add_members),
-    onClick,
-    iconColor = tint,
-    textColor = tint
-  )
-}
-
-@Composable
-private fun MembersList(members: List<GroupMember>, showMemberInfo: (GroupMember) -> Unit) {
-  Column {
-    members.forEachIndexed { index, member ->
-      Divider()
-      SectionItemView({ showMemberInfo(member) }, minHeight = 54.dp) {
-        MemberRow(member)
-      }
-    }
-  }
-}
-
-@Composable
-private fun MemberRow(member: GroupMember, user: Boolean = false) {
-  Row(
-    Modifier.fillMaxWidth(),
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    Row(
-      Modifier.weight(1f).padding(end = DEFAULT_PADDING),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(4.dp)
-    ) {
-      ProfileImage(size = 46.dp, member.image)
-      Spacer(Modifier.width(DEFAULT_PADDING_HALF))
-      Column {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          if (member.verified) {
-            MemberVerifiedShield()
-          }
-          Text(
-            member.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
-            color = if (member.memberIncognito) Indigo else Color.Unspecified
-          )
-        }
-        val s = member.memberStatus.shortText
-        val statusDescr = if (user) String.format(generalGetString(R.string.group_info_member_you), s) else s
-        Text(
-          statusDescr,
-          color = MaterialTheme.colors.secondary,
-          fontSize = 12.sp,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis
-        )
-      }
-    }
-    val role = member.memberRole
-    if (role == GroupMemberRole.Owner || role == GroupMemberRole.Admin) {
-      Text(role.text, color = MaterialTheme.colors.secondary)
-    }
-  }
-}
-
-@Composable
-private fun MemberVerifiedShield() {
-  Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 3.dp).size(16.dp), tint = MaterialTheme.colors.secondary)
-}
-
-@Composable
-private fun GroupLinkButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_link),
-    stringResource(R.string.group_link),
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
-}
-
-@Composable
-private fun CreateGroupLinkButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_add_link),
-    stringResource(R.string.create_group_link),
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
-}
-
-@Composable
-fun EditGroupProfileButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_edit),
-    stringResource(R.string.button_edit_group_profile),
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
-}
-
-@Composable
-private fun AddOrEditWelcomeMessage(welcomeMessage: String?, onClick: () -> Unit) {
-  val text = if (welcomeMessage == null) {
-    stringResource(R.string.button_add_welcome_message)
-  } else {
-    stringResource(R.string.button_welcome_message)
-  }
-  SettingsActionItem(
-    painterResource(R.drawable.ic_maps_ugc),
-    text,
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
-}
-
-@Composable
-private fun LeaveGroupButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_logout),
-    stringResource(R.string.button_leave_group),
-    onClick,
-    iconColor = Color.Red,
-    textColor = Color.Red
-  )
-}
-
-@Composable
-private fun DeleteGroupButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_delete),
-    stringResource(R.string.button_delete_group),
-    onClick,
-    iconColor = Color.Red,
-    textColor = Color.Red
-  )
-}
-
-@Preview
-@Composable
-fun PreviewGroupChatInfoLayout() {
-  SimpleXTheme {
-    GroupChatInfoLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = arrayListOf()
-      ),
-      groupInfo = GroupInfo.sampleData,
-      members = listOf(GroupMember.sampleData, GroupMember.sampleData, GroupMember.sampleData),
-      developerTools = false,
-      groupLink = null,
-      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, addOrEditWelcomeMessage = {}, openPreferences = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}, manageGroupLink = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt

@@ -1,403 +0,0 @@
-package chat.simplex.app.views.chat.group
-
-import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionSpacer
-import SectionTextFooter
-import SectionView
-import android.net.Uri
-import android.util.Log
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.*
-import chat.simplex.app.views.usersettings.SettingsActionItem
-import kotlinx.datetime.Clock
-
-@Composable
-fun GroupMemberInfoView(
-  groupInfo: GroupInfo,
-  member: GroupMember,
-  connStats: ConnectionStats?,
-  connectionCode: String?,
-  chatModel: ChatModel,
-  close: () -> Unit,
-  closeAll: () -> Unit, // Close all open windows up to ChatView
-) {
-  BackHandler(onBack = close)
-  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
-  val developerTools = chatModel.controller.appPrefs.developerTools.get()
-  if (chat != null) {
-    val newRole = remember { mutableStateOf(member.memberRole) }
-    GroupMemberInfoLayout(
-      groupInfo,
-      member,
-      connStats,
-      newRole,
-      developerTools,
-      connectionCode,
-      getContactChat = { chatModel.getContactChat(it) },
-      openDirectChat = {
-        withApi {
-          val c = chatModel.controller.apiGetChat(ChatType.Direct, it)
-          if (c != null) {
-            if (chatModel.getContactChat(it) == null) {
-              chatModel.addChat(c)
-            }
-            chatModel.chatItems.clear()
-            chatModel.chatItems.addAll(c.chatItems)
-            chatModel.chatId.value = c.id
-            closeAll()
-          }
-        }
-      },
-      connectViaAddress = { connReqUri ->
-        val uri = Uri.parse(connReqUri)
-        withUriAction(uri) { linkType ->
-          withApi {
-            Log.d(TAG, "connectViaUri: connecting")
-            connectViaUri(chatModel, linkType, uri)
-          }
-        }
-      },
-      removeMember = { removeMemberDialog(groupInfo, member, chatModel, close) },
-      onRoleSelected = {
-        if (it == newRole.value) return@GroupMemberInfoLayout
-        val prevValue = newRole.value
-        newRole.value = it
-        updateMemberRoleDialog(it, member, onDismiss = {
-          newRole.value = prevValue
-        }) {
-          withApi {
-            kotlin.runCatching {
-              val mem = chatModel.controller.apiMemberRole(groupInfo.groupId, member.groupMemberId, it)
-              chatModel.upsertGroupMember(groupInfo, mem)
-            }.onFailure {
-              newRole.value = prevValue
-            }
-          }
-        }
-      },
-      switchMemberAddress = {
-        switchMemberAddress(chatModel, groupInfo, member)
-      },
-      verifyClicked = {
-        ModalManager.shared.showModalCloseable { close ->
-          remember { derivedStateOf { chatModel.groupMembers.firstOrNull { it.memberId == member.memberId } } }.value?.let { mem ->
-            VerifyCodeView(
-              mem.displayName,
-              connectionCode,
-              mem.verified,
-              verify = { code ->
-                chatModel.controller.apiVerifyGroupMember(mem.groupId, mem.groupMemberId, code)?.let { r ->
-                  val (verified, existingCode) = r
-                  chatModel.upsertGroupMember(
-                    groupInfo,
-                    mem.copy(
-                      activeConn = mem.activeConn?.copy(
-                        connectionCode = if (verified) SecurityCode(existingCode, Clock.System.now()) else null
-                      )
-                    )
-                  )
-                  r
-                }
-              },
-              close,
-            )
-          }
-        }
-      }
-    )
-  }
-}
-
-fun removeMemberDialog(groupInfo: GroupInfo, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.button_remove_member),
-    text = generalGetString(R.string.member_will_be_removed_from_group_cannot_be_undone),
-    confirmText = generalGetString(R.string.remove_member_confirmation),
-    onConfirm = {
-      withApi {
-        val removedMember = chatModel.controller.apiRemoveMember(member.groupId, member.groupMemberId)
-        if (removedMember != null) {
-          chatModel.upsertGroupMember(groupInfo, removedMember)
-        }
-        close?.invoke()
-      }
-    },
-    destructive = true,
-  )
-}
-
-@Composable
-fun GroupMemberInfoLayout(
-  groupInfo: GroupInfo,
-  member: GroupMember,
-  connStats: ConnectionStats?,
-  newRole: MutableState<GroupMemberRole>,
-  developerTools: Boolean,
-  connectionCode: String?,
-  getContactChat: (Long) -> Chat?,
-  openDirectChat: (Long) -> Unit,
-  connectViaAddress: (String) -> Unit,
-  removeMember: () -> Unit,
-  onRoleSelected: (GroupMemberRole) -> Unit,
-  switchMemberAddress: () -> Unit,
-  verifyClicked: () -> Unit,
-) {
-  fun knownDirectChat(contactId: Long): Chat? {
-    val chat = getContactChat(contactId)
-    return if (chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) {
-      chat
-    } else {
-      null
-    }
-  }
-
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .verticalScroll(rememberScrollState()),
-  ) {
-    Row(
-      Modifier.fillMaxWidth(),
-      horizontalArrangement = Arrangement.Center
-    ) {
-      GroupMemberInfoHeader(member)
-    }
-    SectionSpacer()
-
-    val contactId = member.memberContactId
-
-    if (member.memberActive) {
-      if (contactId != null) {
-        SectionView {
-          if (knownDirectChat(contactId) != null || groupInfo.fullGroupPreferences.directMessages.on) {
-            OpenChatButton(onClick = { openDirectChat(contactId) })
-          }
-          if (connectionCode != null) {
-            VerifyCodeButton(member.verified, verifyClicked)
-          }
-        }
-        SectionDividerSpaced()
-      }
-    }
-
-    if (member.contactLink != null) {
-      val context = LocalContext.current
-      SectionView(stringResource(R.string.address_section_title).uppercase()) {
-        QRCode(member.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-        ShareAddressButton { shareText(context, member.contactLink) }
-        if (contactId != null) {
-          if (knownDirectChat(contactId) == null && !groupInfo.fullGroupPreferences.directMessages.on) {
-            ConnectViaAddressButton(onClick = { connectViaAddress(member.contactLink) })
-          }
-        } else {
-          ConnectViaAddressButton(onClick = { connectViaAddress(member.contactLink) })
-        }
-        SectionTextFooter(stringResource(R.string.you_can_share_this_address_with_your_contacts).format(member.displayName))
-      }
-      SectionDividerSpaced()
-    }
-
-    SectionView(title = stringResource(R.string.member_info_section_title_member)) {
-      InfoRow(stringResource(R.string.info_row_group), groupInfo.displayName)
-      val roles = remember { member.canChangeRoleTo(groupInfo) }
-      if (roles != null) {
-        RoleSelectionRow(roles, newRole, onRoleSelected)
-      } else {
-        InfoRow(stringResource(R.string.role_in_group), member.memberRole.text)
-      }
-      val conn = member.activeConn
-      if (conn != null) {
-        val connLevelDesc =
-          if (conn.connLevel == 0) stringResource(R.string.conn_level_desc_direct)
-          else String.format(generalGetString(R.string.conn_level_desc_indirect), conn.connLevel)
-        InfoRow(stringResource(R.string.info_row_connection), connLevelDesc)
-      }
-    }
-    if (connStats != null) {
-      SectionDividerSpaced()
-      SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
-      SwitchAddressButton(switchMemberAddress)
-        val rcvServers = connStats.rcvServers
-        val sndServers = connStats.sndServers
-        if ((rcvServers != null && rcvServers.isNotEmpty()) || (sndServers != null && sndServers.isNotEmpty())) {
-          if (rcvServers != null && rcvServers.isNotEmpty()) {
-            SimplexServers(stringResource(R.string.receiving_via), rcvServers)
-            if (sndServers != null && sndServers.isNotEmpty()) {
-              SimplexServers(stringResource(R.string.sending_via), sndServers)
-            }
-          } else if (sndServers != null && sndServers.isNotEmpty()) {
-            SimplexServers(stringResource(R.string.sending_via), sndServers)
-          }
-        }
-      }
-    }
-
-    if (member.canBeRemoved(groupInfo)) {
-      SectionDividerSpaced(maxBottomPadding = false)
-      SectionView {
-        RemoveMemberButton(removeMember)
-      }
-    }
-
-    if (developerTools) {
-      SectionDividerSpaced()
-      SectionView(title = stringResource(R.string.section_title_for_console)) {
-        InfoRow(stringResource(R.string.info_row_local_name), member.localDisplayName)
-        InfoRow(stringResource(R.string.info_row_database_id), member.groupMemberId.toString())
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-fun GroupMemberInfoHeader(member: GroupMember) {
-  Column(
-    Modifier.padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    ProfileImage(size = 192.dp, member.image, color = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      if (member.verified) {
-        Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = MaterialTheme.colors.secondary)
-      }
-      Text(
-        member.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-    if (member.fullName != "" && member.fullName != member.displayName) {
-      Text(
-        member.fullName, style = MaterialTheme.typography.h2,
-        color = MaterialTheme.colors.onBackground,
-        maxLines = 2,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-  }
-}
-
-@Composable
-fun RemoveMemberButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_delete),
-    stringResource(R.string.button_remove_member),
-    click = onClick,
-    textColor = Color.Red,
-    iconColor = Color.Red,
-  )
-}
-
-@Composable
-fun OpenChatButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_chat),
-    stringResource(R.string.button_send_direct_message),
-    click = onClick,
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary,
-  )
-}
-
-@Composable
-fun ConnectViaAddressButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_link),
-    stringResource(R.string.connect_button),
-    click = onClick,
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary,
-  )
-}
-
-@Composable
-private fun RoleSelectionRow(
-  roles: List<GroupMemberRole>,
-  selectedRole: MutableState<GroupMemberRole>,
-  onSelected: (GroupMemberRole) -> Unit
-) {
-  Row(
-    Modifier.fillMaxWidth(),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.SpaceBetween
-  ) {
-    val values = remember { roles.map { it to it.text } }
-    ExposedDropDownSettingRow(
-      generalGetString(R.string.change_role),
-      values,
-      selectedRole,
-      icon = null,
-      enabled = remember { mutableStateOf(true) },
-      onSelected = onSelected
-    )
-  }
-}
-
-private fun updateMemberRoleDialog(
-  newRole: GroupMemberRole,
-  member: GroupMember,
-  onDismiss: () -> Unit,
-  onConfirm: () -> Unit
-) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.change_member_role_question),
-    text = if (member.memberCurrent)
-      String.format(generalGetString(R.string.member_role_will_be_changed_with_notification), newRole.text)
-    else
-      String.format(generalGetString(R.string.member_role_will_be_changed_with_invitation), newRole.text),
-    confirmText = generalGetString(R.string.change_verb),
-    onDismiss = onDismiss,
-    onConfirm = onConfirm,
-    onDismissRequest = onDismiss
-  )
-}
-
-private fun switchMemberAddress(m: ChatModel, groupInfo: GroupInfo, member: GroupMember) = withApi {
-  m.controller.apiSwitchGroupMember(groupInfo.apiId, member.groupMemberId)
-}
-
-@Preview
-@Composable
-fun PreviewGroupMemberInfoLayout() {
-  SimpleXTheme {
-    GroupMemberInfoLayout(
-      groupInfo = GroupInfo.sampleData,
-      member = GroupMember.sampleData,
-      connStats = null,
-      newRole = remember { mutableStateOf(GroupMemberRole.Member) },
-      developerTools = false,
-      connectionCode = "123",
-      getContactChat = { Chat.sampleData },
-      openDirectChat = {},
-      connectViaAddress = {},
-      removeMember = {},
-      onRoleSelected = {},
-      switchMemberAddress = {},
-      verifyClicked = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIEventView.kt

@@ -1,61 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.*
-
-@Composable
-fun CIEventView(ci: ChatItem) {
-  @Composable
-  fun chatEventTextView(text: AnnotatedString) {
-    Text(text, style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp))
-  }
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    val memberDisplayName = ci.memberDisplayName
-    if (memberDisplayName != null) {
-      chatEventTextView(
-        buildAnnotatedString {
-          withStyle(chatEventStyle) { append(memberDisplayName) }
-          append(" ")
-        }.plus(chatEventText(ci))
-      )
-    } else {
-      chatEventTextView(chatEventText(ci))
-    }
-  }
-}
-
-val chatEventStyle = SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = CurrentColors.value.colors.secondary)
-
-fun chatEventText(ci: ChatItem): AnnotatedString =
-  buildAnnotatedString {
-    withStyle(chatEventStyle) { append(ci.content.text + "  " + ci.timestampText) }
-  }
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun CIEventViewPreview() {
-  SimpleXTheme {
-    CIEventView(
-      ChatItem.getGroupEventSample()
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIImageView.kt

@@ -1,215 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.graphics.Bitmap
-import android.os.Build.VERSION.SDK_INT
-import androidx.annotation.StringRes
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Icon
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.painter.BitmapPainter
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.layout.layoutId
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.core.content.FileProvider
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.views.helpers.*
-import coil.ImageLoader
-import coil.compose.rememberAsyncImagePainter
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.request.ImageRequest
-import java.io.File
-
-@Composable
-fun CIImageView(
-  image: String,
-  file: CIFile?,
-  imageProvider: () -> ImageGalleryProvider,
-  showMenu: MutableState<Boolean>,
-  receiveFile: (Long) -> Unit
-) {
-  @Composable
-  fun progressIndicator() {
-    CircularProgressIndicator(
-      Modifier.size(16.dp),
-      color = Color.White,
-      strokeWidth = 2.dp
-    )
-  }
-
-  @Composable
-  fun fileIcon(icon: Painter, @StringRes stringId: Int) {
-    Icon(
-      icon,
-      stringResource(stringId),
-      Modifier.fillMaxSize(),
-      tint = Color.White
-    )
-  }
-
-  @Composable
-  fun loadingIndicator() {
-    if (file != null) {
-      Box(
-        Modifier
-          .padding(8.dp)
-          .size(20.dp),
-        contentAlignment = Alignment.Center
-      ) {
-        when (file.fileStatus) {
-          is CIFileStatus.SndStored ->
-            when (file.fileProtocol) {
-              FileProtocol.XFTP -> progressIndicator()
-              FileProtocol.SMP -> {}
-            }
-          is CIFileStatus.SndTransfer -> progressIndicator()
-          is CIFileStatus.SndComplete -> fileIcon(painterResource(R.drawable.ic_check_filled), R.string.icon_descr_image_snd_complete)
-          is CIFileStatus.SndCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          is CIFileStatus.SndError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          is CIFileStatus.RcvInvitation -> fileIcon(painterResource(R.drawable.ic_arrow_downward), R.string.icon_descr_asked_to_receive)
-          is CIFileStatus.RcvAccepted -> fileIcon(painterResource(R.drawable.ic_more_horiz), R.string.icon_descr_waiting_for_image)
-          is CIFileStatus.RcvTransfer -> progressIndicator()
-          is CIFileStatus.RcvCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          is CIFileStatus.RcvError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          else -> {}
-        }
-      }
-    }
-  }
-
-  @Composable
-  fun imageViewFullWidth(): Dp {
-    val approximatePadding = 100.dp
-    return with(LocalDensity.current) { minOf(1000.dp, LocalView.current.width.toDp() - approximatePadding) }
-  }
-
-  @Composable
-  fun imageView(imageBitmap: Bitmap, onClick: () -> Unit) {
-    Image(
-      imageBitmap.asImageBitmap(),
-      contentDescription = stringResource(R.string.image_descr),
-      // .width(1000.dp) is a hack for image to increase IntrinsicSize of FramedItemView
-      // if text is short and take all available width if text is long
-      modifier = Modifier
-        .width(if (imageBitmap.width * 0.97 <= imageBitmap.height) imageViewFullWidth() * 0.75f else 1000.dp)
-        .combinedClickable(
-          onLongClick = { showMenu.value = true },
-          onClick = onClick
-        ),
-      contentScale = ContentScale.FillWidth,
-    )
-  }
-
-  @Composable
-  fun imageView(painter: Painter, onClick: () -> Unit) {
-    Image(
-      painter,
-      contentDescription = stringResource(R.string.image_descr),
-      // .width(1000.dp) is a hack for image to increase IntrinsicSize of FramedItemView
-      // if text is short and take all available width if text is long
-      modifier = Modifier
-        .width(if (painter.intrinsicSize.width * 0.97 <= painter.intrinsicSize.height) imageViewFullWidth() * 0.75f else 1000.dp)
-        .combinedClickable(
-          onLongClick = { showMenu.value = true },
-          onClick = onClick
-        ),
-      contentScale = ContentScale.FillWidth,
-    )
-  }
-
-  fun fileSizeValid(): Boolean {
-    if (file != null) {
-      return file.fileSize <= getMaxFileSize(file.fileProtocol)
-    }
-    return false
-  }
-
-  fun imageAndFilePath(file: CIFile?): Pair<Bitmap?, String?> {
-    val imageBitmap: Bitmap? = getLoadedImage(SimplexApp.context, file)
-    val filePath = getLoadedFilePath(SimplexApp.context, file)
-    return imageBitmap to filePath
-  }
-
-  Box(
-    Modifier.layoutId(CHAT_IMAGE_LAYOUT_ID),
-    contentAlignment = Alignment.TopEnd
-  ) {
-    val context = LocalContext.current
-    val (imageBitmap, filePath) = remember(file) { imageAndFilePath(file) }
-    if (imageBitmap != null && filePath != null) {
-      val uri = remember(filePath) { FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))  }
-      val imagePainter = rememberAsyncImagePainter(
-        ImageRequest.Builder(context).data(data = uri).size(coil.size.Size.ORIGINAL).build(),
-        placeholder = BitmapPainter(imageBitmap.asImageBitmap()), // show original image while it's still loading by coil
-        imageLoader = imageLoader
-      )
-      val view = LocalView.current
-      imageView(imagePainter, onClick = {
-        hideKeyboard(view)
-        if (getLoadedFilePath(context, file) != null) {
-          ModalManager.shared.showCustomModal(animated = false) { close ->
-            ImageFullScreenView(imageProvider, close)
-          }
-        }
-      })
-    } else {
-      imageView(base64ToBitmap(image), onClick = {
-        if (file != null) {
-          when (file.fileStatus) {
-            CIFileStatus.RcvInvitation ->
-              if (fileSizeValid()) {
-                receiveFile(file.fileId)
-              } else {
-                AlertManager.shared.showAlertMsg(
-                  generalGetString(R.string.large_file),
-                  String.format(generalGetString(R.string.contact_sent_large_file), formatBytes(getMaxFileSize(file.fileProtocol)))
-                )
-              }
-            CIFileStatus.RcvAccepted ->
-              when (file.fileProtocol) {
-                FileProtocol.XFTP ->
-                  AlertManager.shared.showAlertMsg(
-                    generalGetString(R.string.waiting_for_image),
-                    generalGetString(R.string.image_will_be_received_when_contact_completes_uploading)
-                  )
-                FileProtocol.SMP ->
-                  AlertManager.shared.showAlertMsg(
-                    generalGetString(R.string.waiting_for_image),
-                    generalGetString(R.string.image_will_be_received_when_contact_is_online)
-                  )
-              }
-            CIFileStatus.RcvTransfer(rcvProgress = 7, rcvTotal = 10) -> {} // ?
-            CIFileStatus.RcvComplete -> {} // ?
-            CIFileStatus.RcvCancelled -> {} // TODO
-            else -> {}
-          }
-        }
-      })
-    }
-    loadingIndicator()
-  }
-}
-
-private val imageLoader = ImageLoader.Builder(SimplexApp.context)
-  .components {
-    if (SDK_INT >= 28) {
-      add(ImageDecoderDecoder.Factory())
-    } else {
-      add(GifDecoder.Factory())
-    }
-  }
-  .build()

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIInvalidJSONView.kt

@@ -1,45 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import SectionSpacer
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.SettingsActionItem
-
-@Composable
-fun CIInvalidJSONView(json: String) {
-  Row(Modifier
-    .clickable { ModalManager.shared.showModal(true) { InvalidJSONView(json) } }
-    .padding(horizontal = 10.dp, vertical = 6.dp)
-  ) {
-    Text(stringResource(R.string.invalid_data), color = Color.Red, fontStyle = FontStyle.Italic)
-  }
-}
-
-@Composable
-fun InvalidJSONView(json: String) {
-  Column {
-    Spacer(Modifier.height(DEFAULT_PADDING))
-    SectionView {
-      val context = LocalContext.current
-      SettingsActionItem(painterResource(R.drawable.ic_share), generalGetString(R.string.share_verb), click = {
-        shareText(context, json)
-      })
-    }
-    Column(Modifier.padding(DEFAULT_PADDING).fillMaxWidth().verticalScroll(rememberScrollState())) {
-      Text(json)
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIRcvDecryptionError.kt

@@ -1,24 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.runtime.Composable
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.views.helpers.AlertManager
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun CIRcvDecryptionError(msgDecryptError: MsgDecryptError, msgCount: UInt, ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean) {
-  CIMsgError(ci, timedMessagesTTL, showMember) {
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(R.string.decryption_error),
-      text = when (msgDecryptError) {
-        MsgDecryptError.RatchetHeader -> String.format(generalGetString(R.string.alert_text_decryption_error_header), msgCount.toLong()) + "\n" +
-            generalGetString(R.string.alert_text_fragment_encryption_out_of_sync_old_database) + "\n" +
-            generalGetString(R.string.alert_text_fragment_permanent_error_reconnect)
-        MsgDecryptError.TooManySkipped -> String.format(generalGetString(R.string.alert_text_decryption_error_too_many_skipped), msgCount.toLong()) + "\n" +
-            generalGetString(R.string.alert_text_fragment_encryption_out_of_sync_old_database) + "\n" +
-            generalGetString(R.string.alert_text_fragment_permanent_error_reconnect)
-      }
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt

@@ -1,89 +0,0 @@
-package chat.simplex.app.views.chatlist
-
-import android.content.res.Configuration
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.ui.res.painterResource
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.annotatedStringResource
-import chat.simplex.app.views.onboarding.ReadableTextWithLink
-import chat.simplex.app.views.usersettings.MarkdownHelpView
-import chat.simplex.app.views.usersettings.simplexTeamUri
-
-val bold = SpanStyle(fontWeight = FontWeight.Bold)
-
-@Composable
-fun ChatHelpView(addContact: (() -> Unit)? = null) {
-  Column(
-    verticalArrangement = Arrangement.spacedBy(10.dp)
-  ) {
-    Text(stringResource(R.string.thank_you_for_installing_simplex), lineHeight = 22.sp)
-    ReadableTextWithLink(R.string.you_can_connect_to_simplex_chat_founder, simplexTeamUri)
-    Column(
-      Modifier.padding(top = 24.dp),
-      verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      Text(
-        stringResource(R.string.to_start_a_new_chat_help_header),
-        style = MaterialTheme.typography.h2,
-        lineHeight = 22.sp
-      )
-      Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(8.dp)
-      ) {
-        Text(stringResource(R.string.chat_help_tap_button))
-        Icon(
-          painterResource(R.drawable.ic_person_add),
-          stringResource(R.string.add_contact),
-          modifier = if (addContact != null) Modifier.clickable(onClick = addContact) else Modifier,
-        )
-        Text(stringResource(R.string.above_then_preposition_continuation))
-      }
-      Text(annotatedStringResource(R.string.add_new_contact_to_create_one_time_QR_code), lineHeight = 22.sp)
-      Text(annotatedStringResource(R.string.scan_QR_code_to_connect_to_contact_who_shows_QR_code), lineHeight = 22.sp)
-    }
-
-    Column(
-      Modifier.padding(top = 24.dp),
-      verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      Text(stringResource(R.string.to_connect_via_link_title), style = MaterialTheme.typography.h2)
-      Text(stringResource(R.string.if_you_received_simplex_invitation_link_you_can_open_in_browser), lineHeight = 22.sp)
-      Text(annotatedStringResource(R.string.desktop_scan_QR_code_from_app_via_scan_QR_code), lineHeight = 22.sp)
-      Text(annotatedStringResource(R.string.mobile_tap_open_in_mobile_app_then_tap_connect_in_app), lineHeight = 22.sp)
-    }
-
-    Column(
-      Modifier.padding(vertical = 24.dp),
-      verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      Text(stringResource(R.string.markdown_in_messages), style = MaterialTheme.typography.h2)
-      MarkdownHelpView()
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatHelpLayout() {
-  SimpleXTheme {
-    ChatHelpView {}
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt

@@ -1,309 +0,0 @@
-package chat.simplex.app.views.chatlist
-
-import android.content.res.Configuration
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.text.InlineTextContent
-import androidx.compose.foundation.text.appendInlineContent
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.ComposePreview
-import chat.simplex.app.views.chat.ComposeState
-import chat.simplex.app.views.chat.item.MarkdownText
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun ChatPreviewView(
-  chat: Chat,
-  chatModelDraft: ComposeState?,
-  chatModelDraftChatId: ChatId?,
-  chatModelIncognito: Boolean,
-  currentUserProfileDisplayName: String?,
-  contactNetworkStatus: NetworkStatus?,
-  stopped: Boolean,
-  linkMode: SimplexLinkMode
-) {
-  val cInfo = chat.chatInfo
-
-  @Composable
-  fun groupInactiveIcon() {
-    Icon(
-      painterResource(R.drawable.ic_cancel_filled),
-      stringResource(R.string.icon_descr_group_inactive),
-      Modifier.size(18.dp).background(MaterialTheme.colors.background, CircleShape),
-      tint = MaterialTheme.colors.secondary
-    )
-  }
-
-  @Composable
-  fun chatPreviewImageOverlayIcon() {
-    if (cInfo is ChatInfo.Group) {
-      when (cInfo.groupInfo.membership.memberStatus) {
-        GroupMemberStatus.MemLeft -> groupInactiveIcon()
-        GroupMemberStatus.MemRemoved -> groupInactiveIcon()
-        GroupMemberStatus.MemGroupDeleted -> groupInactiveIcon()
-        else -> {}
-      }
-    }
-  }
-
-  @Composable
-  fun chatPreviewTitleText(color: Color = Color.Unspecified) {
-    Text(
-      cInfo.chatViewName,
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis,
-      style = MaterialTheme.typography.h3,
-      fontWeight = FontWeight.Bold,
-      color = color
-    )
-  }
-
-  @Composable
-  fun VerifiedIcon() {
-    Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.size(19.dp).padding(end = 3.dp, top = 1.dp), tint = MaterialTheme.colors.secondary)
-  }
-
-  fun messageDraft(draft: ComposeState): Pair<AnnotatedString, Map<String, InlineTextContent>> {
-    fun attachment(): Pair<Int, String?>? =
-      when (draft.preview) {
-        is ComposePreview.FilePreview -> R.drawable.ic_draft_filled to draft.preview.fileName
-        is ComposePreview.MediaPreview -> R.drawable.ic_image to null
-        is ComposePreview.VoicePreview -> R.drawable.ic_play_arrow_filled to durationText(draft.preview.durationMs / 1000)
-        else -> null
-      }
-
-    val attachment = attachment()
-    val text = buildAnnotatedString {
-      appendInlineContent(id = "editIcon")
-      append(" ")
-      if (attachment != null) {
-        appendInlineContent(id = "attachmentIcon")
-        if (attachment.second != null) {
-          append(attachment.second as String)
-        }
-        append(" ")
-      }
-      append(draft.message)
-    }
-    val inlineContent: Map<String, InlineTextContent> = mapOf(
-      "editIcon" to InlineTextContent(
-        Placeholder(20.sp, 20.sp, PlaceholderVerticalAlign.TextCenter)
-      ) {
-        Icon(painterResource(R.drawable.ic_edit_note), null, tint = MaterialTheme.colors.primary)
-      },
-      "attachmentIcon" to InlineTextContent(
-        Placeholder(20.sp, 20.sp, PlaceholderVerticalAlign.TextCenter)
-      ) {
-        Icon(if (attachment?.first != null) painterResource(attachment.first) else painterResource(R.drawable.ic_edit_note), null, tint = MaterialTheme.colors.secondary)
-      }
-    )
-    return text to inlineContent
-  }
-
-  @Composable
-  fun chatPreviewTitle() {
-    when (cInfo) {
-      is ChatInfo.Direct ->
-        Row(verticalAlignment = Alignment.CenterVertically) {
-          if (cInfo.contact.verified) {
-            VerifiedIcon()
-          }
-          chatPreviewTitleText(if (cInfo.ready) Color.Unspecified else MaterialTheme.colors.secondary)
-        }
-      is ChatInfo.Group ->
-        when (cInfo.groupInfo.membership.memberStatus) {
-          GroupMemberStatus.MemInvited -> chatPreviewTitleText(if (chat.chatInfo.incognito) Indigo else MaterialTheme.colors.primary)
-          GroupMemberStatus.MemAccepted -> chatPreviewTitleText(MaterialTheme.colors.secondary)
-          else -> chatPreviewTitleText()
-        }
-      else -> chatPreviewTitleText()
-    }
-  }
-
-  @Composable
-  fun chatPreviewText(chatModelIncognito: Boolean) {
-    val ci = chat.chatItems.lastOrNull()
-    if (ci != null) {
-      val (text: CharSequence, inlineTextContent) = when {
-        chatModelDraftChatId == chat.id && chatModelDraft != null -> remember(chatModelDraft) { messageDraft(chatModelDraft) }
-        ci.meta.itemDeleted == null -> ci.text to null
-        else -> generalGetString(R.string.marked_deleted_description) to null
-      }
-      val formattedText = when {
-        chatModelDraftChatId == chat.id && chatModelDraft != null -> null
-        ci.meta.itemDeleted == null -> ci.formattedText
-        else -> null
-      }
-      MarkdownText(
-        text,
-        formattedText,
-        sender = when {
-          chatModelDraftChatId == chat.id && chatModelDraft != null -> null
-          cInfo is ChatInfo.Group && !ci.chatDir.sent -> ci.memberDisplayName
-          else -> null
-        },
-        linkMode = linkMode,
-        senderBold = true,
-        maxLines = 2,
-        overflow = TextOverflow.Ellipsis,
-        style = MaterialTheme.typography.body1.copy(color = if (isInDarkTheme()) MessagePreviewDark else MessagePreviewLight, lineHeight = 22.sp),
-        inlineContent = inlineTextContent,
-        modifier = Modifier.fillMaxWidth(),
-      )
-    } else {
-      when (cInfo) {
-        is ChatInfo.Direct ->
-          if (!cInfo.ready) {
-            Text(stringResource(R.string.contact_connection_pending), color = MaterialTheme.colors.secondary)
-          }
-        is ChatInfo.Group ->
-          when (cInfo.groupInfo.membership.memberStatus) {
-            GroupMemberStatus.MemInvited -> Text(groupInvitationPreviewText(chatModelIncognito, currentUserProfileDisplayName, cInfo.groupInfo))
-            GroupMemberStatus.MemAccepted -> Text(stringResource(R.string.group_connection_pending), color = MaterialTheme.colors.secondary)
-            else -> {}
-          }
-        else -> {}
-      }
-    }
-  }
-
-  Row {
-    Box(contentAlignment = Alignment.BottomEnd) {
-      ChatInfoImage(cInfo, size = 72.dp)
-      Box(Modifier.padding(end = 6.dp, bottom = 6.dp)) {
-        chatPreviewImageOverlayIcon()
-      }
-    }
-    Column(
-      modifier = Modifier
-        .padding(horizontal = 8.dp)
-        .weight(1F)
-    ) {
-      chatPreviewTitle()
-      val height = with(LocalDensity.current) { 46.sp.toDp() }
-      Row(Modifier.heightIn(min = height)) {
-        chatPreviewText(chatModelIncognito)
-      }
-    }
-    val ts = chat.chatItems.lastOrNull()?.timestampText ?: getTimestampText(chat.chatInfo.updatedAt)
-
-    Box(
-      contentAlignment = Alignment.TopEnd
-    ) {
-      Text(
-        ts,
-        color = MaterialTheme.colors.secondary,
-        style = MaterialTheme.typography.body2,
-        modifier = Modifier.padding(bottom = 5.dp)
-      )
-      val n = chat.chatStats.unreadCount
-      val showNtfsIcon = !chat.chatInfo.ntfsEnabled && (chat.chatInfo is ChatInfo.Direct || chat.chatInfo is ChatInfo.Group)
-      if (n > 0 || chat.chatStats.unreadChat) {
-        Box(
-          Modifier.padding(top = 24.dp),
-          contentAlignment = Alignment.Center
-        ) {
-          Text(
-            if (n > 0) unreadCountStr(n) else "",
-            color = Color.White,
-            fontSize = 11.sp,
-            modifier = Modifier
-              .background(if (stopped || showNtfsIcon) MaterialTheme.colors.secondary else MaterialTheme.colors.primaryVariant, shape = CircleShape)
-              .badgeLayout()
-              .padding(horizontal = 3.dp)
-              .padding(vertical = 1.dp)
-          )
-        }
-      } else if (showNtfsIcon) {
-        Box(
-          Modifier.padding(top = 24.dp),
-          contentAlignment = Alignment.Center
-        ) {
-          Icon(
-            painterResource(R.drawable.ic_notifications_off_filled),
-            contentDescription = generalGetString(R.string.notifications),
-            tint = MaterialTheme.colors.secondary,
-            modifier = Modifier
-              .padding(horizontal = 3.dp)
-              .padding(vertical = 1.dp)
-              .size(17.dp)
-          )
-        }
-      }
-      if (cInfo is ChatInfo.Direct) {
-        Box(
-          Modifier.padding(top = 52.dp),
-          contentAlignment = Alignment.Center
-        ) {
-          ChatStatusImage(contactNetworkStatus)
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun groupInvitationPreviewText(chatModelIncognito: Boolean, currentUserProfileDisplayName: String?, groupInfo: GroupInfo): String {
-  return if (groupInfo.membership.memberIncognito)
-    String.format(stringResource(R.string.group_preview_join_as), groupInfo.membership.memberProfile.displayName)
-  else if (chatModelIncognito)
-    String.format(stringResource(R.string.group_preview_join_as), currentUserProfileDisplayName ?: "")
-  else
-    stringResource(R.string.group_preview_you_are_invited)
-}
-
-@Composable
-fun unreadCountStr(n: Int): String {
-  return if (n < 1000) "$n" else "${n / 1000}" + stringResource(R.string.thousand_abbreviation)
-}
-
-@Composable
-fun ChatStatusImage(s: NetworkStatus?) {
-  val descr = s?.statusString
-  if (s is NetworkStatus.Error) {
-    Icon(
-      painterResource(R.drawable.ic_error),
-      contentDescription = descr,
-      tint = MaterialTheme.colors.secondary,
-      modifier = Modifier
-        .size(19.dp)
-    )
-  } else if (s !is NetworkStatus.Connected) {
-    CircularProgressIndicator(
-      Modifier
-        .padding(horizontal = 2.dp)
-        .size(15.dp),
-      color = MaterialTheme.colors.secondary,
-      strokeWidth = 1.5.dp
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatPreviewView() {
-  SimpleXTheme {
-    ChatPreviewView(Chat.sampleData, null, null, false, "", contactNetworkStatus = NetworkStatus.Connected(), stopped = false, linkMode = SimplexLinkMode.DESCRIPTION)
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt

@@ -1,140 +0,0 @@
-package chat.simplex.app.views.database
-
-import SectionBottomSpacer
-import SectionTextFooter
-import SectionView
-import android.content.Context
-import android.content.res.Configuration
-import android.net.Uri
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.compose.ManagedActivityResultLauncher
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.*
-import kotlinx.datetime.*
-import java.io.BufferedOutputStream
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.*
-
-@Composable
-fun ChatArchiveView(m: ChatModel, title: String, archiveName: String, archiveTime: Instant) {
-  val context = LocalContext.current
-  val archivePath = "${getFilesDirectory(context)}/$archiveName"
-  val saveArchiveLauncher = rememberSaveArchiveLauncher(cxt = context, archivePath)
-  ChatArchiveLayout(
-    title,
-    archiveTime,
-    saveArchive = { saveArchiveLauncher.launch(archivePath.substringAfterLast("/")) },
-    deleteArchiveAlert = { deleteArchiveAlert(m, archivePath) }
-  )
-}
-
-@Composable
-fun ChatArchiveLayout(
-  title: String,
-  archiveTime: Instant,
-  saveArchive: () -> Unit,
-  deleteArchiveAlert: () -> Unit
-) {
-  Column(
-    Modifier.fillMaxWidth(),
-  ) {
-    AppBarTitle(title)
-    SectionView(stringResource(R.string.chat_archive_section)) {
-      SettingsActionItem(
-        painterResource(R.drawable.ic_ios_share),
-        stringResource(R.string.save_archive),
-        saveArchive,
-        textColor = MaterialTheme.colors.primary,
-        iconColor = MaterialTheme.colors.primary,
-      )
-      SettingsActionItem(
-        painterResource(R.drawable.ic_delete),
-        stringResource(R.string.delete_archive),
-        deleteArchiveAlert,
-        textColor = Color.Red,
-        iconColor = Color.Red,
-      )
-    }
-    val archiveTs = SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z", Locale.US).format(Date.from(archiveTime.toJavaInstant()))
-    SectionTextFooter(
-      String.format(generalGetString(R.string.archive_created_on_ts), archiveTs)
-    )
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun rememberSaveArchiveLauncher(cxt: Context, chatArchivePath: String): ManagedActivityResultLauncher<String, Uri?> =
-  rememberLauncherForActivityResult(
-    contract = ActivityResultContracts.CreateDocument(),
-    onResult = { destination ->
-      try {
-        destination?.let {
-          val contentResolver = cxt.contentResolver
-          contentResolver.openOutputStream(destination)?.let { stream ->
-            val outputStream = BufferedOutputStream(stream)
-            File(chatArchivePath).inputStream().use { it.copyTo(outputStream) }
-            outputStream.close()
-            Toast.makeText(cxt, generalGetString(R.string.file_saved), Toast.LENGTH_SHORT).show()
-          }
-        }
-      } catch (e: Error) {
-        Toast.makeText(cxt, generalGetString(R.string.error_saving_file), Toast.LENGTH_SHORT).show()
-        Log.e(TAG, "rememberSaveArchiveLauncher error saving archive $e")
-      }
-    }
-  )
-
-private fun deleteArchiveAlert(m: ChatModel, archivePath: String) {
-  AlertManager.shared.showAlertDialog(
-    title = generalGetString(R.string.delete_chat_archive_question),
-    confirmText = generalGetString(R.string.delete_verb),
-    onConfirm = {
-      val fileDeleted = File(archivePath).delete()
-      if (fileDeleted) {
-        m.controller.appPrefs.chatArchiveName.set(null)
-        m.controller.appPrefs.chatArchiveTime.set(null)
-        ModalManager.shared.closeModal()
-      } else {
-        Log.e(TAG, "deleteArchiveAlert delete() error")
-      }
-    },
-    destructive = true,
-  )
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatArchiveLayout() {
-  SimpleXTheme {
-    ChatArchiveLayout(
-      "New database archive",
-      archiveTime = Clock.System.now(),
-      saveArchive = {},
-      deleteArchiveAlert = {}
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChatInfoImage.kt

@@ -1,92 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatInfo
-import chat.simplex.app.ui.theme.SimpleXTheme
-
-@Composable
-fun ChatInfoImage(chatInfo: ChatInfo, size: Dp, iconColor: Color = MaterialTheme.colors.secondaryVariant) {
-  val icon =
-    if (chatInfo is ChatInfo.Group) R.drawable.ic_supervised_user_circle_filled
-                                    else R.drawable.ic_account_circle_filled
-  ProfileImage(size, chatInfo.image, icon, iconColor)
-}
-
-@Composable
-fun IncognitoImage(size: Dp, iconColor: Color = MaterialTheme.colors.secondaryVariant) {
-  Box(Modifier.size(size)) {
-    Icon(
-      painterResource(R.drawable.ic_theater_comedy_filled), stringResource(R.string.incognito),
-      modifier = Modifier.size(size).padding(size / 12),
-      iconColor
-    )
-  }
-}
-
-@Composable
-fun ProfileImage(
-  size: Dp,
-  image: String? = null,
-  icon: Int = R.drawable.ic_account_circle_filled,
-  color: Color = MaterialTheme.colors.secondaryVariant
-) {
-  Box(Modifier.size(size)) {
-    if (image == null) {
-      val iconToReplace = when (icon) {
-        R.drawable.ic_account_circle_filled -> AccountCircleFilled
-        R.drawable.ic_supervised_user_circle_filled -> SupervisedUserCircleFilled
-        else -> null
-      }
-      if (iconToReplace != null) {
-        Icon(
-          iconToReplace,
-          contentDescription = stringResource(R.string.icon_descr_profile_image_placeholder),
-          tint = color,
-          modifier = Modifier.fillMaxSize()
-        )
-      } else {
-        Icon(
-          painterResource(icon),
-          contentDescription = stringResource(R.string.icon_descr_profile_image_placeholder),
-          tint = color,
-          modifier = Modifier.fillMaxSize()
-        )
-      }
-    } else {
-      val imageBitmap = base64ToBitmap(image).asImageBitmap()
-      Image(
-        imageBitmap,
-        stringResource(R.string.image_descr_profile_image),
-        contentScale = ContentScale.Crop,
-        modifier = Modifier.size(size).padding(size / 12).clip(CircleShape)
-      )
-    }
-  }
-}
-
-
-@Preview
-@Composable
-fun PreviewChatInfoImage() {
-  SimpleXTheme {
-    ChatInfoImage(
-      chatInfo = ChatInfo.Direct.sampleData,
-      size = 55.dp
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt

@@ -1,61 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.views.newchat.ActionButton
-
-sealed class AttachmentOption {
-  object CameraPhoto: AttachmentOption()
-  object GalleryImage: AttachmentOption()
-  object GalleryVideo: AttachmentOption()
-  object File: AttachmentOption()
-}
-
-@Composable
-fun ChooseAttachmentView(
-  attachmentOption: MutableState<AttachmentOption?>,
-  hide: () -> Unit
-) {
-  Box(
-    modifier = Modifier
-      .fillMaxWidth()
-      .wrapContentHeight()
-      .onFocusChanged { focusState ->
-        if (!focusState.hasFocus) hide()
-      }
-  ) {
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(horizontal = 8.dp, vertical = 30.dp),
-      horizontalArrangement = Arrangement.SpaceEvenly
-    ) {
-      ActionButton(Modifier.fillMaxWidth(0.25f), null, stringResource(R.string.use_camera_button), icon = painterResource(R.drawable.ic_camera_enhance)) {
-        attachmentOption.value = AttachmentOption.CameraPhoto
-        hide()
-      }
-      ActionButton(Modifier.fillMaxWidth(0.33f), null, stringResource(R.string.gallery_image_button), icon = painterResource(R.drawable.ic_add_photo)) {
-        attachmentOption.value = AttachmentOption.GalleryImage
-        hide()
-      }
-      ActionButton(Modifier.fillMaxWidth(0.50f), null, stringResource(R.string.gallery_video_button), icon = painterResource(R.drawable.ic_smart_display)) {
-        attachmentOption.value = AttachmentOption.GalleryVideo
-        hide()
-      }
-      ActionButton(Modifier.fillMaxWidth(1f), null, stringResource(R.string.choose_file), icon = painterResource(R.drawable.ic_note_add)) {
-        attachmentOption.value = AttachmentOption.File
-        hide()
-      }
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt

@@ -1,147 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.os.Build.VERSION.SDK_INT
-import androidx.activity.compose.BackHandler
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricManager.Authenticators.*
-import androidx.biometric.BiometricPrompt
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.ui.Modifier
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.FragmentActivity
-import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.localauth.LocalAuthView
-import chat.simplex.app.views.usersettings.LAMode
-
-sealed class LAResult {
-  object Success: LAResult()
-  class Error(val errString: CharSequence): LAResult()
-  class Failed(val errString: CharSequence? = null): LAResult()
-  class Unavailable(val errString: CharSequence? = null): LAResult()
-}
-
-data class LocalAuthRequest (
-  val title: String?,
-  val reason: String,
-  val password: String,
-  val selfDestruct: Boolean,
-  val completed: (LAResult) -> Unit
-) {
-  companion object {
-    val sample = LocalAuthRequest(generalGetString(R.string.la_enter_app_passcode), generalGetString(R.string.la_authenticate), "", selfDestruct = false) { }
-  }
-}
-
-fun authenticate(
-  promptTitle: String,
-  promptSubtitle: String,
-  selfDestruct: Boolean = false,
-  activity: FragmentActivity,
-  usingLAMode: LAMode = SimplexApp.context.chatModel.controller.appPrefs.laMode.get(),
-  completed: (LAResult) -> Unit
-) {
-  when (usingLAMode) {
-    LAMode.SYSTEM -> when {
-      SDK_INT in 28..29 ->
-        // KeyguardManager.isDeviceSecure()? https://developer.android.com/training/sign-in/biometric-auth#declare-supported-authentication-types
-        authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
-      SDK_INT > 29 ->
-        authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_STRONG or DEVICE_CREDENTIAL)
-      else -> completed(LAResult.Unavailable())
-    }
-    LAMode.PASSCODE -> {
-      val password = ksAppPassword.get() ?: return completed(LAResult.Unavailable(generalGetString(R.string.la_no_app_password)))
-      ModalManager.shared.showPasscodeCustomModal { close ->
-        BackHandler {
-          close()
-          completed(LAResult.Error(generalGetString(R.string.authentication_cancelled)))
-        }
-        Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-          LocalAuthView(SimplexApp.context.chatModel, LocalAuthRequest(promptTitle, promptSubtitle, password, selfDestruct && SimplexApp.context.chatModel.controller.appPrefs.selfDestruct.get()) {
-            close()
-            completed(it)
-          })
-        }
-      }
-    }
-  }
-}
-
-private fun authenticateWithBiometricManager(
-  promptTitle: String,
-  promptSubtitle: String,
-  activity: FragmentActivity,
-  completed: (LAResult) -> Unit,
-  authenticators: Int
-) {
-  val biometricManager = BiometricManager.from(activity)
-  when (biometricManager.canAuthenticate(authenticators)) {
-    BiometricManager.BIOMETRIC_SUCCESS -> {
-      val executor = ContextCompat.getMainExecutor(activity)
-      val biometricPrompt = BiometricPrompt(
-        activity,
-        executor,
-        object: BiometricPrompt.AuthenticationCallback() {
-          override fun onAuthenticationError(
-            errorCode: Int,
-            errString: CharSequence
-          ) {
-            super.onAuthenticationError(errorCode, errString)
-            completed(LAResult.Error(errString))
-          }
-
-          override fun onAuthenticationSucceeded(
-            result: BiometricPrompt.AuthenticationResult
-          ) {
-            super.onAuthenticationSucceeded(result)
-            completed(LAResult.Success)
-          }
-
-          override fun onAuthenticationFailed() {
-            super.onAuthenticationFailed()
-            completed(LAResult.Failed())
-          }
-        }
-      )
-      val promptInfo = BiometricPrompt.PromptInfo.Builder()
-        .setTitle(promptTitle)
-        .setSubtitle(promptSubtitle)
-        .setAllowedAuthenticators(authenticators)
-        .setConfirmationRequired(false)
-        .build()
-      biometricPrompt.authenticate(promptInfo)
-    }
-    else -> completed(LAResult.Unavailable())
-  }
-}
-
-fun laTurnedOnAlert() = AlertManager.shared.showAlertMsg(
-  generalGetString(R.string.auth_simplex_lock_turned_on),
-  generalGetString(R.string.auth_you_will_be_required_to_authenticate_when_you_start_or_resume)
-)
-
-fun laPasscodeNotSetAlert() = AlertManager.shared.showAlertMsg(
-  generalGetString(R.string.lock_not_enabled),
-  generalGetString(R.string.you_can_turn_on_lock)
-)
-
-fun laFailedAlert() {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.la_auth_failed),
-    text = generalGetString(R.string.la_could_not_be_verified)
-  )
-}
-
-fun laUnavailableInstructionAlert() = AlertManager.shared.showAlertMsg(
-  generalGetString(R.string.auth_unavailable),
-  generalGetString(R.string.auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled)
-)
-
-fun laUnavailableTurningOffAlert() = AlertManager.shared.showAlertMsg(
-  generalGetString(R.string.auth_unavailable),
-  generalGetString(R.string.auth_device_authentication_is_disabled_turning_off)
-)

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Share.kt

@@ -1,119 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.Manifest
-import android.content.*
-import android.net.Uri
-import android.provider.MediaStore
-import android.util.Log
-import android.webkit.MimeTypeMap
-import android.widget.Toast
-import androidx.activity.compose.ManagedActivityResultLauncher
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import chat.simplex.app.*
-import chat.simplex.app.model.CIFile
-import java.io.BufferedOutputStream
-import java.io.File
-
-fun shareText(cxt: Context, text: String) {
-  val sendIntent: Intent = Intent().apply {
-    action = Intent.ACTION_SEND
-    putExtra(Intent.EXTRA_TEXT, text)
-    type = "text/plain"
-  }
-  val shareIntent = Intent.createChooser(sendIntent, null)
-  cxt.startActivity(shareIntent)
-}
-
-fun shareFile(cxt: Context, text: String, filePath: String) {
-  val uri = FileProvider.getUriForFile(SimplexApp.context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))
-  val ext = filePath.substringAfterLast(".")
-  val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext) ?: return
-  val sendIntent: Intent = Intent().apply {
-    action = Intent.ACTION_SEND
-    /*if (text.isNotEmpty()) {
-      putExtra(Intent.EXTRA_TEXT, text)
-    }*/
-    putExtra(Intent.EXTRA_STREAM, uri)
-    type = mimeType
-  }
-  val shareIntent = Intent.createChooser(sendIntent, null)
-  cxt.startActivity(shareIntent)
-}
-
-fun copyText(cxt: Context, text: String) {
-  val clipboard = ContextCompat.getSystemService(cxt, ClipboardManager::class.java)
-  clipboard?.setPrimaryClip(ClipData.newPlainText("text", text))
-}
-
-fun sendEmail(context: Context, subject: String, body: CharSequence) {
-  val emailIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
-  emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
-  emailIntent.putExtra(Intent.EXTRA_TEXT, body)
-  try {
-    context.startActivity(emailIntent)
-  } catch (e: ActivityNotFoundException) {
-    Log.e(TAG, "No activity was found for handling email intent")
-  }
-}
-
-@Composable
-fun rememberSaveFileLauncher(cxt: Context, ciFile: CIFile?): ManagedActivityResultLauncher<String, Uri?> =
-  rememberLauncherForActivityResult(
-    contract = ActivityResultContracts.CreateDocument(),
-    onResult = { destination ->
-      destination?.let {
-        val filePath = getLoadedFilePath(cxt, ciFile)
-        if (filePath != null) {
-          val contentResolver = cxt.contentResolver
-          contentResolver.openOutputStream(destination)?.let { stream ->
-            val outputStream = BufferedOutputStream(stream)
-            File(filePath).inputStream().use { it.copyTo(outputStream) }
-            outputStream.close()
-            Toast.makeText(cxt, generalGetString(R.string.file_saved), Toast.LENGTH_SHORT).show()
-          }
-        } else {
-          Toast.makeText(cxt, generalGetString(R.string.file_not_found), Toast.LENGTH_SHORT).show()
-        }
-      }
-    }
-  )
-
-fun imageMimeType(fileName: String): String {
-  val lowercaseName = fileName.lowercase()
-  return when {
-    lowercaseName.endsWith(".png") -> "image/png"
-    lowercaseName.endsWith(".gif") -> "image/gif"
-    lowercaseName.endsWith(".webp") -> "image/webp"
-    lowercaseName.endsWith(".avif") -> "image/avif"
-    lowercaseName.endsWith(".svg") -> "image/svg+xml"
-    else -> "image/jpeg"
-  }
-}
-
-/** Before calling, make sure the user allows to write to external storage [Manifest.permission.WRITE_EXTERNAL_STORAGE] */
-fun saveImage(cxt: Context, ciFile: CIFile?) {
-  val filePath = getLoadedFilePath(cxt, ciFile)
-  val fileName = ciFile?.fileName
-  if (filePath != null && fileName != null) {
-    val values = ContentValues()
-    values.put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis())
-    values.put(MediaStore.Images.Media.MIME_TYPE, imageMimeType(fileName))
-    values.put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
-    values.put(MediaStore.MediaColumns.TITLE, fileName)
-    val uri = cxt.contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values)
-    uri?.let {
-      cxt.contentResolver.openOutputStream(uri)?.let { stream ->
-        val outputStream = BufferedOutputStream(stream)
-        File(filePath).inputStream().use { it.copyTo(outputStream) }
-        outputStream.close()
-        Toast.makeText(cxt, generalGetString(R.string.image_saved), Toast.LENGTH_SHORT).show()
-      }
-    }
-  } else {
-    Toast.makeText(cxt, generalGetString(R.string.file_not_found), Toast.LENGTH_SHORT).show()
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt

@@ -1,686 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.app.Activity
-import android.app.Application
-//import android.app.LocaleManager
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.res.Configuration
-import android.content.res.Resources
-import android.graphics.*
-import android.graphics.Typeface
-import android.graphics.drawable.Drawable
-import android.media.MediaMetadataRetriever
-import android.net.Uri
-import android.os.*
-import android.provider.OpenableColumns
-import android.text.Spanned
-import android.text.SpannedString
-import android.text.style.*
-import android.util.Base64
-import android.util.Log
-import android.view.View
-import android.view.ViewTreeObserver
-import android.view.inputmethod.InputMethodManager
-import androidx.annotation.StringRes
-import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.Saver
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.*
-import androidx.compose.ui.text.style.BaselineShift
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.*
-import androidx.core.content.FileProvider
-import androidx.core.graphics.ColorUtils
-import androidx.core.text.HtmlCompat
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.ThemeOverrides
-import com.charleskorn.kaml.decodeFromStream
-import kotlinx.coroutines.*
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import org.apache.commons.io.IOUtils
-import java.io.*
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlin.math.*
-
-fun withApi(action: suspend CoroutineScope.() -> Unit): Job = withScope(GlobalScope, action)
-
-fun withScope(scope: CoroutineScope, action: suspend CoroutineScope.() -> Unit): Job =
-  scope.launch { withContext(Dispatchers.Main, action) }
-
-fun withBGApi(action: suspend CoroutineScope.() -> Unit): Job =
-  CoroutineScope(Dispatchers.Default).launch(block = action)
-
-enum class KeyboardState {
-  Opened, Closed
-}
-
-@Composable
-fun getKeyboardState(): State<KeyboardState> {
-  val keyboardState = remember { mutableStateOf(KeyboardState.Closed) }
-  val view = LocalView.current
-  DisposableEffect(view) {
-    val onGlobalListener = ViewTreeObserver.OnGlobalLayoutListener {
-      val rect = Rect()
-      view.getWindowVisibleDisplayFrame(rect)
-      val screenHeight = view.rootView.height
-      val keypadHeight = screenHeight - rect.bottom
-      keyboardState.value = if (keypadHeight > screenHeight * 0.15) {
-        KeyboardState.Opened
-      } else {
-        KeyboardState.Closed
-      }
-    }
-    view.viewTreeObserver.addOnGlobalLayoutListener(onGlobalListener)
-
-    onDispose {
-      view.viewTreeObserver.removeOnGlobalLayoutListener(onGlobalListener)
-    }
-  }
-
-  return keyboardState
-}
-
-fun hideKeyboard(view: View) =
-  (SimplexApp.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager).hideSoftInputFromWindow(view.windowToken, 0)
-
-// Resource to annotated string from
-// https://stackoverflow.com/questions/68549248/android-jetpack-compose-how-to-show-styled-text-from-string-resources
-fun generalGetString(id: Int): String {
-  // prefer stringResource in Composable items to retain preview abilities
-  return SimplexApp.context.getString(id)
-}
-
-@Composable
-@ReadOnlyComposable
-private fun resources(): Resources {
-  LocalConfiguration.current
-  return LocalContext.current.resources
-}
-
-fun Spanned.toHtmlWithoutParagraphs(): String {
-  return HtmlCompat.toHtml(this, HtmlCompat.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE)
-    .substringAfter("<p dir=\"ltr\">").substringBeforeLast("</p>")
-}
-
-fun Resources.getText(@StringRes id: Int, vararg args: Any): CharSequence {
-  val escapedArgs = args.map {
-    if (it is Spanned) it.toHtmlWithoutParagraphs() else it
-  }.toTypedArray()
-  val resource = SpannedString(getText(id))
-  val htmlResource = resource.toHtmlWithoutParagraphs()
-  val formattedHtml = String.format(htmlResource, *escapedArgs)
-  return HtmlCompat.fromHtml(formattedHtml, HtmlCompat.FROM_HTML_MODE_LEGACY)
-}
-
-@Composable
-fun annotatedStringResource(@StringRes id: Int): AnnotatedString {
-  val resources = resources()
-  val density = LocalDensity.current
-  return remember(id) {
-    val text = resources.getText(id)
-    spannableStringToAnnotatedString(text, density)
-  }
-}
-
-private fun spannableStringToAnnotatedString(
-  text: CharSequence,
-  density: Density,
-): AnnotatedString {
-  return if (text is Spanned) {
-    with(density) {
-      buildAnnotatedString {
-        append((text.toString()))
-        text.getSpans(0, text.length, Any::class.java).forEach {
-          val start = text.getSpanStart(it)
-          val end = text.getSpanEnd(it)
-          when (it) {
-            is StyleSpan -> when (it.style) {
-              Typeface.NORMAL -> addStyle(
-                SpanStyle(
-                  fontWeight = FontWeight.Normal,
-                  fontStyle = FontStyle.Normal,
-                ),
-                start,
-                end
-              )
-              Typeface.BOLD -> addStyle(
-                SpanStyle(
-                  fontWeight = FontWeight.Bold,
-                  fontStyle = FontStyle.Normal
-                ),
-                start,
-                end
-              )
-              Typeface.ITALIC -> addStyle(
-                SpanStyle(
-                  fontWeight = FontWeight.Normal,
-                  fontStyle = FontStyle.Italic
-                ),
-                start,
-                end
-              )
-              Typeface.BOLD_ITALIC -> addStyle(
-                SpanStyle(
-                  fontWeight = FontWeight.Bold,
-                  fontStyle = FontStyle.Italic
-                ),
-                start,
-                end
-              )
-            }
-            is TypefaceSpan -> addStyle(
-              SpanStyle(
-                fontFamily = when (it.family) {
-                  FontFamily.SansSerif.name -> FontFamily.SansSerif
-                  FontFamily.Serif.name -> FontFamily.Serif
-                  FontFamily.Monospace.name -> FontFamily.Monospace
-                  FontFamily.Cursive.name -> FontFamily.Cursive
-                  else -> FontFamily.Default
-                }
-              ),
-              start,
-              end
-            )
-            is AbsoluteSizeSpan -> addStyle(
-              SpanStyle(fontSize = if (it.dip) it.size.dp.toSp() else it.size.toSp()),
-              start,
-              end
-            )
-            is RelativeSizeSpan -> addStyle(
-              SpanStyle(fontSize = it.sizeChange.em),
-              start,
-              end
-            )
-            is StrikethroughSpan -> addStyle(
-              SpanStyle(textDecoration = TextDecoration.LineThrough),
-              start,
-              end
-            )
-            is UnderlineSpan -> addStyle(
-              SpanStyle(textDecoration = TextDecoration.Underline),
-              start,
-              end
-            )
-            is SuperscriptSpan -> addStyle(
-              SpanStyle(baselineShift = BaselineShift.Superscript),
-              start,
-              end
-            )
-            is SubscriptSpan -> addStyle(
-              SpanStyle(baselineShift = BaselineShift.Subscript),
-              start,
-              end
-            )
-            is ForegroundColorSpan -> addStyle(
-              SpanStyle(color = Color(it.foregroundColor)),
-              start,
-              end
-            )
-            else -> addStyle(SpanStyle(color = Color.White), start, end)
-          }
-        }
-      }
-    }
-  } else {
-    AnnotatedString(text.toString())
-  }
-}
-
-// maximum image file size to be auto-accepted
-const val MAX_IMAGE_SIZE: Long = 261_120 // 255KB
-const val MAX_IMAGE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE * 2
-const val MAX_VOICE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE * 2
-const val MAX_VIDEO_SIZE_AUTO_RCV: Long = 1_047_552 // 1023KB
-
-const val MAX_VOICE_MILLIS_FOR_SENDING: Int = 300_000
-
-const val MAX_FILE_SIZE_SMP: Long = 8000000
-
-const val MAX_FILE_SIZE_XFTP: Long = 1_073_741_824 // 1GB
-
-fun getFilesDirectory(context: Context): String {
-  return context.filesDir.toString()
-}
-
-fun getTempFilesDirectory(context: Context): String {
-  return "${getFilesDirectory(context)}/temp_files"
-}
-
-fun getAppFilesDirectory(context: Context): String {
-  return "${getFilesDirectory(context)}/app_files"
-}
-
-fun getAppFilePath(context: Context, fileName: String): String {
-  return "${getAppFilesDirectory(context)}/$fileName"
-}
-
-fun getAppFileUri(fileName: String): Uri {
-  return Uri.parse("${getAppFilesDirectory(SimplexApp.context)}/$fileName")
-}
-
-
-fun getLoadedFilePath(context: Context, file: CIFile?): String? {
-  return if (file?.filePath != null && file.loaded) {
-    val filePath = getAppFilePath(context, file.filePath)
-    if (File(filePath).exists()) filePath else null
-  } else {
-    null
-  }
-}
-
-// https://developer.android.com/training/data-storage/shared/documents-files#bitmap
-fun getLoadedImage(context: Context, file: CIFile?): Bitmap? {
-  val filePath = getLoadedFilePath(context, file)
-  return if (filePath != null) {
-    try {
-      val uri = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))
-      val parcelFileDescriptor = context.contentResolver.openFileDescriptor(uri, "r")
-      val fileDescriptor = parcelFileDescriptor?.fileDescriptor
-      val image = decodeSampledBitmapFromFileDescriptor(fileDescriptor, 1000, 1000)
-      parcelFileDescriptor?.close()
-      image
-    } catch (e: Exception) {
-      null
-    }
-  } else {
-    null
-  }
-}
-
-// https://developer.android.com/topic/performance/graphics/load-bitmap#load-bitmap
-private fun decodeSampledBitmapFromFileDescriptor(fileDescriptor: FileDescriptor?, reqWidth: Int, reqHeight: Int): Bitmap {
-  // First decode with inJustDecodeBounds=true to check dimensions
-  return BitmapFactory.Options().run {
-    inJustDecodeBounds = true
-    BitmapFactory.decodeFileDescriptor(fileDescriptor, null, this)
-    // Calculate inSampleSize
-    inSampleSize = calculateInSampleSize(this, reqWidth, reqHeight)
-    // Decode bitmap with inSampleSize set
-    inJustDecodeBounds = false
-
-    BitmapFactory.decodeFileDescriptor(fileDescriptor, null, this)
-  }
-}
-
-private fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
-  // Raw height and width of image
-  val (height: Int, width: Int) = options.run { outHeight to outWidth }
-  var inSampleSize = 1
-
-  if (height > reqHeight || width > reqWidth) {
-    val halfHeight: Int = height / 2
-    val halfWidth: Int = width / 2
-    // Calculate the largest inSampleSize value that is a power of 2 and keeps both
-    // height and width larger than the requested height and width.
-    while (halfHeight / inSampleSize >= reqHeight && halfWidth / inSampleSize >= reqWidth) {
-      inSampleSize *= 2
-    }
-  }
-
-  return inSampleSize
-}
-
-fun getFileName(context: Context, uri: Uri): String? {
-  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
-    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-    cursor.moveToFirst()
-    cursor.getString(nameIndex)
-  }
-}
-
-fun getAppFilePath(context: Context, uri: Uri): String? {
-  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
-    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-    cursor.moveToFirst()
-    getAppFilePath(context, cursor.getString(nameIndex))
-  }
-}
-
-fun getFileSize(context: Context, uri: Uri): Long? {
-  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
-    val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE)
-    cursor.moveToFirst()
-    cursor.getLong(sizeIndex)
-  }
-}
-
-fun getBitmapFromUri(uri: Uri, withAlertOnException: Boolean = true): Bitmap? {
-  return if (Build.VERSION.SDK_INT >= 28) {
-    val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
-    try {
-      ImageDecoder.decodeBitmap(source)
-    } catch (e: android.graphics.ImageDecoder.DecodeException) {
-      Log.e(TAG, "Unable to decode the image: ${e.stackTraceToString()}")
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.image_decoding_exception_title),
-          text = generalGetString(R.string.image_decoding_exception_desc)
-        )
-      }
-      null
-    }
-  } else {
-    BitmapFactory.decodeFile(getAppFilePath(SimplexApp.context, uri))
-  }
-}
-
-fun getDrawableFromUri(uri: Uri, withAlertOnException: Boolean = true): Drawable? {
-  return if (Build.VERSION.SDK_INT >= 28) {
-    val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, uri)
-    try {
-      ImageDecoder.decodeDrawable(source)
-    } catch (e: android.graphics.ImageDecoder.DecodeException) {
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.image_decoding_exception_title),
-          text = generalGetString(R.string.image_decoding_exception_desc)
-        )
-      }
-      Log.e(TAG, "Error while decoding drawable: ${e.stackTraceToString()}")
-      null
-    }
-  } else {
-    Drawable.createFromPath(getAppFilePath(SimplexApp.context, uri))
-  }
-}
-
-fun getThemeFromUri(uri: Uri, withAlertOnException: Boolean = true): ThemeOverrides? {
-  SimplexApp.context.contentResolver.openInputStream(uri).use {
-    runCatching {
-      return yaml.decodeFromStream<ThemeOverrides>(it!!)
-    }.onFailure {
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.import_theme_error),
-          text = generalGetString(R.string.import_theme_error_desc),
-        )
-      }
-    }
-  }
-  return null
-}
-
-fun saveImage(context: Context, uri: Uri): String? {
-  val bitmap = getBitmapFromUri(uri) ?: return null
-  return saveImage(context, bitmap)
-}
-
-fun saveImage(context: Context, image: Bitmap): String? {
-  return try {
-    val ext = if (image.hasAlpha()) "png" else "jpg"
-    val dataResized = resizeImageToDataSize(image, ext == "png", maxDataSize = MAX_IMAGE_SIZE)
-    val fileToSave = generateNewFileName(context, "IMG", ext)
-    val file = File(getAppFilePath(context, fileToSave))
-    val output = FileOutputStream(file)
-    dataResized.writeTo(output)
-    output.flush()
-    output.close()
-    fileToSave
-  } catch (e: Exception) {
-    Log.e(chat.simplex.app.TAG, "Util.kt saveImage error: ${e.message}")
-    null
-  }
-}
-
-fun saveAnimImage(context: Context, uri: Uri): String? {
-  return try {
-    val filename = getFileName(context, uri)?.lowercase()
-    var ext = when {
-      // remove everything but extension
-      filename?.contains(".") == true -> filename.replaceBeforeLast('.', "").replace(".", "")
-      else -> "gif"
-    }
-    // Just in case the image has a strange extension
-    if (ext.length < 3 || ext.length > 4) ext = "gif"
-    val fileToSave = generateNewFileName(context, "IMG", ext)
-    val file = File(getAppFilePath(context, fileToSave))
-    val output = FileOutputStream(file)
-    context.contentResolver.openInputStream(uri)!!.use { input ->
-      output.use { output ->
-        input.copyTo(output)
-      }
-    }
-    fileToSave
-  } catch (e: Exception) {
-    Log.e(chat.simplex.app.TAG, "Util.kt saveAnimImage error: ${e.message}")
-    null
-  }
-}
-
-fun saveTempImageUncompressed(image: Bitmap, asPng: Boolean): File? {
-  return try {
-    val ext = if (asPng) "png" else "jpg"
-    val tmpDir = SimplexApp.context.getDir("temp", Application.MODE_PRIVATE)
-    return File(tmpDir.absolutePath + File.separator + generateNewFileName(SimplexApp.context, "IMG", ext)).apply {
-      outputStream().use { out ->
-        image.compress(if (asPng) Bitmap.CompressFormat.PNG else Bitmap.CompressFormat.JPEG, 85, out)
-        out.flush()
-      }
-      deleteOnExit()
-      SimplexApp.context.chatModel.filesToDelete.add(this)
-    }
-  } catch (e: Exception) {
-    Log.e(TAG, "Util.kt saveTempImageUncompressed error: ${e.message}")
-    null
-  }
-}
-
-fun saveFileFromUri(context: Context, uri: Uri): String? {
-  return try {
-    val inputStream = context.contentResolver.openInputStream(uri)
-    val fileToSave = getFileName(context, uri)
-    if (inputStream != null && fileToSave != null) {
-      val destFileName = uniqueCombine(context, fileToSave)
-      val destFile = File(getAppFilePath(context, destFileName))
-      IOUtils.copy(inputStream, FileOutputStream(destFile))
-      destFileName
-    } else {
-      Log.e(chat.simplex.app.TAG, "Util.kt saveFileFromUri null inputStream")
-      null
-    }
-  } catch (e: Exception) {
-    Log.e(chat.simplex.app.TAG, "Util.kt saveFileFromUri error: ${e.message}")
-    null
-  }
-}
-
-fun generateNewFileName(context: Context, prefix: String, ext: String): String {
-  val sdf = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US)
-  sdf.timeZone = TimeZone.getTimeZone("GMT")
-  val timestamp = sdf.format(Date())
-  return uniqueCombine(context, "${prefix}_$timestamp.$ext")
-}
-
-fun uniqueCombine(context: Context, fileName: String): String {
-  val orig = File(fileName)
-  val name = orig.nameWithoutExtension
-  val ext = orig.extension
-  fun tryCombine(n: Int): String {
-    val suffix = if (n == 0) "" else "_$n"
-    val f = "$name$suffix.$ext"
-    return if (File(getAppFilePath(context, f)).exists()) tryCombine(n + 1) else f
-  }
-  return tryCombine(0)
-}
-
-fun formatBytes(bytes: Long): String {
-  if (bytes == 0.toLong()) {
-    return "0 bytes"
-  }
-  val bytesDouble = bytes.toDouble()
-  val k = 1024.toDouble()
-  val units = arrayOf("bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
-  val i = floor(log2(bytesDouble) / log2(k))
-  val size = bytesDouble / k.pow(i)
-  val unit = units[i.toInt()]
-
-  return if (i <= 1) {
-    String.format("%.0f %s", size, unit)
-  } else {
-    String.format("%.2f %s", size, unit)
-  }
-}
-
-fun removeFile(context: Context, fileName: String): Boolean {
-  val file = File(getAppFilePath(context, fileName))
-  val fileDeleted = file.delete()
-  if (!fileDeleted) {
-    Log.e(chat.simplex.app.TAG, "Util.kt removeFile error")
-  }
-  return fileDeleted
-}
-
-fun deleteAppFiles(context: Context) {
-  val dir = File(getAppFilesDirectory(context))
-  try {
-    dir.list()?.forEach {
-      removeFile(context, it)
-    }
-  } catch (e: java.lang.Exception) {
-    Log.e(TAG, "Util deleteAppFiles error: ${e.stackTraceToString()}")
-  }
-}
-
-fun directoryFileCountAndSize(dir: String): Pair<Int, Long> { // count, size in bytes
-  var fileCount = 0
-  var bytes = 0L
-  try {
-    File(dir).listFiles()?.forEach {
-      fileCount++
-      bytes += it.length()
-    }
-  } catch (e: java.lang.Exception) {
-    Log.e(TAG, "Util directoryFileCountAndSize error: ${e.stackTraceToString()}")
-  }
-  return fileCount to bytes
-}
-
-fun getMaxFileSize(fileProtocol: FileProtocol): Long {
-  return when (fileProtocol) {
-    FileProtocol.XFTP -> MAX_FILE_SIZE_XFTP
-    FileProtocol.SMP -> MAX_FILE_SIZE_SMP
-  }
-}
-
-fun getBitmapFromVideo(uri: Uri, timestamp: Long? = null, random: Boolean = true): VideoPlayer.PreviewAndDuration {
-  val mmr = MediaMetadataRetriever()
-  mmr.setDataSource(SimplexApp.context, uri)
-  val durationMs = mmr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong()
-  val image = when {
-    timestamp != null -> mmr.getFrameAtTime(timestamp * 1000, MediaMetadataRetriever.OPTION_CLOSEST)
-    random -> mmr.frameAtTime
-    else -> mmr.getFrameAtTime(0)
-  }
-  mmr.release()
-  return VideoPlayer.PreviewAndDuration(image, durationMs, timestamp ?: 0)
-}
-
-fun Color.darker(factor: Float = 0.1f): Color =
-  Color(max(red * (1 - factor), 0f), max(green * (1 - factor), 0f), max(blue * (1 - factor), 0f), alpha)
-
-fun Color.lighter(factor: Float = 0.1f): Color =
-  Color(min(red * (1 + factor), 1f), min(green * (1 + factor), 1f), min(blue * (1 + factor), 1f), alpha)
-
-fun Color.mixWith(color: Color, alpha: Float): Color =
-  Color(ColorUtils.blendARGB(color.toArgb(), toArgb(), alpha))
-
-fun ByteArray.toBase64String() = Base64.encodeToString(this, Base64.DEFAULT)
-
-fun String.toByteArrayFromBase64() = Base64.decode(this, Base64.DEFAULT)
-
-val LongRange.Companion.saver
-  get() = Saver<MutableState<LongRange>, Pair<Long, Long>>(
-    save = { it.value.first to it.value.last },
-    restore = { mutableStateOf(it.first..it.second) }
-    )
-
-/* Make sure that T class has @Serializable annotation */
-inline fun <reified T> serializableSaver(): Saver<T, *> = Saver(
-    save = { json.encodeToString(it) },
-    restore = { json.decodeFromString(it) }
-  )
-
-fun saveAppLocale(pref: SharedPreference<String?>, activity: Activity, languageCode: String? = null) {
-//  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-//    val localeManager = SimplexApp.context.getSystemService(LocaleManager::class.java)
-//    localeManager.applicationLocales = LocaleList(Locale.forLanguageTag(languageCode ?: return))
-//  } else {
-    pref.set(languageCode)
-    if (languageCode == null) {
-      activity.applyLocale(SimplexApp.context.defaultLocale)
-    }
-    activity.recreate()
-//  }
-}
-
-fun Activity.applyAppLocale(pref: SharedPreference<String?>) {
-//  if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-    val lang = pref.get()
-    if (lang == null || lang == Locale.getDefault().language) return
-    applyLocale(Locale.forLanguageTag(lang))
-//  }
-}
-
-private fun Activity.applyLocale(locale: Locale) {
-  Locale.setDefault(locale)
-  val appConf = Configuration(SimplexApp.context.resources.configuration).apply { setLocale(locale) }
-  val activityConf = Configuration(resources.configuration).apply { setLocale(locale) }
-  @Suppress("DEPRECATION")
-  SimplexApp.context.resources.updateConfiguration(appConf, resources.displayMetrics)
-  @Suppress("DEPRECATION")
-  resources.updateConfiguration(activityConf, resources.displayMetrics)
-}
-
-fun UriHandler.openUriCatching(uri: String) {
-  try {
-    openUri(uri)
-  } catch (e: ActivityNotFoundException) {
-    Log.e(TAG, e.stackTraceToString())
-  }
-}
-
-fun IntSize.Companion.Saver(): Saver<IntSize, *> = Saver(
-  save = { it.width to it.height },
-  restore = { IntSize(it.first, it.second) }
-)
-
-@Composable
-fun DisposableEffectOnGone(always: () -> Unit = {}, whenDispose: () -> Unit = {}, whenGone: () -> Unit) {
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    always()
-    val activity = context as? Activity ?: return@DisposableEffect onDispose {}
-    val orientation = activity.resources.configuration.orientation
-    onDispose {
-      whenDispose()
-      if (orientation == activity.resources.configuration.orientation) {
-        whenGone()
-      }
-    }
-  }
-}
-
-@Composable
-fun DisposableEffectOnRotate(always: () -> Unit = {}, whenDispose: () -> Unit = {}, whenRotate: () -> Unit) {
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    always()
-    val activity = context as? Activity ?: return@DisposableEffect onDispose {}
-    val orientation = activity.resources.configuration.orientation
-    onDispose {
-      whenDispose()
-      if (orientation != activity.resources.configuration.orientation) {
-        whenRotate()
-      }
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/localauth/PasscodeView.kt

@@ -1,98 +0,0 @@
-package chat.simplex.app.views.localauth
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.ui.theme.SimpleButton
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun PasscodeView(
-  passcode: MutableState<String>,
-  title: String,
-  reason: String? = null,
-  submitLabel: String,
-  submitEnabled: ((String) -> Boolean)? = null,
-  submit: () -> Unit,
-  cancel: () -> Unit,
-) {
-  @Composable
-  fun VerticalLayout() {
-    Column(
-      horizontalAlignment = Alignment.CenterHorizontally,
-      verticalArrangement = Arrangement.SpaceEvenly
-    ) {
-      Column(horizontalAlignment = Alignment.CenterHorizontally) {
-        Text(title, style = MaterialTheme.typography.h1)
-        if (reason != null) {
-          Text(reason, Modifier.padding(top = 5.dp), style = MaterialTheme.typography.subtitle1)
-        }
-      }
-      PasscodeEntry(passcode, true)
-      Row {
-        SimpleButton(generalGetString(R.string.cancel_verb), icon = painterResource(R.drawable.ic_close), click = cancel)
-        Spacer(Modifier.size(20.dp))
-        SimpleButton(submitLabel, icon = painterResource(R.drawable.ic_done_filled), disabled = submitEnabled?.invoke(passcode.value) == false || passcode.value.length < 4, click = submit)
-      }
-    }
-  }
-
-  @Composable
-  fun HorizontalLayout() {
-    Row(Modifier.padding(horizontal = DEFAULT_PADDING), horizontalArrangement = Arrangement.Center) {
-      Column(
-        Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING * 4),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.SpaceBetween
-      ) {
-        Column(horizontalAlignment = Alignment.CenterHorizontally) {
-          Text(title, style = MaterialTheme.typography.h1)
-          if (reason != null) {
-            Text(reason, Modifier.padding(top = 5.dp), style = MaterialTheme.typography.subtitle1)
-          }
-        }
-        PasscodeEntry(passcode, false)
-      }
-
-      Column(
-        Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING * 4),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.SpaceBetween
-      ) {
-        // Just to fill space to correctly calculate the height
-        Column {
-          Text("", style = MaterialTheme.typography.h1)
-          if (reason != null) {
-            Text("", Modifier.padding(top = 5.dp), style = MaterialTheme.typography.subtitle1)
-          }
-          PasscodeView(remember { mutableStateOf("") })
-        }
-        BoxWithConstraints {
-          val s = minOf(maxWidth, maxHeight) / 3.5f
-          Column(
-            Modifier.padding(start = 30.dp).height(s * 3),
-            verticalArrangement = Arrangement.SpaceEvenly
-          ) {
-            SimpleButton(generalGetString(R.string.cancel_verb), icon = painterResource(R.drawable.ic_close), click = cancel)
-            SimpleButton(submitLabel, icon = painterResource(R.drawable.ic_done_filled), disabled = submitEnabled?.invoke(passcode.value) == false || passcode.value.length < 4, click = submit)
-          }
-        }
-      }
-    }
-  }
-
-  if (LocalContext.current.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
-    VerticalLayout()
-  } else {
-    HorizontalLayout()
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactLearnMore.kt

@@ -1,23 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.Column
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.views.helpers.AppBarTitle
-import chat.simplex.app.views.onboarding.ReadableText
-import chat.simplex.app.views.onboarding.ReadableTextWithLink
-
-@Composable
-fun AddContactLearnMore() {
-  Column(
-    Modifier.verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.one_time_link))
-    ReadableText(R.string.scan_qr_to_connect_to_contact)
-    ReadableText(R.string.if_you_cant_meet_in_person)
-    ReadableTextWithLink(R.string.read_more_in_user_guide_with_link, "https://simplex.chat/docs/guide/readme.html#connect-to-friends")
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt

@@ -1,172 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import SectionBottomSpacer
-import SectionSpacer
-import SectionView
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.ui.res.painterResource
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.SettingsActionItem
-
-@Composable
-fun AddContactView(connReqInvitation: String, connIncognito: Boolean) {
-  val cxt = LocalContext.current
-  AddContactLayout(
-    connReq = connReqInvitation,
-    connIncognito = connIncognito,
-    share = { shareText(cxt, connReqInvitation) },
-    learnMore = {
-      ModalManager.shared.showModal {
-        Column(
-          Modifier
-            .fillMaxHeight()
-            .padding(horizontal = DEFAULT_PADDING),
-          verticalArrangement = Arrangement.SpaceBetween
-        ) {
-          AddContactLearnMore()
-        }
-      }
-    }
-  )
-}
-
-@Composable
-fun AddContactLayout(connReq: String, connIncognito: Boolean, share: () -> Unit, learnMore: () -> Unit) {
-  Column(
-    Modifier
-      .verticalScroll(rememberScrollState()),
-    verticalArrangement = Arrangement.SpaceBetween,
-  ) {
-    AppBarTitle(stringResource(R.string.add_contact))
-    OneTimeLinkProfileText(connIncognito)
-
-    SectionSpacer()
-    SectionView(stringResource(R.string.one_time_link_short).uppercase()) {
-      OneTimeLinkSection(connReq, share, learnMore)
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-fun OneTimeLinkProfileText(connIncognito: Boolean) {
-  Row(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-    InfoAboutIncognito(
-      connIncognito,
-      true,
-      generalGetString(R.string.incognito_random_profile_description),
-      generalGetString(R.string.your_profile_will_be_sent)
-    )
-  }
-}
-
-@Composable
-fun ColumnScope.OneTimeLinkSection(connReq: String, share: () -> Unit, learnMore: () -> Unit) {
-  if (connReq.isNotEmpty()) {
-    QRCode(
-      connReq, Modifier
-        .padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF)
-        .aspectRatio(1f)
-    )
-  } else {
-    CircularProgressIndicator(
-      Modifier
-        .size(36.dp)
-        .padding(4.dp)
-        .align(Alignment.CenterHorizontally),
-      color = MaterialTheme.colors.secondary,
-      strokeWidth = 3.dp
-    )
-  }
-  ShareLinkButton(share)
-  OneTimeLinkLearnMoreButton(learnMore)
-}
-
-@Composable
-fun ShareLinkButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_share),
-    stringResource(R.string.share_invitation_link),
-    onClick,
-    iconColor = MaterialTheme.colors.primary,
-    textColor = MaterialTheme.colors.primary,
-  )
-}
-
-@Composable
-fun OneTimeLinkLearnMoreButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_info),
-    stringResource(R.string.learn_more),
-    onClick,
-  )
-}
-
-@Composable
-fun InfoAboutIncognito(chatModelIncognito: Boolean, supportedIncognito: Boolean = true, onText: String, offText: String, centered: Boolean = false) {
-  if (chatModelIncognito) {
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(vertical = 4.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = if (centered) Arrangement.Center else Arrangement.Start
-    ) {
-      Icon(
-        if (supportedIncognito) painterResource(R.drawable.ic_theater_comedy_filled) else painterResource(R.drawable.ic_info),
-        stringResource(R.string.incognito),
-        tint = if (supportedIncognito) Indigo else WarningOrange,
-        modifier = Modifier.padding(end = 10.dp).size(20.dp)
-      )
-      Text(onText, textAlign = if (centered) TextAlign.Center else TextAlign.Left, style = MaterialTheme.typography.body2)
-    }
-  } else {
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(vertical = 4.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = if (centered) Arrangement.Center else Arrangement.Start
-    ) {
-      Icon(
-        painterResource(R.drawable.ic_info),
-        stringResource(R.string.incognito),
-        tint = MaterialTheme.colors.secondary,
-        modifier = Modifier.padding(end = 10.dp).size(20.dp)
-      )
-      Text(offText, textAlign = if (centered) TextAlign.Center else TextAlign.Left, style = MaterialTheme.typography.body2)
-    }
-  }
-}
-
-@Preview
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewAddContactView() {
-  SimpleXTheme {
-    AddContactLayout(
-      connReq = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D",
-      connIncognito = false,
-      share = {},
-      learnMore = {},
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/newchat/PasteToConnect.kt

@@ -1,138 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import SectionBottomSpacer
-import android.content.ClipboardManager
-import android.content.res.Configuration
-import android.net.Uri
-import android.util.Log
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat.getSystemService
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun PasteToConnectView(chatModel: ChatModel, close: () -> Unit) {
-  val connectionLink = remember { mutableStateOf("") }
-  val context = LocalContext.current
-  val clipboard = getSystemService(context, ClipboardManager::class.java)
-  PasteToConnectLayout(
-    chatModel.incognito.value,
-    connectionLink = connectionLink,
-    pasteFromClipboard = {
-      connectionLink.value = clipboard?.primaryClip?.getItemAt(0)?.coerceToText(context) as? String ?: return@PasteToConnectLayout
-    },
-    connectViaLink = { connReqUri ->
-      try {
-        val uri = Uri.parse(connReqUri)
-        withUriAction(uri) { linkType ->
-          val action = suspend {
-            Log.d(TAG, "connectViaUri: connecting")
-            if (connectViaUri(chatModel, linkType, uri)) {
-              close()
-            }
-          }
-          if (linkType == ConnectionLinkType.GROUP) {
-            AlertManager.shared.showAlertDialog(
-              title = generalGetString(R.string.connect_via_group_link),
-              text = generalGetString(R.string.you_will_join_group),
-              confirmText = generalGetString(R.string.connect_via_link_verb),
-              onConfirm = { withApi { action() } }
-            )
-          } else action()
-        }
-      } catch (e: RuntimeException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.invalid_connection_link),
-          text = generalGetString(R.string.this_string_is_not_a_connection_link)
-        )
-      }
-    },
-  )
-}
-
-@Composable
-fun PasteToConnectLayout(
-  chatModelIncognito: Boolean,
-  connectionLink: MutableState<String>,
-  pasteFromClipboard: () -> Unit,
-  connectViaLink: (String) -> Unit,
-) {
-  Column(
-    Modifier.verticalScroll(rememberScrollState()).padding(horizontal = DEFAULT_PADDING),
-    verticalArrangement = Arrangement.SpaceBetween,
-  ) {
-    AppBarTitle(stringResource(R.string.connect_via_link), false)
-    Text(stringResource(R.string.paste_connection_link_below_to_connect))
-
-    InfoAboutIncognito(
-      chatModelIncognito,
-      true,
-      generalGetString(R.string.incognito_random_profile_from_contact_description),
-      generalGetString(R.string.profile_will_be_sent_to_contact_sending_link)
-    )
-
-    Box(Modifier.padding(top = DEFAULT_PADDING, bottom = 6.dp)) {
-      TextEditor(connectionLink, Modifier.height(180.dp), contentPadding = PaddingValues())
-    }
-
-    Row(
-      Modifier.fillMaxWidth().padding(bottom = 6.dp),
-      horizontalArrangement = Arrangement.Start,
-    ) {
-      if (connectionLink.value == "") {
-        SimpleButton(text = stringResource(R.string.paste_button), icon = painterResource(R.drawable.ic_content_paste)) {
-          pasteFromClipboard()
-        }
-      } else {
-        SimpleButton(text = stringResource(R.string.clear_verb), icon = painterResource(R.drawable.ic_close)) {
-          connectionLink.value = ""
-        }
-      }
-      Spacer(Modifier.weight(1f).fillMaxWidth())
-      SimpleButton(text = stringResource(R.string.connect_button), icon = painterResource(R.drawable.ic_link)) {
-        connectViaLink(connectionLink.value)
-      }
-    }
-
-    Text(annotatedStringResource(R.string.you_can_also_connect_by_clicking_the_link))
-    SectionBottomSpacer()
-  }
-}
-
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewPasteToConnectTextbox() {
-  SimpleXTheme {
-    PasteToConnectLayout(
-      chatModelIncognito = false,
-      connectionLink = remember { mutableStateOf("") },
-      pasteFromClipboard = {},
-      connectViaLink = { link ->
-        try {
-          println(link)
-  //        withApi { chatModel.controller.apiConnect(link) }
-        } catch (e: Exception) {
-          e.printStackTrace()
-        }
-      },
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/newchat/ScanToConnectView.kt

@@ -1,163 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import SectionBottomSpacer
-import android.Manifest
-import android.content.res.Configuration
-import android.net.Uri
-import android.util.Log
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.core.net.toUri
-import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.json
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.*
-import com.google.accompanist.permissions.rememberPermissionState
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Composable
-fun ScanToConnectView(chatModel: ChatModel, close: () -> Unit) {
-  val cameraPermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
-  LaunchedEffect(Unit) {
-    cameraPermissionState.launchPermissionRequest()
-  }
-  ConnectContactLayout(
-    chatModelIncognito = chatModel.incognito.value,
-    qrCodeScanner = {
-      QRCodeScanner { connReqUri ->
-        try {
-          val uri = Uri.parse(connReqUri)
-          withUriAction(uri) { linkType ->
-            val action = suspend {
-              Log.d(TAG, "connectViaUri: connecting")
-              if (connectViaUri(chatModel, linkType, uri)) {
-                close()
-              }
-            }
-            if (linkType == ConnectionLinkType.GROUP) {
-              AlertManager.shared.showAlertDialog(
-                title = generalGetString(R.string.connect_via_group_link),
-                text = generalGetString(R.string.you_will_join_group),
-                confirmText = generalGetString(R.string.connect_via_link_verb),
-                onConfirm = { withApi { action() } }
-              )
-            } else action()
-          }
-        } catch (e: RuntimeException) {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(R.string.invalid_QR_code),
-            text = generalGetString(R.string.this_QR_code_is_not_a_link)
-          )
-        }
-      }
-    },
-  )
-}
-
-enum class ConnectionLinkType {
-  CONTACT, INVITATION, GROUP
-}
-
-@Serializable
-sealed class CReqClientData {
-  @Serializable @SerialName("group") data class Group(val groupLinkId: String): CReqClientData()
-}
-
-fun withUriAction(uri: Uri, run: suspend (ConnectionLinkType) -> Unit) {
-  val action = uri.path?.drop(1)?.replace("/", "")
-  val data = uri.toString().replaceFirst("#/", "/").toUri().getQueryParameter("data")
-  val type = when {
-    data != null -> {
-      val parsed = runCatching {
-        json.decodeFromString(CReqClientData.serializer(), data)
-      }
-      when {
-        parsed.getOrNull() is CReqClientData.Group -> ConnectionLinkType.GROUP
-        else -> null
-      }
-    }
-    action == "contact" -> ConnectionLinkType.CONTACT
-    action == "invitation" -> ConnectionLinkType.INVITATION
-    else -> null
-  }
-  if (type != null) {
-    withApi { run(type) }
-  } else {
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(R.string.invalid_contact_link),
-      text = generalGetString(R.string.this_link_is_not_a_valid_connection_link)
-    )
-  }
-}
-
-suspend fun connectViaUri(chatModel: ChatModel, action: ConnectionLinkType, uri: Uri): Boolean {
-  val r = chatModel.controller.apiConnect(uri.toString())
-  if (r) {
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(R.string.connection_request_sent),
-      text =
-      when (action) {
-        ConnectionLinkType.CONTACT -> generalGetString(R.string.you_will_be_connected_when_your_connection_request_is_accepted)
-        ConnectionLinkType.INVITATION -> generalGetString(R.string.you_will_be_connected_when_your_contacts_device_is_online)
-        ConnectionLinkType.GROUP -> generalGetString(R.string.you_will_be_connected_when_group_host_device_is_online)
-      }
-    )
-  }
-  return r
-}
-
-@Composable
-fun ConnectContactLayout(chatModelIncognito: Boolean, qrCodeScanner: @Composable () -> Unit) {
-  Column(
-    Modifier.verticalScroll(rememberScrollState()).padding(horizontal = DEFAULT_PADDING),
-    verticalArrangement = Arrangement.spacedBy(12.dp)
-  ) {
-    AppBarTitle(stringResource(R.string.scan_QR_code), false)
-    InfoAboutIncognito(
-      chatModelIncognito,
-      true,
-      generalGetString(R.string.incognito_random_profile_description),
-      generalGetString(R.string.your_profile_will_be_sent)
-    )
-    Box(
-      Modifier
-        .fillMaxWidth()
-        .aspectRatio(ratio = 1F)
-        .padding(bottom = 12.dp)
-    ) { qrCodeScanner() }
-    Text(
-      annotatedStringResource(R.string.if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link),
-      lineHeight = 22.sp
-    )
-    SectionBottomSpacer()
-  }
-}
-
-@Preview
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewConnectContactLayout() {
-  SimpleXTheme {
-    ConnectContactLayout(
-      chatModelIncognito = false,
-      qrCodeScanner = { Surface {} },
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt

@@ -1,174 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import SectionBottomSpacer
-import android.util.Log
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.UserContactLinkRec
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
-
-@Composable
-fun CreateSimpleXAddress(m: ChatModel) {
-  val context = LocalContext.current
-  var progressIndicator by remember { mutableStateOf(false) }
-  val userAddress = remember { m.userAddress }
-
-  CreateSimpleXAddressLayout(
-    userAddress.value,
-    share = { address: String -> shareText(context, address) },
-    sendEmail = { address ->
-      sendEmail(
-        context,
-        generalGetString(R.string.email_invite_subject),
-        generalGetString(R.string.email_invite_body).format(address.connReqContact)
-      )
-    },
-    createAddress = {
-      withApi {
-        progressIndicator = true
-        val connReqContact = m.controller.apiCreateUserAddress()
-        if (connReqContact != null) {
-          m.userAddress.value = UserContactLinkRec(connReqContact)
-//          TODO uncomment in v5.2
-//          try {
-//            val u = m.controller.apiSetProfileAddress(true)
-//            if (u != null) {
-//              m.updateUser(u)
-//            }
-//          } catch (e: Exception) {
-//            Log.e(TAG, "CreateSimpleXAddress apiSetProfileAddress: ${e.stackTraceToString()}")
-//          }
-          progressIndicator = false
-        }
-      }
-    },
-    nextStep = {
-      m.controller.appPrefs.onboardingStage.set(OnboardingStage.Step4_SetNotificationsMode)
-      m.onboardingStage.value = OnboardingStage.Step4_SetNotificationsMode
-    },
-  )
-
-  if (progressIndicator) {
-    ProgressIndicator()
-  }
-}
-
-@Composable
-private fun CreateSimpleXAddressLayout(
-  userAddress: UserContactLinkRec?,
-  share: (String) -> Unit,
-  sendEmail: (UserContactLinkRec) -> Unit,
-  createAddress: () -> Unit,
-  nextStep: () -> Unit,
-) {
-  Column(
-    Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(top = DEFAULT_PADDING),
-    horizontalAlignment = Alignment.CenterHorizontally,
-  ) {
-    AppBarTitle(stringResource(R.string.simplex_address))
-
-    Spacer(Modifier.weight(1f))
-
-    if (userAddress != null) {
-      QRCode(userAddress.connReqContact, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-      ShareAddressButton { share(userAddress.connReqContact) }
-      Spacer(Modifier.weight(1f))
-      ShareViaEmailButton { sendEmail(userAddress) }
-      Spacer(Modifier.weight(1f))
-      ContinueButton(nextStep)
-    } else {
-      CreateAddressButton(createAddress)
-//      TODO remove color in v5.2
-      TextBelowButton(stringResource(R.string.your_contacts_will_see_it), color = Color.Transparent)
-      Spacer(Modifier.weight(1f))
-      SkipButton(nextStep)
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun CreateAddressButton(onClick: () -> Unit) {
-  TextButton(onClick) {
-    Text(stringResource(R.string.create_simplex_address), style = MaterialTheme.typography.h2, color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-fun ShareAddressButton(onClick: () -> Unit) {
-  SimpleButtonFrame(onClick) {
-    Icon(
-      painterResource(R.drawable.ic_share_filled), generalGetString(R.string.share_verb), tint = MaterialTheme.colors.primary,
-      modifier = Modifier.padding(end = 8.dp).size(18.dp)
-    )
-    Text(stringResource(R.string.share_verb), style = MaterialTheme.typography.caption, color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-fun ShareViaEmailButton(onClick: () -> Unit) {
-  SimpleButtonFrame(onClick) {
-    Icon(
-      painterResource(R.drawable.ic_mail), generalGetString(R.string.share_verb), tint = MaterialTheme.colors.primary,
-      modifier = Modifier.padding(end = 8.dp).size(30.dp)
-    )
-    Text(stringResource(R.string.invite_friends), style = MaterialTheme.typography.h6, color = MaterialTheme.colors.primary)
-  }
-}
-
-@Composable
-private fun ContinueButton(onClick: () -> Unit) {
-  SimpleButtonIconEnded(stringResource(R.string.continue_to_next_step), painterResource(R.drawable.ic_chevron_right), click = onClick)
-}
-
-@Composable
-private fun SkipButton(onClick: () -> Unit) {
-  SimpleButtonIconEnded(stringResource(R.string.dont_create_address), painterResource(R.drawable.ic_chevron_right), click = onClick)
-  TextBelowButton(stringResource(R.string.you_can_create_it_later))
-}
-
-@Composable
-private fun TextBelowButton(text: String, color: Color = Color.Unspecified) {
-  // TODO remove color in v5.2
-  Text(
-    text,
-    Modifier
-      .fillMaxWidth()
-      .padding(horizontal = DEFAULT_PADDING * 3),
-    style = MaterialTheme.typography.subtitle1,
-    textAlign = TextAlign.Center,
-    color = color
-  )
-}
-
-@Composable
-private fun ProgressIndicator() {
-  Box(
-    Modifier.fillMaxSize(),
-    contentAlignment = Alignment.Center
-  ) {
-    CircularProgressIndicator(
-      Modifier
-        .padding(horizontal = 2.dp)
-        .size(30.dp),
-      color = MaterialTheme.colors.secondary,
-      strokeWidth = 3.dp
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/OnboardingView.kt

@@ -1,49 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.views.CreateProfilePanel
-import chat.simplex.app.views.helpers.getKeyboardState
-import com.google.accompanist.insets.ProvideWindowInsets
-import kotlinx.coroutines.launch
-
-enum class OnboardingStage {
-  Step1_SimpleXInfo,
-  Step2_CreateProfile,
-  Step3_CreateSimpleXAddress,
-  Step4_SetNotificationsMode,
-  OnboardingComplete
-}
-
-@Composable
-fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
-  val scope = rememberCoroutineScope()
-  val scrollState = rememberScrollState()
-  val keyboardState by getKeyboardState()
-  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
-
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    Box(
-      modifier = Modifier
-        .fillMaxSize()
-        .padding(top = 20.dp)
-    ) {
-      CreateProfilePanel(chatModel, close)
-      LaunchedEffect(Unit) {
-        setLastVersionDefault(chatModel)
-      }
-      if (savedKeyboardState != keyboardState) {
-        LaunchedEffect(keyboardState) {
-          scope.launch {
-            savedKeyboardState = keyboardState
-            scrollState.animateScrollTo(scrollState.maxValue)
-          }
-        }
-      }
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/WhatsNewView.kt

@@ -1,406 +0,0 @@
-package chat.simplex.app.views.onboarding
-
-import android.content.res.Configuration
-import android.os.Build
-import androidx.annotation.IntegerRes
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.BuildConfig
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun WhatsNewView(viaSettings: Boolean = false, close: () -> Unit) {
-  val currentVersion = remember { mutableStateOf(versionDescriptions.lastIndex) }
-
-  @Composable
-  fun featureDescription(icon: Painter, titleId: Int, descrId: Int, link: String?) {
-    @Composable
-    fun linkButton(link: String) {
-      val uriHandler = LocalUriHandler.current
-      Icon(
-        painterResource(R.drawable.ic_open_in_new), stringResource(titleId), tint = MaterialTheme.colors.primary,
-        modifier = Modifier
-          .clickable { uriHandler.openUriCatching(link) }
-      )
-    }
-
-    Column(modifier = Modifier.padding(bottom = 12.dp)) {
-      Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-        modifier = Modifier.padding(bottom = 4.dp)
-      ) {
-        Icon(icon, stringResource(titleId), tint = MaterialTheme.colors.secondary)
-        Text(
-          generalGetString(titleId),
-          maxLines = 2,
-          overflow = TextOverflow.Ellipsis,
-          style = MaterialTheme.typography.h4,
-          fontWeight = FontWeight.Medium
-        )
-        if (link != null) {
-          linkButton(link)
-        }
-      }
-      Text(generalGetString(descrId), fontSize = 15.sp)
-    }
-  }
-
-  @Composable
-  fun pagination() {
-    Row(
-      Modifier
-        .padding(bottom = DEFAULT_PADDING)
-    ) {
-      if (currentVersion.value > 0) {
-        val prev = currentVersion.value - 1
-        Box(Modifier.clip(RoundedCornerShape(20.dp))) {
-          Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier
-              .clickable { currentVersion.value = prev }
-              .padding(8.dp)
-          ) {
-            Icon(painterResource(R.drawable.ic_arrow_back_ios_new), "previous", tint = MaterialTheme.colors.primary)
-            Text(versionDescriptions[prev].version, color = MaterialTheme.colors.primary)
-          }
-        }
-      }
-      Spacer(Modifier.fillMaxWidth().weight(1f))
-      if (currentVersion.value < versionDescriptions.lastIndex) {
-        val next = currentVersion.value + 1
-        Box(Modifier.clip(RoundedCornerShape(20.dp))) {
-          Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier
-              .clickable { currentVersion.value = next }
-              .padding(8.dp)
-          ) {
-            Text(versionDescriptions[next].version, color = MaterialTheme.colors.primary)
-            Icon(painterResource(R.drawable.ic_arrow_forward_ios), "next", tint = MaterialTheme.colors.primary)
-          }
-        }
-      }
-    }
-  }
-
-  val v = versionDescriptions[currentVersion.value]
-
-  ModalView(close = close) {
-    Column(
-      Modifier
-        .fillMaxSize()
-        .padding(horizontal = DEFAULT_PADDING)
-        .verticalScroll(rememberScrollState()),
-      verticalArrangement = Arrangement.spacedBy(DEFAULT_PADDING.times(0.75f))
-    ) {
-      AppBarTitle(String.format(generalGetString(R.string.new_in_version), v.version), bottomPadding = DEFAULT_PADDING)
-
-      v.features.forEach { feature ->
-        featureDescription(painterResource(feature.icon), feature.titleId, feature.descrId, feature.link)
-      }
-
-      val uriHandler = LocalUriHandler.current
-      if (v.post != null) {
-        Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = DEFAULT_PADDING.div(4))) {
-          Text(stringResource(R.string.whats_new_read_more), color = MaterialTheme.colors.primary,
-            modifier = Modifier.clickable { uriHandler.openUriCatching(v.post) })
-          Icon(painterResource(R.drawable.ic_open_in_new), stringResource(R.string.whats_new_read_more), tint = MaterialTheme.colors.primary)
-        }
-      }
-
-      if (!viaSettings) {
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Box(
-          Modifier.fillMaxWidth(), contentAlignment = Alignment.Center
-        ) {
-          Text(
-            generalGetString(R.string.ok),
-            modifier = Modifier.clickable(onClick = close),
-            style = MaterialTheme.typography.h3,
-            color = MaterialTheme.colors.primary
-          )
-        }
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-      }
-
-      Spacer(Modifier.fillMaxHeight().weight(1f))
-
-      pagination()
-    }
-  }
-}
-
-private data class FeatureDescription(
-  val icon: Int,
-  val titleId: Int,
-  val descrId: Int,
-  val link: String? = null
-)
-
-private data class VersionDescription(
-  val version: String,
-  val features: List<FeatureDescription>,
-  val post: String? = null,
-)
-
-private val versionDescriptions: List<VersionDescription> = listOf(
-  VersionDescription(
-    version = "v4.2",
-    post = "https://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html",
-    features = listOf(
-      FeatureDescription(
-        icon = R.drawable.ic_verified_user,
-        titleId = R.string.v4_2_security_assessment,
-        descrId = R.string.v4_2_security_assessment_desc,
-        link = "https://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html"
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_group,
-        titleId = R.string.v4_2_group_links,
-        descrId = R.string.v4_2_group_links_desc
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_check,
-        titleId = R.string.v4_2_auto_accept_contact_requests,
-        descrId = R.string.v4_2_auto_accept_contact_requests_desc
-      ),
-    )
-  ),
-  VersionDescription(
-    version = "v4.3",
-    post = "https://simplex.chat/blog/20221206-simplex-chat-v4.3-voice-messages.html",
-    features = listOf(
-      FeatureDescription(
-        icon = R.drawable.ic_mic,
-        titleId = R.string.v4_3_voice_messages,
-        descrId = R.string.v4_3_voice_messages_desc
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_delete_forever,
-        titleId = R.string.v4_3_irreversible_message_deletion,
-        descrId = R.string.v4_3_irreversible_message_deletion_desc
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_wifi_tethering,
-        titleId = R.string.v4_3_improved_server_configuration,
-        descrId = R.string.v4_3_improved_server_configuration_desc
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_visibility_off,
-        titleId = R.string.v4_3_improved_privacy_and_security,
-        descrId = R.string.v4_3_improved_privacy_and_security_desc
-      ),
-    )
-  ),
-  VersionDescription(
-    version = "v4.4",
-    post = "https://simplex.chat/blog/20230103-simplex-chat-v4.4-disappearing-messages.html",
-    features = listOf(
-      FeatureDescription(
-        icon = R.drawable.ic_timer,
-        titleId = R.string.v4_4_disappearing_messages,
-        descrId = R.string.v4_4_disappearing_messages_desc
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_pending,
-        titleId = R.string.v4_4_live_messages,
-        descrId = R.string.v4_4_live_messages_desc
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_verified_user,
-        titleId = R.string.v4_4_verify_connection_security,
-        descrId = R.string.v4_4_verify_connection_security_desc
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_translate,
-        titleId = R.string.v4_4_french_interface,
-        descrId = R.string.v4_4_french_interface_descr
-      )
-    )
-  ),
-  VersionDescription(
-    version = "v4.5",
-    post = "https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html",
-    features = listOf(
-      FeatureDescription(
-        icon = R.drawable.ic_manage_accounts,
-        titleId = R.string.v4_5_multiple_chat_profiles,
-        descrId = R.string.v4_5_multiple_chat_profiles_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_edit_note,
-        titleId = R.string.v4_5_message_draft,
-        descrId = R.string.v4_5_message_draft_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_safety_divider,
-        titleId = R.string.v4_5_transport_isolation,
-        descrId = R.string.v4_5_transport_isolation_descr,
-        link = "https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation"
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_task,
-        titleId = R.string.v4_5_private_filenames,
-        descrId = R.string.v4_5_private_filenames_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_battery_2_bar,
-        titleId = R.string.v4_5_reduced_battery_usage,
-        descrId = R.string.v4_5_reduced_battery_usage_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_translate,
-        titleId = R.string.v4_5_italian_interface,
-        descrId = R.string.v4_5_italian_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat"
-      )
-    )
-  ),
-  VersionDescription(
-    version = "v4.6",
-    post = "https://simplex.chat/blog/20230328-simplex-chat-v4-6-hidden-profiles.html",
-    features = listOf(
-      FeatureDescription(
-        icon = R.drawable.ic_lock,
-        titleId = R.string.v4_6_hidden_chat_profiles,
-        descrId = R.string.v4_6_hidden_chat_profiles_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_flag,
-        titleId = R.string.v4_6_group_moderation,
-        descrId = R.string.v4_6_group_moderation_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_maps_ugc,
-        titleId = R.string.v4_6_group_welcome_message,
-        descrId = R.string.v4_6_group_welcome_message_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_call,
-        titleId = R.string.v4_6_audio_video_calls,
-        descrId = R.string.v4_6_audio_video_calls_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_battery_3_bar,
-        titleId = R.string.v4_6_reduced_battery_usage,
-        descrId = R.string.v4_6_reduced_battery_usage_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_translate,
-        titleId = R.string.v4_6_chinese_spanish_interface,
-        descrId = R.string.v4_6_chinese_spanish_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat"
-      )
-    )
-  ),
-  VersionDescription(
-    version = "v5.0",
-    post = "https://simplex.chat/blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.html",
-    features = listOf(
-      FeatureDescription(
-        icon = R.drawable.ic_upload_file,
-        titleId = R.string.v5_0_large_files_support,
-        descrId = R.string.v5_0_large_files_support_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_lock,
-        titleId = R.string.v5_0_app_passcode,
-        descrId = R.string.v5_0_app_passcode_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_translate,
-        titleId = R.string.v5_0_polish_interface,
-        descrId = R.string.v5_0_polish_interface_descr,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat"
-      )
-    )
-  ),
-  // Also in v5.1
-  // preference to disable calls per contact
-  // configurable SOCKS proxy port
-  // access welcome message via a group profile
-  // improve calls on lock screen
-  // better formatting of times and dates
-  VersionDescription(
-    version = "v5.1",
-    post = "https://simplex.chat/blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.html",
-    features = listOf(
-      FeatureDescription(
-        icon = R.drawable.ic_add_reaction,
-        titleId = R.string.v5_1_message_reactions,
-        descrId = R.string.v5_1_message_reactions_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_chat,
-        titleId = R.string.v5_1_better_messages,
-        descrId = R.string.v5_1_better_messages_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_light_mode,
-        titleId = R.string.v5_1_custom_themes,
-        descrId = R.string.v5_1_custom_themes_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_lock,
-        titleId = R.string.v5_1_self_destruct_passcode,
-        descrId = R.string.v5_1_self_destruct_passcode_descr
-      ),
-      FeatureDescription(
-        icon = R.drawable.ic_translate,
-        titleId = R.string.v5_1_japanese_portuguese_interface,
-        descrId = R.string.whats_new_thanks_to_users_contribute_weblate,
-        link = "https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat"
-      )
-    )
-  )
-)
-
-private val lastVersion = versionDescriptions.last().version
-
-fun setLastVersionDefault(m: ChatModel) {
-  m.controller.appPrefs.whatsNewVersion.set(lastVersion)
-}
-
-fun shouldShowWhatsNew(m: ChatModel): Boolean {
-  val v = m.controller.appPrefs.whatsNewVersion.get()
-  setLastVersionDefault(m)
-  return v != lastVersion
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewWhatsNewView() {
-  SimpleXTheme {
-    WhatsNewView(
-      viaSettings = true,
-      close = {}
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Appearance.kt

@@ -1,423 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionItemView
-import SectionItemViewSpaceBetween
-import SectionSpacer
-import SectionView
-import android.app.Activity
-import android.content.ComponentName
-import android.content.Context
-import android.content.pm.PackageManager
-import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
-import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-import android.net.Uri
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.compose.ManagedActivityResultLauncher
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.material.*
-import androidx.compose.material.MaterialTheme.colors
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import com.godaddy.android.colorpicker.*
-import kotlinx.coroutines.delay
-import kotlinx.serialization.encodeToString
-import java.io.BufferedOutputStream
-import java.util.*
-import kotlin.collections.ArrayList
-
-enum class AppIcon(val resId: Int) {
-  DEFAULT(R.mipmap.icon),
-  DARK_BLUE(R.mipmap.icon_dark_blue),
-}
-
-@Composable
-fun AppearanceView(m: ChatModel, showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)) {
-  val appIcon = remember { mutableStateOf(findEnabledIcon()) }
-
-  fun setAppIcon(newIcon: AppIcon) {
-    if (appIcon.value == newIcon) return
-    val newComponent = ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${newIcon.name.lowercase()}")
-    val oldComponent = ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${appIcon.value.name.lowercase()}")
-    SimplexApp.context.packageManager.setComponentEnabledSetting(
-      newComponent,
-      COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP
-    )
-
-    SimplexApp.context.packageManager.setComponentEnabledSetting(
-      oldComponent,
-      PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP
-    )
-
-    appIcon.value = newIcon
-  }
-
-  AppearanceLayout(
-    appIcon,
-    m.controller.appPrefs.appLanguage,
-    m.controller.appPrefs.systemDarkTheme,
-    changeIcon = ::setAppIcon,
-    showSettingsModal = showSettingsModal,
-    editColor = { name, initialColor ->
-      ModalManager.shared.showModalCloseable { close ->
-        ColorEditor(name, initialColor, close)
-      }
-    },
-  )
-}
-
-@Composable fun AppearanceLayout(
-  icon: MutableState<AppIcon>,
-  languagePref: SharedPreference<String?>,
-  systemDarkTheme: SharedPreference<String?>,
-  changeIcon: (AppIcon) -> Unit,
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  editColor: (ThemeColor, Color) -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.appearance_settings))
-    SectionView(stringResource(R.string.settings_section_title_language), padding = PaddingValues()) {
-      val context = LocalContext.current
-//      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-//        SectionItemWithValue(
-//          generalGetString(R.string.settings_section_title_language).lowercase().replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() },
-//          remember { mutableStateOf("system") },
-//          listOf(ValueTitleDesc("system", generalGetString(R.string.change_verb), "")),
-//          onSelected = { openSystemLangPicker(context as? Activity ?: return@SectionItemWithValue) }
-//        )
-//      } else {
-      val state = rememberSaveable { mutableStateOf(languagePref.get() ?: "system") }
-      LangSelector(state) {
-        state.value = it
-        withApi {
-          delay(200)
-          val activity = context as? Activity
-          if (activity != null) {
-            if (it == "system") {
-              saveAppLocale(languagePref, activity)
-            } else {
-              saveAppLocale(languagePref, activity, it)
-            }
-          }
-        }
-      }
-//      }
-    }
-    SectionDividerSpaced()
-
-    SectionView(stringResource(R.string.settings_section_title_icon), padding = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
-      LazyRow {
-        items(AppIcon.values().size, { index -> AppIcon.values()[index] }) { index ->
-          val item = AppIcon.values()[index]
-          val mipmap = ContextCompat.getDrawable(LocalContext.current, item.resId)!!
-          Image(
-            bitmap = mipmap.toBitmap().asImageBitmap(),
-            contentDescription = "",
-            contentScale = ContentScale.Fit,
-            modifier = Modifier
-              .shadow(if (item == icon.value) 1.dp else 0.dp, ambientColor = colors.secondaryVariant)
-              .size(70.dp)
-              .clickable { changeIcon(item) }
-              .padding(10.dp)
-          )
-
-          if (index + 1 != AppIcon.values().size) {
-            Spacer(Modifier.padding(horizontal = 4.dp))
-          }
-        }
-      }
-    }
-
-    SectionDividerSpaced(maxTopPadding = true)
-    val currentTheme by CurrentColors.collectAsState()
-    SectionView(stringResource(R.string.settings_section_title_themes)) {
-      val darkTheme = isSystemInDarkTheme()
-      val state = remember { derivedStateOf { currentTheme.name } }
-      ThemeSelector(state) {
-        ThemeManager.applyTheme(it, darkTheme)
-      }
-      if (state.value == DefaultTheme.SYSTEM.name) {
-        DarkThemeSelector(remember { systemDarkTheme.state }) {
-          ThemeManager.changeDarkTheme(it, darkTheme)
-        }
-      }
-    }
-    SectionItemView(showSettingsModal { _ -> CustomizeThemeView(editColor) }) { Text(stringResource(R.string.customize_theme_title)) }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-fun CustomizeThemeView(editColor: (ThemeColor, Color) -> Unit) {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-  ) {
-    val currentTheme by CurrentColors.collectAsState()
-
-    AppBarTitle(stringResource(R.string.customize_theme_title))
-
-    SectionView(stringResource(R.string.theme_colors_section_title)) {
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.PRIMARY, currentTheme.colors.primary) }) {
-        val title = generalGetString(R.string.color_primary)
-        Text(title)
-        Icon(painterResource(R.drawable.ic_circle_filled), title, tint = colors.primary)
-      }
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.PRIMARY_VARIANT, currentTheme.colors.primaryVariant) }) {
-        val title = generalGetString(R.string.color_primary_variant)
-        Text(title)
-        Icon(painterResource(R.drawable.ic_circle_filled), title, tint = colors.primaryVariant)
-      }
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.SECONDARY, currentTheme.colors.secondary) }) {
-        val title = generalGetString(R.string.color_secondary)
-        Text(title)
-        Icon(painterResource(R.drawable.ic_circle_filled), title, tint = colors.secondary)
-      }
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.SECONDARY_VARIANT, currentTheme.colors.secondaryVariant) }) {
-        val title = generalGetString(R.string.color_secondary_variant)
-        Text(title)
-        Icon(painterResource(R.drawable.ic_circle_filled), title, tint = colors.secondaryVariant)
-      }
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.BACKGROUND, currentTheme.colors.background) }) {
-        val title = generalGetString(R.string.color_background)
-        Text(title)
-        Icon(painterResource(R.drawable.ic_circle_filled), title, tint = colors.background)
-      }
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.SURFACE, currentTheme.colors.surface) }) {
-        val title = generalGetString(R.string.color_surface)
-        Text(title)
-        Icon(painterResource(R.drawable.ic_circle_filled), title, tint = colors.surface)
-      }
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.TITLE, currentTheme.appColors.title) }) {
-        val title = generalGetString(R.string.color_title)
-        Text(title)
-        Icon(painterResource(R.drawable.ic_circle_filled), title, tint = currentTheme.appColors.title)
-      }
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.SENT_MESSAGE, currentTheme.appColors.sentMessage) }) {
-        val title = generalGetString(R.string.color_sent_message)
-        Text(title)
-        Icon(painterResource(R.drawable.ic_circle_filled), title, tint = currentTheme.appColors.sentMessage)
-      }
-      SectionItemViewSpaceBetween({ editColor(ThemeColor.RECEIVED_MESSAGE, currentTheme.appColors.receivedMessage) }) {
-        val title = generalGetString(R.string.color_received_message)
-        Text(title)
-        Icon(painterResource(R.drawable.ic_circle_filled), title, tint = currentTheme.appColors.receivedMessage)
-      }
-    }
-    val isInDarkTheme = isInDarkTheme()
-    if (currentTheme.base.hasChangedAnyColor(currentTheme.colors, currentTheme.appColors)) {
-      SectionItemView({ ThemeManager.resetAllThemeColors(darkForSystemTheme = isInDarkTheme) }) {
-        Text(generalGetString(R.string.reset_color), color = colors.primary)
-      }
-    }
-    SectionSpacer()
-    SectionView {
-      val context = LocalContext.current
-      val theme = remember { mutableStateOf(null as String?) }
-      val exportThemeLauncher = rememberSaveThemeLauncher(context, theme)
-      SectionItemView({
-        val overrides = ThemeManager.currentThemeOverridesForExport(isInDarkTheme)
-        theme.value = yaml.encodeToString<ThemeOverrides>(overrides)
-        exportThemeLauncher.launch("simplex.theme")
-      }) {
-        Text(generalGetString(R.string.export_theme), color = colors.primary)
-      }
-
-      val importThemeLauncher = rememberGetContentLauncher { uri: Uri? ->
-        if (uri != null) {
-          val theme = getThemeFromUri(uri)
-          if (theme != null) {
-            ThemeManager.saveAndApplyThemeOverrides(theme, isInDarkTheme)
-          }
-        }
-      }
-      // Can not limit to YAML mime type since it's unsupported by Android
-      SectionItemView({ importThemeLauncher.launch("*/*") }) {
-        Text(generalGetString(R.string.import_theme), color = colors.primary)
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-fun ColorEditor(
-  name: ThemeColor,
-  initialColor: Color,
-  close: () -> Unit,
-) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-  ) {
-    AppBarTitle(name.text)
-    var currentColor by remember { mutableStateOf(initialColor) }
-    ColorPicker(initialColor) {
-      currentColor = it
-    }
-
-    SectionSpacer()
-    val isInDarkTheme = isInDarkTheme()
-    TextButton(
-      onClick = {
-        ThemeManager.saveAndApplyThemeColor(name, currentColor, isInDarkTheme)
-        close()
-      },
-      Modifier.align(Alignment.CenterHorizontally),
-      colors = ButtonDefaults.textButtonColors(contentColor = currentColor)
-    ) {
-      Text(generalGetString(R.string.save_color))
-    }
-  }
-}
-
-@Composable
-fun ColorPicker(initialColor: Color, onColorChanged: (Color) -> Unit) {
-  ClassicColorPicker(
-    color = initialColor,
-    modifier = Modifier
-      .fillMaxWidth()
-      .height(300.dp),
-    showAlphaBar = true,
-    onColorChanged = { color: HsvColor ->
-      onColorChanged(color.toColor())
-    }
-  )
-}
-
-@Composable
-private fun LangSelector(state: State<String>, onSelected: (String) -> Unit) {
-  // Should be the same as in app/build.gradle's `android.defaultConfig.resConfigs`
-  val supportedLanguages = mapOf(
-    "system" to generalGetString(R.string.language_system),
-    "en" to "English",
-    "cs" to "Čeština",
-    "de" to "Deutsch",
-    "es" to "Español",
-    "fr" to "Français",
-    "it" to "Italiano",
-    "ja" to "日本語",
-    "nl" to "Nederlands",
-    "pl" to "Polski",
-    "pt-BR" to "Português (Brasil)",
-    "ru" to "Русский",
-    "zh-CN" to "简体中文"
-  )
-  val values by remember { mutableStateOf(supportedLanguages.map { it.key to it.value }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.settings_section_title_language).lowercase().replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.US) else it.toString() },
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-@Composable
-private fun ThemeSelector(state: State<String>, onSelected: (String) -> Unit) {
-  val darkTheme = isSystemInDarkTheme()
-  val values by remember { mutableStateOf(ThemeManager.allThemes(darkTheme).map { it.second.name to it.third }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.theme),
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-@Composable
-private fun DarkThemeSelector(state: State<String?>, onSelected: (String) -> Unit) {
-  val values by remember {
-    val darkThemes = ArrayList<Pair<String, String>>()
-    darkThemes.add(DefaultTheme.DARK.name to generalGetString(R.string.theme_dark))
-    darkThemes.add(DefaultTheme.SIMPLEX.name to generalGetString(R.string.theme_simplex))
-    mutableStateOf(darkThemes.toList())
-  }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.dark_theme),
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = { if (it != null) onSelected(it) }
-  )
-}
-
-//private fun openSystemLangPicker(activity: Activity) {
-//  activity.startActivity(Intent(Settings.ACTION_APP_LOCALE_SETTINGS, Uri.parse("package:" + SimplexApp.context.packageName)))
-//}
-
-@Composable
-private fun rememberSaveThemeLauncher(cxt: Context, theme: MutableState<String?>): ManagedActivityResultLauncher<String, Uri?> =
-  rememberLauncherForActivityResult(
-    contract = ActivityResultContracts.CreateDocument(),
-    onResult = { destination ->
-      try {
-        destination?.let {
-          val theme = theme.value
-          if (theme != null) {
-            val contentResolver = cxt.contentResolver
-            contentResolver.openOutputStream(destination)?.let { stream ->
-              BufferedOutputStream(stream).use { outputStream ->
-                theme.byteInputStream().use { it.copyTo(outputStream) }
-              }
-              Toast.makeText(cxt, generalGetString(R.string.file_saved), Toast.LENGTH_SHORT).show()
-            }
-          }
-        }
-      } catch (e: Error) {
-        Toast.makeText(cxt, generalGetString(R.string.error_saving_file), Toast.LENGTH_SHORT).show()
-        Log.e(TAG, "rememberSaveThemeLauncher error saving theme $e")
-      } finally {
-        theme.value = null
-      }
-    }
-  )
-
-private fun findEnabledIcon(): AppIcon = AppIcon.values().first { icon ->
-  SimplexApp.context.packageManager.getComponentEnabledSetting(
-    ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${icon.name.lowercase()}")
-  ).let { it == COMPONENT_ENABLED_STATE_DEFAULT || it == COMPONENT_ENABLED_STATE_ENABLED }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewAppearanceSettings() {
-  SimpleXTheme {
-    AppearanceLayout(
-      icon = remember { mutableStateOf(AppIcon.DARK_BLUE) },
-      languagePref = SharedPreference({ null }, {}),
-      systemDarkTheme = SharedPreference({ null }, {}),
-      changeIcon = {},
-      showSettingsModal = { {} },
-      editColor = { _, _ -> },
-    )
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt

@@ -1,43 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionBottomSpacer
-import SectionTextFooter
-import SectionView
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.views.TerminalView
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun DeveloperView(
-  m: ChatModel,
-  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
-  withAuth: (title: String, desc: String, block: () -> Unit) -> Unit
-) {
-  Column(Modifier.fillMaxWidth().verticalScroll(rememberScrollState())) {
-    val uriHandler = LocalUriHandler.current
-    AppBarTitle(stringResource(R.string.settings_developer_tools))
-    val developerTools = m.controller.appPrefs.developerTools
-    val devTools = remember { developerTools.state }
-    SectionView() {
-      InstallTerminalAppItem(uriHandler)
-      ChatConsoleItem { withAuth(generalGetString(R.string.auth_open_chat_console), generalGetString(R.string.auth_log_in_using_credential), showCustomModal { it, close -> TerminalView(it, close) })}
-      SettingsPreferenceItem(painterResource(R.drawable.ic_drive_folder_upload), stringResource(R.string.confirm_database_upgrades), m.controller.appPrefs.confirmDBUpgrades)
-      SettingsPreferenceItem(painterResource(R.drawable.ic_code), stringResource(R.string.show_developer_options), developerTools)
-    }
-    SectionTextFooter(
-      generalGetString(if (devTools.value) R.string.show_dev_options else R.string.hide_dev_options) + " " +
-        generalGetString(R.string.developer_options)
-    )
-    SectionBottomSpacer()
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/IncognitoView.kt

@@ -1,38 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionBottomSpacer
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.AppBarTitle
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun IncognitoView() {
-  IncognitoLayout()
-}
-
-@Composable
-fun IncognitoLayout() {
-  Column {
-    AppBarTitle(stringResource(R.string.settings_section_title_incognito))
-    Column(
-      Modifier
-        .verticalScroll(rememberScrollState())
-        .padding(horizontal = DEFAULT_PADDING),
-      verticalArrangement = Arrangement.spacedBy(20.dp)
-    ) {
-      Text(generalGetString(R.string.incognito_info_protects))
-      Text(generalGetString(R.string.incognito_info_allows))
-      Text(generalGetString(R.string.incognito_info_share))
-      Text(generalGetString(R.string.incognito_info_find))
-      SectionBottomSpacer()
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NotificationsSettingsView.kt

@@ -1,207 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionBottomSpacer
-import SectionView
-import SectionViewSelectable
-import android.os.Build
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.capitalize
-import androidx.compose.ui.text.intl.Locale
-import androidx.compose.ui.text.style.TextOverflow
-import chat.simplex.app.*
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.*
-import kotlin.collections.ArrayList
-
-enum class NotificationsMode(private val requiresIgnoringBatterySinceSdk: Int) {
-  OFF(Int.MAX_VALUE), PERIODIC(Build.VERSION_CODES.M), SERVICE(Build.VERSION_CODES.S), /*INSTANT(Int.MAX_VALUE) - for Firebase notifications */;
-
-  val requiresIgnoringBattery
-    get() = requiresIgnoringBatterySinceSdk <= Build.VERSION.SDK_INT
-
-  companion object {
-    val default: NotificationsMode = SERVICE
-  }
-}
-
-enum class NotificationPreviewMode {
-  MESSAGE, CONTACT, HIDDEN;
-
-  companion object {
-    val default: NotificationPreviewMode = MESSAGE
-  }
-}
-
-@Composable
-fun NotificationsSettingsView(
-  chatModel: ChatModel,
-) {
-  val onNotificationPreviewModeSelected = { mode: NotificationPreviewMode ->
-    chatModel.controller.appPrefs.notificationPreviewMode.set(mode.name)
-    chatModel.notificationPreviewMode.value = mode
-  }
-
-  NotificationsSettingsLayout(
-    notificationsMode = chatModel.notificationsMode,
-    notificationPreviewMode = chatModel.notificationPreviewMode,
-    showPage = { page ->
-      ModalManager.shared.showModalCloseable(true) {
-          when (page) {
-            CurrentPage.NOTIFICATIONS_MODE -> NotificationsModeView(chatModel.notificationsMode) { changeNotificationsMode(it, chatModel) }
-            CurrentPage.NOTIFICATION_PREVIEW_MODE -> NotificationPreviewView(chatModel.notificationPreviewMode, onNotificationPreviewModeSelected)
-          }
-      }
-    },
-  )
-}
-
-enum class CurrentPage {
-  NOTIFICATIONS_MODE, NOTIFICATION_PREVIEW_MODE
-}
-
-@Composable
-fun NotificationsSettingsLayout(
-  notificationsMode: State<NotificationsMode>,
-  notificationPreviewMode: State<NotificationPreviewMode>,
-  showPage: (CurrentPage) -> Unit,
-) {
-  val modes = remember { notificationModes() }
-  val previewModes = remember { notificationPreviewModes() }
-
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.notifications))
-    SectionView(null) {
-      SettingsActionItemWithContent(null, stringResource(R.string.settings_notifications_mode_title), { showPage(CurrentPage.NOTIFICATIONS_MODE) }) {
-        Text(
-          modes.first { it.value == notificationsMode.value }.title,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis,
-          color = MaterialTheme.colors.secondary
-        )
-      }
-      SettingsActionItemWithContent(null, stringResource(R.string.settings_notification_preview_mode_title), { showPage(CurrentPage.NOTIFICATION_PREVIEW_MODE) }) {
-        Text(
-          previewModes.first { it.value == notificationPreviewMode.value }.title,
-          maxLines = 1,
-          overflow = TextOverflow.Ellipsis,
-          color = MaterialTheme.colors.secondary
-        )
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-fun NotificationsModeView(
-  notificationsMode: State<NotificationsMode>,
-  onNotificationsModeSelected: (NotificationsMode) -> Unit,
-) {
-  val modes = remember { notificationModes() }
-  Column(
-    Modifier.fillMaxWidth(),
-  ) {
-    AppBarTitle(stringResource(R.string.settings_notifications_mode_title).lowercase().capitalize(Locale.current))
-    SectionViewSelectable(null, notificationsMode, modes, onNotificationsModeSelected)
-  }
-}
-
-@Composable
-fun NotificationPreviewView(
-  notificationPreviewMode: State<NotificationPreviewMode>,
-  onNotificationPreviewModeSelected: (NotificationPreviewMode) -> Unit,
-) {
-  val previewModes = remember { notificationPreviewModes() }
-  Column(
-    Modifier.fillMaxWidth(),
-  ) {
-    AppBarTitle(stringResource(R.string.settings_notification_preview_title))
-    SectionViewSelectable(null, notificationPreviewMode, previewModes, onNotificationPreviewModeSelected)
-  }
-}
-
-// mode, name, description
-private fun notificationModes(): List<ValueTitleDesc<NotificationsMode>> {
-  val res = ArrayList<ValueTitleDesc<NotificationsMode>>()
-  res.add(
-    ValueTitleDesc(
-      NotificationsMode.OFF,
-      generalGetString(R.string.notifications_mode_off),
-      generalGetString(R.string.notifications_mode_off_desc),
-    )
-  )
-  res.add(
-    ValueTitleDesc(
-      NotificationsMode.PERIODIC,
-      generalGetString(R.string.notifications_mode_periodic),
-      generalGetString(R.string.notifications_mode_periodic_desc),
-    )
-  )
-  res.add(
-    ValueTitleDesc(
-      NotificationsMode.SERVICE,
-      generalGetString(R.string.notifications_mode_service),
-      generalGetString(R.string.notifications_mode_service_desc),
-    )
-  )
-  return res
-}
-
-// preview mode, name, description
-fun notificationPreviewModes(): List<ValueTitleDesc<NotificationPreviewMode>> {
-  val res = ArrayList<ValueTitleDesc<NotificationPreviewMode>>()
-  res.add(
-    ValueTitleDesc(
-      NotificationPreviewMode.MESSAGE,
-      generalGetString(R.string.notification_preview_mode_message),
-      generalGetString(R.string.notification_preview_mode_message_desc),
-    )
-  )
-  res.add(
-    ValueTitleDesc(
-      NotificationPreviewMode.CONTACT,
-      generalGetString(R.string.notification_preview_mode_contact),
-      generalGetString(R.string.notification_preview_mode_contact_desc),
-    )
-  )
-  res.add(
-    ValueTitleDesc(
-      NotificationPreviewMode.HIDDEN,
-      generalGetString(R.string.notification_preview_mode_hidden),
-      generalGetString(R.string.notification_display_mode_hidden_desc),
-    )
-  )
-  return res
-}
-
-fun changeNotificationsMode(mode: NotificationsMode, chatModel: ChatModel) {
-  chatModel.controller.appPrefs.notificationsMode.set(mode.name)
-  if (mode.requiresIgnoringBattery && !chatModel.controller.isIgnoringBatteryOptimizations(chatModel.controller.appContext)) {
-    chatModel.controller.appPrefs.backgroundServiceNoticeShown.set(false)
-  }
-  chatModel.notificationsMode.value = mode
-  SimplexService.StartReceiver.toggleReceiver(mode == NotificationsMode.SERVICE)
-  CoroutineScope(Dispatchers.Default).launch {
-    if (mode == NotificationsMode.SERVICE)
-      SimplexService.start(SimplexApp.context)
-    else
-      SimplexService.safeStopService(SimplexApp.context)
-  }
-
-  if (mode != NotificationsMode.PERIODIC) {
-    MessagesFetcherWorker.cancelAll()
-  }
-  chatModel.controller.showBackgroundServiceNoticeIfNeeded()
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/PrivacySettings.kt

@@ -1,470 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionItemView
-import SectionTextFooter
-import SectionView
-import android.view.WindowManager
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.fragment.app.FragmentActivity
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.ProfileNameField
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.helpers.DatabaseUtils.ksSelfDestructPassword
-import chat.simplex.app.views.isValidDisplayName
-import chat.simplex.app.views.localauth.SetAppPasscodeView
-import chat.simplex.app.views.onboarding.ReadableText
-
-enum class LAMode {
-  SYSTEM,
-  PASSCODE;
-
-  val text: String
-    get() = when (this) {
-      SYSTEM -> generalGetString(R.string.la_mode_system)
-      PASSCODE -> generalGetString(R.string.la_mode_passcode)
-    }
-}
-
-@Composable
-fun PrivacySettingsView(
-  chatModel: ChatModel,
-  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  setPerformLA: (Boolean, FragmentActivity) -> Unit
-) {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-  ) {
-    val simplexLinkMode = chatModel.controller.appPrefs.simplexLinkMode
-    AppBarTitle(stringResource(R.string.your_privacy))
-    SectionView(stringResource(R.string.settings_section_title_device)) {
-      ChatLockItem(chatModel, showSettingsModal, setPerformLA)
-      val context = LocalContext.current
-      SettingsPreferenceItem(painterResource(R.drawable.ic_visibility_off), stringResource(R.string.protect_app_screen), chatModel.controller.appPrefs.privacyProtectScreen) { on ->
-        if (on) {
-          (context as? FragmentActivity)?.window?.setFlags(
-            WindowManager.LayoutParams.FLAG_SECURE,
-            WindowManager.LayoutParams.FLAG_SECURE
-          )
-        } else {
-          (context as? FragmentActivity)?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        }
-      }
-    }
-    SectionDividerSpaced()
-
-    SectionView(stringResource(R.string.settings_section_title_chats)) {
-      SettingsPreferenceItem(painterResource(R.drawable.ic_image), stringResource(R.string.auto_accept_images), chatModel.controller.appPrefs.privacyAcceptImages)
-      SettingsPreferenceItem(painterResource(R.drawable.ic_travel_explore), stringResource(R.string.send_link_previews), chatModel.controller.appPrefs.privacyLinkPreviews)
-      SimpleXLinkOptions(chatModel.simplexLinkMode, onSelected = {
-        simplexLinkMode.set(it)
-        chatModel.simplexLinkMode.value = it
-      })
-    }
-    if (chatModel.simplexLinkMode.value == SimplexLinkMode.BROWSER) {
-      SectionTextFooter(stringResource(R.string.simplex_link_mode_browser_warning))
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun SimpleXLinkOptions(simplexLinkModeState: State<SimplexLinkMode>, onSelected: (SimplexLinkMode) -> Unit) {
-  val values = remember {
-    SimplexLinkMode.values().map {
-      when (it) {
-        SimplexLinkMode.DESCRIPTION -> it to generalGetString(R.string.simplex_link_mode_description)
-        SimplexLinkMode.FULL -> it to generalGetString(R.string.simplex_link_mode_full)
-        SimplexLinkMode.BROWSER -> it to generalGetString(R.string.simplex_link_mode_browser)
-      }
-    }
-  }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.simplex_link_mode),
-    values,
-    simplexLinkModeState,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-private val laDelays = listOf(10, 30, 60, 180, 0)
-
-@Composable
-fun SimplexLockView(
-  chatModel: ChatModel,
-  currentLAMode: SharedPreference<LAMode>,
-  setPerformLA: (Boolean, FragmentActivity) -> Unit
-) {
-  val performLA = remember { chatModel.performLA }
-  val laMode = remember { chatModel.controller.appPrefs.laMode.state }
-  val laLockDelay = remember { chatModel.controller.appPrefs.laLockDelay }
-  val showChangePasscode = remember { derivedStateOf { performLA.value && currentLAMode.state.value == LAMode.PASSCODE } }
-  val activity = LocalContext.current as FragmentActivity
-  val selfDestructPref = remember { chatModel.controller.appPrefs.selfDestruct }
-  val selfDestructDisplayName = remember { mutableStateOf(chatModel.controller.appPrefs.selfDestructDisplayName.get() ?: "") }
-  val selfDestructDisplayNamePref = remember { chatModel.controller.appPrefs.selfDestructDisplayName }
-
-  fun resetLAEnabled(onOff: Boolean) {
-    chatModel.controller.appPrefs.performLA.set(onOff)
-    chatModel.performLA.value = onOff
-  }
-
-  fun disableUnavailableLA() {
-    resetLAEnabled(false)
-    currentLAMode.set(LAMode.SYSTEM)
-    laUnavailableInstructionAlert()
-  }
-
-  fun resetSelfDestruct() {
-    selfDestructPref.set(false)
-    ksSelfDestructPassword.remove()
-  }
-
-  fun toggleLAMode(toLAMode: LAMode) {
-    authenticate(
-      if (toLAMode == LAMode.SYSTEM) {
-        generalGetString(R.string.la_enter_app_passcode)
-      } else {
-        generalGetString(R.string.chat_lock)
-      },
-      generalGetString(R.string.change_lock_mode), activity = activity
-    ) { laResult ->
-      when (laResult) {
-        is LAResult.Error -> {
-          laFailedAlert()
-        }
-        is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-        LAResult.Success -> {
-          when (toLAMode) {
-            LAMode.SYSTEM -> {
-              authenticate(generalGetString(R.string.auth_enable_simplex_lock), promptSubtitle = "", activity = activity, usingLAMode = toLAMode) { laResult ->
-                when (laResult) {
-                  LAResult.Success -> {
-                    currentLAMode.set(toLAMode)
-                    ksAppPassword.remove()
-                    resetSelfDestruct()
-                    laTurnedOnAlert()
-                  }
-                  is LAResult.Unavailable, is LAResult.Error -> laFailedAlert()
-                  is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-                }
-              }
-            }
-            LAMode.PASSCODE -> {
-              ModalManager.shared.showCustomModal { close ->
-                Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-                  SetAppPasscodeView(
-                    submit = {
-                      laLockDelay.set(30)
-                      currentLAMode.set(toLAMode)
-                      passcodeAlert(generalGetString(R.string.passcode_set))
-                    },
-                    cancel = {},
-                    close = close
-                  )
-                }
-              }
-            }
-          }
-        }
-        is LAResult.Unavailable -> disableUnavailableLA()
-      }
-    }
-  }
-
-  fun toggleSelfDestruct(selfDestruct: SharedPreference<Boolean>) {
-    authenticate(generalGetString(R.string.la_current_app_passcode), generalGetString(R.string.change_self_destruct_mode), activity = activity) { laResult ->
-      when (laResult) {
-        is LAResult.Error -> laFailedAlert()
-        is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-        LAResult.Success -> {
-          if (!selfDestruct.get()) {
-            ModalManager.shared.showCustomModal { close ->
-              EnableSelfDestruct(selfDestruct, close)
-            }
-          } else {
-            resetSelfDestruct()
-          }
-        }
-        is LAResult.Unavailable -> disableUnavailableLA()
-      }
-    }
-  }
-
-  fun changeLAPassword() {
-    authenticate(generalGetString(R.string.la_current_app_passcode), generalGetString(R.string.la_change_app_passcode), activity = activity) { laResult ->
-      when (laResult) {
-        LAResult.Success -> {
-          ModalManager.shared.showCustomModal { close ->
-            Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-              SetAppPasscodeView(
-                submit = {
-                  passcodeAlert(generalGetString(R.string.passcode_changed))
-                }, cancel = {
-                  passcodeAlert(generalGetString(R.string.passcode_not_changed))
-                }, close = close
-              )
-            }
-          }
-        }
-        is LAResult.Error -> laFailedAlert()
-        is LAResult.Failed -> {}
-        is LAResult.Unavailable -> disableUnavailableLA()
-      }
-    }
-  }
-
-  fun changeSelfDestructPassword() {
-    authenticate(generalGetString(R.string.la_current_app_passcode), generalGetString(R.string.change_self_destruct_passcode), activity = activity) { laResult ->
-      when (laResult) {
-        LAResult.Success -> {
-          ModalManager.shared.showCustomModal { close ->
-            Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-              SetAppPasscodeView(
-                passcodeKeychain = ksSelfDestructPassword,
-                submit = {
-                  selfDestructPasscodeAlert(generalGetString(R.string.self_destruct_passcode_changed))
-                }, cancel = {
-                  passcodeAlert(generalGetString(R.string.passcode_not_changed))
-                },
-                close = close
-              )
-            }
-          }
-        }
-        is LAResult.Error -> laFailedAlert()
-        is LAResult.Failed -> {}
-        is LAResult.Unavailable -> disableUnavailableLA()
-      }
-    }
-  }
-
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.chat_lock))
-    SectionView {
-      EnableLock(performLA) { performLAToggle ->
-        performLA.value = performLAToggle
-        chatModel.controller.appPrefs.laNoticeShown.set(true)
-        if (performLAToggle) {
-          when (currentLAMode.state.value) {
-            LAMode.SYSTEM -> {
-              setPerformLA(true, activity)
-            }
-            LAMode.PASSCODE -> {
-              ModalManager.shared.showCustomModal { close ->
-                Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-                  SetAppPasscodeView(
-                    submit = {
-                      laLockDelay.set(30)
-                      chatModel.controller.appPrefs.performLA.set(true)
-                      passcodeAlert(generalGetString(R.string.passcode_set))
-                    },
-                    cancel = {
-                      resetLAEnabled(false)
-                    },
-                    close = close
-                  )
-                }
-              }
-            }
-          }
-        } else {
-          setPerformLA(false, activity)
-        }
-      }
-      LockModeSelector(laMode) { newLAMode ->
-        if (laMode.value == newLAMode) return@LockModeSelector
-        if (chatModel.controller.appPrefs.performLA.get()) {
-          toggleLAMode(newLAMode)
-        } else {
-          currentLAMode.set(newLAMode)
-        }
-      }
-
-      if (performLA.value) {
-        LockDelaySelector(remember { laLockDelay.state }) { laLockDelay.set(it) }
-        if (showChangePasscode.value && laMode.value == LAMode.PASSCODE) {
-          SectionItemView({ changeLAPassword() }) {
-            Text(
-              generalGetString(R.string.la_change_app_passcode),
-              color = MaterialTheme.colors.primary
-            )
-          }
-        }
-      }
-      if (performLA.value && laMode.value == LAMode.PASSCODE) {
-        SectionDividerSpaced()
-        SectionView(stringResource(R.string.self_destruct_passcode).uppercase()) {
-          val openInfo = {
-            ModalManager.shared.showModal {
-              SelfDestructInfoView()
-            }
-          }
-          SettingsActionItemWithContent(null, null, click = openInfo) {
-            SharedPreferenceToggleWithIcon(
-              stringResource(R.string.enable_self_destruct),
-              painterResource(R.drawable.ic_info),
-              openInfo,
-              remember { selfDestructPref.state }.value
-            ) {
-              toggleSelfDestruct(selfDestructPref)
-            }
-          }
-
-          if (remember { selfDestructPref.state }.value) {
-            Column(Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF)) {
-              Text(
-                stringResource(R.string.self_destruct_new_display_name),
-                fontSize = 16.sp,
-                modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
-              )
-              ProfileNameField(selfDestructDisplayName, "", ::isValidDisplayName)
-              LaunchedEffect(selfDestructDisplayName.value) {
-                val new = selfDestructDisplayName.value
-                if (isValidDisplayName(new) && selfDestructDisplayNamePref.get() != new) {
-                  selfDestructDisplayNamePref.set(new)
-                }
-              }
-            }
-            SectionItemView({ changeSelfDestructPassword() }) {
-              Text(
-                stringResource(R.string.change_self_destruct_passcode),
-                color = MaterialTheme.colors.primary
-              )
-            }
-          }
-        }
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun SelfDestructInfoView() {
-  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(horizontal = DEFAULT_PADDING),
-  ) {
-    AppBarTitle(stringResource(R.string.self_destruct), withPadding = false)
-    ReadableText(stringResource(R.string.if_you_enter_self_destruct_code))
-    Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
-      TextListItem("1.", stringResource(R.string.all_app_data_will_be_cleared))
-      TextListItem("2.", stringResource(R.string.app_passcode_replaced_with_self_destruct))
-      TextListItem("3.", stringResource(R.string.empty_chat_profile_is_created))
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun EnableSelfDestruct(
-  selfDestruct: SharedPreference<Boolean>,
-  close: () -> Unit
-) {
-  Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-    SetAppPasscodeView(
-      passcodeKeychain = ksSelfDestructPassword, title = generalGetString(R.string.set_passcode), reason = generalGetString(R.string.enabled_self_destruct_passcode),
-      submit = {
-        selfDestruct.set(true)
-        selfDestructPasscodeAlert(generalGetString(R.string.self_destruct_passcode_enabled))
-      },
-      cancel = {},
-      close = close
-    )
-  }
-}
-
-@Composable
-private fun EnableLock(performLA: MutableState<Boolean>, onCheckedChange: (Boolean) -> Unit) {
-  SectionItemView {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Text(
-        stringResource(R.string.enable_lock), Modifier
-          .padding(end = 24.dp)
-          .fillMaxWidth()
-          .weight(1F)
-      )
-      DefaultSwitch(
-        checked = performLA.value,
-        onCheckedChange = onCheckedChange,
-      )
-    }
-  }
-}
-
-@Composable
-private fun LockModeSelector(state: State<LAMode>, onSelected: (LAMode) -> Unit) {
-  val values by remember { mutableStateOf(LAMode.values().map { it to it.text }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.lock_mode),
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-@Composable
-private fun LockDelaySelector(state: State<Int>, onSelected: (Int) -> Unit) {
-  val delays = remember { if (laDelays.contains(state.value)) laDelays else listOf(state.value) + laDelays }
-  val values by remember { mutableStateOf(delays.map { it to laDelayText(it) }) }
-  ExposedDropDownSettingRow(
-    generalGetString(R.string.lock_after),
-    values,
-    state,
-    icon = null,
-    enabled = remember { mutableStateOf(true) },
-    onSelected = onSelected
-  )
-}
-
-@Composable
-private fun TextListItem(n: String, text: String) {
-  Box {
-    Text(n)
-    Text(text, Modifier.padding(start = 20.dp))
-  }
-}
-
-private fun laDelayText(t: Int): String {
-  val m = t / 60
-  val s = t % 60
-  return if (t == 0) {
-    generalGetString(R.string.la_immediately)
-  } else if (m == 0 || s != 0) {
-    // there are no options where both minutes and seconds are needed
-    generalGetString(R.string.la_seconds).format(s)
-  } else {
-    generalGetString(R.string.la_minutes).format(m)
-  }
-}
-
-private fun passcodeAlert(title: String) {
-  AlertManager.shared.showAlertMsg(
-    title = title,
-    text = generalGetString(R.string.la_please_remember_to_store_password)
-  )
-}
-
-private fun selfDestructPasscodeAlert(title: String) {
-  AlertManager.shared.showAlertMsg(title, generalGetString(R.string.if_you_enter_passcode_data_removed))
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ScanProtocolServer.kt

@@ -1,54 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.Manifest
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
-import chat.simplex.app.model.ServerAddress.Companion.parseServerAddress
-import chat.simplex.app.model.ServerCfg
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCodeScanner
-import com.google.accompanist.permissions.rememberPermissionState
-
-@Composable
-fun ScanProtocolServer(onNext: (ServerCfg) -> Unit) {
-  val cameraPermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
-  LaunchedEffect(Unit) {
-    cameraPermissionState.launchPermissionRequest()
-  }
-  ScanProtocolServerLayout(onNext)
-}
-
-@Composable
-private fun ScanProtocolServerLayout(onNext: (ServerCfg) -> Unit) {
-  Column(
-    Modifier
-      .fillMaxSize()
-      .padding(horizontal = DEFAULT_PADDING)
-  ) {
-    AppBarTitle(stringResource(R.string.smp_servers_scan_qr), false)
-    Box(
-      Modifier
-        .fillMaxWidth()
-        .aspectRatio(ratio = 1F)
-        .padding(bottom = 12.dp)
-    ) {
-      QRCodeScanner { text ->
-        val res = parseServerAddress(text)
-        if (res != null) {
-          onNext(ServerCfg(text, false, null, true))
-        } else {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(R.string.smp_servers_invalid_address),
-            text = generalGetString(R.string.smp_servers_check_address)
-          )
-        }
-      }
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressLearnMore.kt

@@ -1,24 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.R
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.onboarding.ReadableText
-import chat.simplex.app.views.onboarding.ReadableTextWithLink
-
-@Composable
-fun UserAddressLearnMore() {
-  Column(
-    Modifier.verticalScroll(rememberScrollState()),
-  ) {
-    AppBarTitle(stringResource(R.string.simplex_address))
-    ReadableText(R.string.you_can_share_your_address)
-    ReadableText(R.string.you_wont_lose_your_contacts_if_delete_address)
-    ReadableText(R.string.you_can_accept_or_reject_connection)
-    ReadableTextWithLink(R.string.read_more_in_user_guide_with_link, "https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address")
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/VersionInfoView.kt

@@ -1,28 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import chat.simplex.app.BuildConfig
-import chat.simplex.app.R
-import chat.simplex.app.model.CoreVersionInfo
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.helpers.AppBarTitle
-
-@Composable
-fun VersionInfoView(info: CoreVersionInfo) {
-  Column(
-    Modifier.padding(horizontal = DEFAULT_PADDING),
-  ) {
-    AppBarTitle(stringResource(R.string.app_version_title), false)
-    Text(String.format(stringResource(R.string.app_version_name), BuildConfig.VERSION_NAME))
-    Text(String.format(stringResource(R.string.app_version_code), BuildConfig.VERSION_CODE))
-    Text(String.format(stringResource(R.string.core_version), info.version))
-    val simplexmqCommit = if (info.simplexmqCommit.length >= 7) info.simplexmqCommit.substring(startIndex = 0, endIndex = 7) else info.simplexmqCommit
-    Text(String.format(stringResource(R.string.core_simplexmq_version), info.simplexmqVersion, simplexmqCommit))
-  }
-}

apps/android/app/src/main/res/drawable/ic_account_circle_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M224.89,704.5Q288,665 348.25,645T480,625q71.5,0 132,20t124.5,59.5Q781,650 799.25,595.35q18.25,-54.65 18.25,-115.25 0,-144.1 -96.75,-240.85T480,142.5q-144,0 -240.75,96.75T142.5,480.1q0,60.6 18.75,115.25Q180,650 224.89,704.5ZM479.87,509q-57.37,0 -96.62,-39.38 -39.25,-39.38 -39.25,-96.75 0,-57.37 39.38,-96.62 39.38,-39.25 96.75,-39.25 57.37,0 96.62,39.38 39.25,39.38 39.25,96.75 0,57.37 -39.38,96.62 -39.38,39.25 -96.75,39.25ZM479.6,875q-81.55,0 -154.09,-31.26 -72.54,-31.26 -125.77,-85Q146.5,705 115.75,633.14 85,561.27 85,479.56q0,-81.79 31.26,-153.79 31.26,-72 85,-125.39Q255,147 326.86,116q71.86,-31 153.57,-31 81.79,0 153.79,31.13 72,31.13 125.39,84.5Q813,254 844,326.02q31,72.02 31,153.65 0,81.71 -31.01,153.63 -31.01,71.93 -84.5,125.56Q706,812.5 633.83,843.75 561.66,875 479.6,875Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_add.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M479.83,756q-12.32,0 -20.33,-8.38t-8,-20.63L451.5,508.5h-219q-12.25,0 -20.38,-8.53T204,479.58q0,-11.86 8.13,-20.22Q220.25,451 232.5,451h219L451.5,232q0,-11.68 8.18,-20.09 8.18,-8.41 20.5,-8.41 12.32,0 20.58,8.41Q509,220.33 509,232v219h218.5q12.25,0 20.63,8.46t8.38,20.21q0,12.32 -8.38,20.58T727.5,508.5L509,508.5L509,727q0,12.25 -8.43,20.63 -8.43,8.38 -20.75,8.38Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_add_link.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M281,677.5q-84,0 -140.25,-56.53 -56.25,-56.53 -56.25,-140Q84.5,397.5 140.75,341 197,284.5 281,284.5h139q12.25,0 20.63,8.46T449,313.17q0,12.32 -8.38,20.58T420,342L281,342q-60,0 -99.5,39.5T142,481q0,60 39.5,99.5T281,620h139q12.25,0 20.63,8.46T449,648.67q0,12.32 -8.38,20.58T420,677.5L281,677.5ZM354.5,509.5q-12.25,0 -20.38,-8.53T326,480.58q0,-11.86 8.13,-20.22Q342.25,452 354.5,452h248q12.25,0 20.63,8.46t8.38,20.21q0,12.32 -8.38,20.58T602.5,509.5h-248ZM875,480.5h-57.5q0,-60 -39.79,-99.5 -39.79,-39.5 -99.21,-39.5L539,341.5q-12.25,0 -20.38,-8.53t-8.13,-20.39q0,-11.86 8.13,-20.22Q526.75,284 539,284h139.5q83.45,0 139.98,56.52Q875,397.05 875,480.5ZM726.83,797q-12.32,0 -20.33,-8.38t-8,-20.63v-90L608,678q-12.25,0 -20.38,-8.53t-8.13,-20.39q0,-11.86 8.13,-20.22Q595.75,620.5 608,620.5h90.5L698.5,530q0,-11.68 8.18,-20.09 8.18,-8.41 20.5,-8.41 12.32,0 20.58,8.41Q756,518.33 756,530v90.5h90q12.25,0 20.63,8.46T875,649.17q0,12.32 -8.38,20.58T846,678h-90v90q0,12.25 -8.43,20.63 -8.43,8.38 -20.75,8.38Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_add_photo.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M181.5,835q-22.97,0 -40.23,-17.27Q124,800.47 124,777.5L124,182q0,-22.97 17.27,-40.23Q158.53,124.5 181.5,124.5L561,124.5q12.25,0 20.63,8.46T590,153.18q0,12.32 -8.38,20.58T561,182L181.5,182v595.5L777,777.5L777,399q0,-12.25 8.43,-20.63 8.43,-8.38 20.5,-8.38 12.07,0 20.33,8.38T834.5,399v378.5q0,22.97 -17.27,40.23Q799.97,835 777,835L181.5,835ZM727.83,341.5q-12.32,0 -20.58,-8.38T699,312.5L699,261h-51.5q-12.25,0 -20.63,-8.43 -8.38,-8.43 -8.38,-20.5 0,-12.07 8.38,-20.33t20.63,-8.25L699,203.5v-52q0,-11.68 8.43,-20.09 8.43,-8.41 20.5,-8.41 12.07,0 20.33,8.41 8.25,8.41 8.25,20.09v52h52q11.68,0 20.09,8.46Q837,220.43 837,232.17q0,12.32 -8.41,20.58Q820.17,261 808.5,261h-52v51.5q0,12.25 -8.46,20.63t-20.21,8.38ZM273,676.5h413.17q9.82,0 13.82,-7.75T698,653L585.58,503.6q-4.7,-6.1 -11.46,-6.1 -6.76,0 -11.61,6L448,653.5l-81.46,-106.39q-4.69,-5.61 -11.5,-5.61 -6.81,0 -11.72,5.58L261.57,653.02q-5.07,7.98 -0.95,15.73T273,676.5ZM181.5,399v378.5L181.5,182v217Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_add_reaction.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M480.33,875Q398.63,875 326.7,843.74Q254.78,812.47 201.14,758.74Q147.5,705 116.25,633.21Q85,561.42 85,479.8Q85,398.09 116.36,325.93Q147.73,253.78 201.13,200.39Q254.54,147 326.79,116Q399.04,85 479.92,85Q526.76,85 570.69,95.51Q614.62,106.03 654,125Q650.5,133.5 649.25,142.08Q648,150.67 648,160Q648,167.9 648.75,174.95Q649.5,182 652,189Q614,166.5 570.93,154.5Q527.86,142.5 479.9,142.5Q339.69,142.5 241.09,240.75Q142.5,339 142.5,479.51Q142.5,620.03 241.24,718.76Q339.97,817.5 480.49,817.5Q621,817.5 719.25,718.91Q817.5,620.31 817.5,480Q817.5,441.47 809.25,404.99Q801,368.5 786,336Q796.96,343.76 810.93,347.88Q824.9,352 840,352Q843.36,352 846.75,352Q850.14,352 853.5,351.5Q864,382 869.5,413.93Q875,445.87 875,479.82Q875,560.91 843.99,633.3Q812.97,705.68 759.49,758.99Q706,812.3 633.98,843.65Q561.95,875 480.33,875ZM624.45,426.5Q647.4,426.5 662.45,411.5Q677.5,396.49 677.5,373.55Q677.5,350.6 662.5,335.55Q647.49,320.5 624.55,320.5Q601.6,320.5 586.55,335.5Q571.5,350.51 571.5,373.45Q571.5,396.4 586.5,411.45Q601.51,426.5 624.45,426.5ZM335.45,426.5Q358.4,426.5 373.45,411.5Q388.5,396.49 388.5,373.55Q388.5,350.6 373.5,335.55Q358.49,320.5 335.55,320.5Q312.6,320.5 297.55,335.5Q282.5,350.51 282.5,373.45Q282.5,396.4 297.5,411.45Q312.51,426.5 335.45,426.5ZM480,696Q544.5,696 599.25,661.5Q654,627 679,566.5L281,566.5Q307,627 361.25,661.5Q415.5,696 480,696ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM811.5,188.5L760,188.5Q747.75,188.5 739.63,180.33Q731.5,172.15 731.5,159.82Q731.5,147.5 739.63,139.25Q747.75,131 760,131L811.5,131L811.5,80Q811.5,67.75 819.67,59.38Q827.85,51 840.17,51Q852.5,51 860.75,59.38Q869,67.75 869,80L869,131L920,131Q932.25,131 940.63,139.43Q949,147.85 949,160.17Q949,172.5 940.63,180.5Q932.25,188.5 920,188.5L869,188.5L869,240Q869,252.25 860.58,260.38Q852.15,268.5 839.83,268.5Q827.5,268.5 819.5,260.38Q811.5,252.25 811.5,240L811.5,188.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_add_reaction_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M811.5,188.5L760,188.5Q748.5,188.5 740,180.33Q731.5,172.15 731.5,159.82Q731.5,147.5 739.63,139.25Q747.75,131 760,131L811.5,131L811.5,80Q811.5,67.75 819.67,59.38Q827.85,51 840.17,51Q852.5,51 860.75,59.38Q869,67.75 869,80L869,131L920,131Q932.25,131 940.63,139.43Q949,147.85 949,160.17Q949,172.5 940.63,180.5Q932.25,188.5 920,188.5L869,188.5L869,240Q869,251.5 860.58,260Q852.15,268.5 839.83,268.5Q827.5,268.5 819.5,260.38Q811.5,252.25 811.5,240L811.5,188.5ZM480.33,875Q398.63,875 326.7,843.74Q254.78,812.47 201.14,758.74Q147.5,705 116.25,633.21Q85,561.42 85,479.8Q85,398.09 116.36,325.93Q147.73,253.78 201.13,200.39Q254.54,147 326.79,116Q399.04,85 479.92,85Q526.76,85 570.69,95.51Q614.62,106.03 654,125Q650.5,133.5 649.25,142.08Q648,150.67 648,159.57Q648,198 671.44,228.46Q694.88,258.93 732.5,267.5Q741.57,305.17 772.03,328.58Q802.48,352 840.28,352Q843.36,352 846.75,352Q850.14,352 853.5,351.5Q864,382 869.5,413.93Q875,445.87 875,479.82Q875,560.91 843.99,633.3Q812.97,705.68 759.49,758.99Q706,812.3 633.98,843.65Q561.95,875 480.33,875ZM624.45,426.5Q647.4,426.5 662.45,411.5Q677.5,396.49 677.5,373.55Q677.5,350.6 662.5,335.55Q647.49,320.5 624.55,320.5Q601.6,320.5 586.55,335.5Q571.5,350.51 571.5,373.45Q571.5,396.4 586.5,411.45Q601.51,426.5 624.45,426.5ZM335.45,426.5Q358.4,426.5 373.45,411.5Q388.5,396.49 388.5,373.55Q388.5,350.6 373.5,335.55Q358.49,320.5 335.55,320.5Q312.6,320.5 297.55,335.5Q282.5,350.51 282.5,373.45Q282.5,396.4 297.5,411.45Q312.51,426.5 335.45,426.5ZM480,696Q544.5,696 599.25,661.5Q654,627 679,566.5L281,566.5Q307,627 361.25,661.5Q415.5,696 480,696Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_all_inclusive.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M214.1,697Q125.5,697 65.25,632.42 5,567.85 5,478.18q0,-89.09 60.75,-152.38Q126.51,262.5 214.07,262.5q36.08,0 69.25,11.63T342.5,311l94.5,90.5 -40,40.5 -90.5,-88q-18.5,-18.5 -42.52,-26.25T214,320q-64.21,0 -107.85,46.5Q62.5,413 62.5,478.15q0,65.73 43.25,113.54Q148.99,639.5 214,639.5q25,0 48.75,-8 23.75,-8 42.75,-25l313.44,-295.43Q644.5,286 677.61,274.25q33.11,-11.75 67.68,-11.75 88.94,0 149.57,63.26Q955.5,389.01 955.5,477.53q0,89.94 -60.76,154.71Q833.99,697 745.43,697q-35.08,0 -68.75,-11.13T618,649.5l-92,-91 40,-40 88,88q17.5,17.5 41.75,25.25t49.82,7.75q65.18,0 108.81,-48Q898,543.5 898,477.34q0,-64.75 -44.35,-111.04Q809.3,320 745.52,320q-24.92,0 -48.72,8.75Q673,337.5 655,355L341.56,650.43Q315.5,674.5 282.02,685.75 248.54,697 214.1,697Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_arrow_back_ios_new.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M626,848.5 L277.5,500q-4.5,-4.79 -6.5,-9.55 -2,-4.76 -2,-10.49 0,-5.73 2,-10.49 2,-4.76 6.5,-9.47l348.9,-348.9q10.6,-10.6 26.6,-10.6t27,10.5q11,11.55 11,27.68 0,16.14 -11.07,27.39L366,480l313.95,313.95Q692.5,806.5 691.5,821.75q-1,15.25 -11.5,25.75 -11.5,11.5 -27.41,11.75 -15.91,0.25 -26.59,-10.75Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_arrow_downward.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M479.96,785q-4.8,0 -10.23,-2.05Q464.3,780.91 460,776L184,500q-8.5,-8.4 -8.5,-19.95 0,-11.55 8.5,-20.05t20.34,-8.5q11.84,0 20.19,8.5L451.5,686.5v-494q0,-12.01 8.46,-20.51 8.46,-8.49 20.21,-8.49 12.32,0 20.58,8.38T509,192.5v494l227,-227q8.18,-8 19.84,-8T776,459.84q8.5,8.34 8.5,20t-8.59,20.25L500,776q-4.58,5 -9.5,7 -4.92,2 -10.54,2Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_arrow_forward_ios.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M278.5,845.45q-11,-11.05 -11.25,-26.5Q267,803.5 278.5,792l314,-314 -314,-314q-11,-11 -11.25,-26.5t11.22,-27q10.47,-11.5 26.25,-12t27.28,11L681,458q4.5,4.79 6.5,9.55 2,4.76 2,10.49 0,5.73 -2,10.49 -2,4.76 -6.5,9.47L332,846.5q-11.01,11 -26.75,10.75Q289.5,857 278.5,845.45Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_arrow_upward.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M479.83,796q-12.32,0 -20.33,-8.13t-8,-20.38L451.5,273l-227,227q-8.83,9 -20.42,9 -11.58,0 -20.08,-8.85 -8.5,-8.85 -8.5,-20.41 0,-11.56 8.5,-20.23l275.96,-275.96q4.43,-4.68 9.89,-6.61Q475.31,175 480.58,175q5.26,0 10.09,2 4.83,2 9.33,6.5l276,276q8.5,8.67 8.5,20.23 0,11.56 -8.34,20.41 -8.34,8.85 -20,8.85T736,500L509,273v494.5q0,12.25 -8.43,20.38 -8.43,8.13 -20.75,8.13Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_article.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M308.5,678L522,678q11.68,0 20.09,-8.43 8.41,-8.43 8.41,-20.5 0,-12.07 -8.41,-20.33 -8.41,-8.25 -20.09,-8.25L308.5,620.5q-12.25,0 -20.63,8.46t-8.38,20.21q0,12.32 8.38,20.58T308.5,678ZM308.5,508.5L652,508.5q11.68,0 20.09,-8.43 8.41,-8.43 8.41,-20.5 0,-12.07 -8.41,-20.33Q663.67,451 652,451L308.5,451q-12.25,0 -20.63,8.46t-8.38,20.21q0,12.32 8.38,20.58t20.63,8.25ZM308.5,339L652,339q11.68,0 20.09,-8.43 8.41,-8.43 8.41,-20.5 0,-12.07 -8.41,-20.33 -8.41,-8.25 -20.09,-8.25L308.5,281.5q-12.25,0 -20.63,8.46t-8.38,20.21q0,12.32 8.38,20.58T308.5,339ZM182,835.5q-22.97,0 -40.23,-17.27Q124.5,800.97 124.5,778L124.5,182q0,-22.97 17.27,-40.23Q159.03,124.5 182,124.5h596q22.97,0 40.23,17.27Q835.5,159.03 835.5,182v596q0,22.97 -17.27,40.23Q800.97,835.5 778,835.5L182,835.5ZM182,778h596L778,182L182,182v596ZM182,778L182,182v596Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_attach_file_filled_500.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M460.08,886.2q-93.45,0 -159.61,-64.46t-66.16,-156.99L234.3,230.2q0,-66.2 46.63,-112.38 46.63,-46.19 112.89,-46.19 67.06,0 113.39,46.44 46.34,46.44 46.34,113.17v396.42q0,39.17 -27.09,66.82 -27.09,27.66 -66.74,27.66 -39.65,0 -66.47,-29.29 -26.83,-29.29 -26.83,-70.28L366.43,250q0,-8.81 6.41,-15.22 6.41,-6.41 15.47,-6.41 8.95,0 15.53,6.41 6.59,6.41 6.59,15.22v375.64q0,21.92 14.35,37.33 14.34,15.41 35.24,15.41 20.9,0 35.22,-14.91 14.32,-14.91 14.32,-35.86L509.57,230.47q0,-48.1 -33.8,-81.35 -33.79,-33.25 -81.75,-33.25 -47.95,0 -81.95,33.12 -34,33.12 -34,81.3v436.34q0,74.07 53.64,124.94 53.64,50.86 128.33,50.86 75.68,0 128.79,-51.63 53.11,-51.63 53.11,-126.44L641.93,250q0,-8.81 6.41,-15.22 6.41,-6.41 15.42,-6.41t15.59,6.41q6.58,6.41 6.58,15.22v413.5q0,92.77 -66.2,157.73 -66.2,64.96 -159.65,64.96Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_backspace.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M428,610.25q9,8.75 20.75,8.75t20.72,-8.94L559.25,520.5l90.78,90.56Q659,620 670.25,620t20.25,-8.75q9,-8.75 9,-20.75t-8.94,-20.94L600,480l89.56,-90.06Q698.5,381.5 698.5,370q0,-11.5 -9,-20.25T668.75,341q-11.75,0 -20.69,8.44L559.5,439.5l-91.06,-91.06Q459.5,340 448.25,340.5 437,341 428,349t-9,20.25q0,12.25 8.94,20.69L519,480l-91,89.56q-8,8.94 -8,20.9 0,11.97 8,19.78ZM362.19,756q-22.19,0 -40.31,-11.5Q303.76,733 291.5,715L148.13,513.33Q137,499.5 137,480.63T148,446l143.5,-201q12.33,-18 30.39,-29.5Q339.94,204 362,204h416q23.72,0 40.61,16.89Q835.5,237.78 835.5,261.5v437q0,23.72 -16.89,40.61Q801.72,756 778,756L362.19,756ZM197,480l152.95,218.5L778,698.5v-437L350,261.5L197,480ZM778,480L778,261.5v437L778,480Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_backup.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M251.5,795.5q-84.55,0 -145.53,-60.94Q45,673.63 45,588.25 45,512 94.25,453.5q49.25,-58.5 126.25,-70 18.82,-95.89 92.11,-156.95Q385.9,165.5 482,165.5q111.66,0 186.83,80.41Q744,326.33 744,438v26q71.5,-3 121.25,44.75T915,629.39q0,67.79 -49.13,116.95Q816.75,795.5 749.5,795.5L509,795.5q-22.97,0 -40.23,-17.27Q451.5,760.97 451.5,738L451.5,479.5l-63.5,63q-9,9 -20.25,8.5T348,541.5q-9,-8.5 -9,-20.25t9,-20.75l111.97,-112.47q4.61,-4.53 9.6,-6.78 4.99,-2.25 10.7,-2.25 5.71,0 10.47,2.25 4.76,2.25 9.28,6.78l113.43,113.43Q622,510 622,521.5q0,11.5 -8.5,20 -9.11,9 -20.81,9 -11.69,0 -20.19,-9l-63.5,-62L509,738h240.5q43.87,0 75.93,-31.65Q857.5,674.71 857.5,629.75q0,-44.75 -31.82,-76.42 -31.82,-31.67 -76.56,-31.67L686.5,521.66L686.5,438.5q0,-88.38 -60.04,-151.94Q566.43,223 478.09,223q-88.34,0 -148.89,63.56 -60.55,63.56 -60.55,151.94h-19.02q-61.63,0 -104.38,43T102.5,588q0,61.5 43.68,105.75Q189.86,738 251.5,738L365,738q12.25,0 20.63,8.46T394,766.67q0,12.32 -8.38,20.58T365,795.5L251.5,795.5ZM480,508.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_battery_2_bar.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M313.5,868.5q-12.48,0 -20.49,-8.01Q285,852.47 285,840L285,183.5q0,-12.48 8.01,-20.49Q301.02,155 313.5,155L402,155v-35q0,-12.48 8.01,-20.49 8.01,-8.01 20.49,-8.01L530,91.5q11.98,0 20.24,8.01Q558.5,107.52 558.5,120v35L647,155q11.98,0 20.24,8.01 8.26,8.01 8.26,20.49L675.5,840q0,12.48 -8.26,20.49Q658.97,868.5 647,868.5L313.5,868.5ZM342.5,640L618,640L618,212.5L342.5,212.5L342.5,640Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_battery_3_bar.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M313.5,868.5q-12.48,0 -20.49,-8.01Q285,852.47 285,840L285,183.5q0,-12.48 8.01,-20.49Q301.02,155 313.5,155L402,155v-35q0,-12.48 8.01,-20.49 8.01,-8.01 20.49,-8.01L530,91.5q11.98,0 20.24,8.01Q558.5,107.52 558.5,120v35L647,155q11.98,0 20.24,8.01 8.26,8.01 8.26,20.49L675.5,840q0,12.48 -8.26,20.49Q658.97,868.5 647,868.5L313.5,868.5ZM342.5,554.5L618,554.5v-342L342.5,212.5v342Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_bolt.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M391.5,799 L675,458.5L493.5,458.5L530,169 272.5,541h155l-36,258ZM321.5,878.5 L361.5,598.5h-199L521,81h77.5l-40,320h239l-398,477.5h-78ZM473.5,484.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_bolt_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M361.5,598.5L217,598.5q-17.5,0 -25.25,-15.25t2.75,-29.75l338.5,-489q7,-10.5 18.75,-14.25T575,51q11,5 17.75,15.75T598,89.5L558.5,401L736,401q18,0 25.75,16.25T758,448L386.5,894q-8,10 -19.75,12.75T344,904.5q-11,-4.5 -16.75,-15.25T323.5,866l38,-267.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_cable.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M192,836q-13.15,0 -21.08,-7.89Q163,820.22 163,807.5v-50h-1q-16.5,0 -27.5,-11.25t-11,-27.7L123.5,609.5q0,-12.73 7.89,-20.61Q139.27,581 152,581h51L203,271q0,-63.17 46.38,-105.59Q295.75,123 360.88,123 423,123 466,166.08q43,43.08 43,104.92L509,688q0,37.91 26.1,64.21 26.1,26.29 64.25,26.29 41.15,0 70.9,-25.65T700,688L700,378.5h-51q-12.73,0 -20.61,-7.89Q620.5,362.73 620.5,350L620.5,241.25q0,-17.25 11,-28.25t28,-11h0.5v-50q0,-12.73 7.89,-20.61 7.89,-7.89 20.61,-7.89h80q12.57,0 20.79,7.89Q797.5,139.27 797.5,152v50h0.5q16.5,0 27.75,11T837,241v109q0,12.73 -8.07,20.61 -8.07,7.89 -20.43,7.89h-51L757.5,688q0,63.17 -46.61,105.59Q664.29,836 599.16,836q-62.12,0 -104.89,-43.08T451.5,688L451.5,271q0,-37.91 -26.21,-64.21 -26.21,-26.29 -64.5,-26.29 -41.29,0 -70.79,25.65T260.5,271v310h51q12.36,0 20.43,7.89Q340,596.78 340,609.5v108.81q0,16.69 -11.14,27.94 -11.14,11.25 -27.85,11.25h-0.51v50q0,12.73 -8.21,20.61Q284.08,836 271.5,836L192,836Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_call.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M790.89,835Q671.5,835 552.5,775.75t-214,-154.25q-95,-95 -154.5,-213.96t-59.5,-238.65q0,-18.89 12.71,-31.64Q149.93,124.5 169,124.5h136.5q13.61,0 24.06,9.25Q340,143 343,159l27,124q2,13.07 -0.75,24.53t-10.34,19.05L260.5,426.5q56,93 124.75,161.25T542.5,705l95.54,-98q9.46,-10.5 21.21,-14.75T683,591l117.36,25.45q15.45,3.42 25.29,15.24Q835.5,643.5 835.5,659.5v131q0,19.07 -12.75,31.79Q810.01,835 790.89,835ZM231.5,374l81,-82L289,182L182.5,182q-0.5,38.5 11.75,85.25T231.5,374ZM778,777.5v-107L676,649l-79.5,83.5q40,19 88.17,31t93.33,14ZM596,732.5ZM231.5,374Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_call_500.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M790.24,837.41q-126.17,0 -246.74,-57.22 -120.57,-57.22 -214.26,-150.66 -93.7,-93.45 -150.91,-213.76 -57.22,-120.32 -57.22,-246.6 0,-20.67 13.9,-34.6 13.9,-13.94 34.75,-13.94h154.76q19.5,0 32.62,10.65 13.12,10.65 17.06,29.43l25.76,130.98q2.96,16.33 -0.75,29.96 -3.71,13.63 -14.84,24.04l-95.93,94.09q40.09,67.69 98.63,125.74 58.54,58.04 130.52,102.91l96.67,-94.96q11.13,-10.89 25.02,-15.24 13.89,-4.35 29.98,-1.15l128.54,26.28q19.02,4.43 30.06,17.45 11.03,13.01 11.03,32.03v155.67q0,20.95 -13.9,34.92 -13.9,13.97 -34.75,13.97ZM246.93,359.93l65.76,-63.85 -17.02,-89.46h-86.83q3.52,38.33 12.65,77.14t25.43,76.17ZM752.89,748.93L752.89,662.13l-87.22,-19.02 -68.02,66.54q37.06,16.28 76.25,26.04 39.19,9.76 78.99,13.24ZM597.91,709.39ZM246.93,359.93Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_call_end.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M480,322q125,0 238.75,50.25T914,517.5q8,9.5 8.25,21t-8.36,20.06L821,652q-8,8 -22.5,8.75t-23.09,-5.84L662.5,570.5q-5.75,-4.5 -8.63,-10.25T651,547.5L651,408.41q-41.84,-15.96 -85.42,-22.43Q522,379.5 480.74,379.5q-42.26,0 -85.75,6.5T309.5,408.5v139q0,6.39 -2.75,12.44Q304,566 298,570.5l-113.45,84.45Q173,663.5 161,662.5q-12,-1 -21.5,-10.5l-93.44,-93.44Q37.5,550 37.75,538.5 38,527 46,517.5q81.5,-95 195.25,-145.25T480,322ZM247,432.5q-39.5,19 -74.5,46t-67,57l58,60L247,534L247,432.5ZM708.5,428.5L708.5,528l87.5,66.5 59,-59q-32,-33.5 -68.75,-59t-77.75,-48ZM247,432.5ZM708.5,428.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_call_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M791,835q-119.5,0 -238.5,-59.25t-214,-154.25q-95,-95 -154.5,-214T124.5,169q0,-18.5 13,-31.5t31.5,-13h136.5q14,0 24.25,9.25T343,159l27,124q2,13 -0.75,24.5t-10.25,19l-99,100q56,93 125,161.25T542.5,705l95.5,-98q9.5,-10.5 21.25,-14.75T683,591l117.5,25.5q15,3 25,15t10,28v131q0,18.5 -13,31.5T791,835Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_camera_enhance.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M480.03,697Q551,697 602.75,645.94t51.75,-122.5Q654.5,452 602.72,400q-51.78,-52 -122.75,-52Q408,348 356.75,400.06t-51.25,123.5Q305.5,595 356.78,646q51.28,51 123.25,51ZM435.5,482.5l31,-71.42Q470,402.5 480,403t13.5,9.08l30.16,70.42 65.92,27.58q9.42,4.16 9.42,13.79t-9.42,13.05L523.5,564l-30,69.92Q490,643 480,643.5t-13.5,-8.58L435.5,564l-65.58,-27.08Q360,533.5 360,523.87t9.92,-13.79L435.5,482.5ZM142.5,835.5q-22.97,0 -40.23,-17.27Q85,800.97 85,778L85,268.5q0,-21.97 17.27,-39.73Q119.53,211 142.5,211h147l54.91,-66.5q7.59,-10 19.11,-15 11.52,-5 24.98,-5h183q13.47,0 24.98,5 11.52,5 19.52,15l54.5,66.5h147q21.97,0 39.73,17.77Q875,246.53 875,268.5L875,778q0,22.97 -17.77,40.23Q839.47,835.5 817.5,835.5h-675ZM817.5,778L817.5,268.5h-675L142.5,778h675ZM480,522.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_cancel_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m480,520 l129,129q8.5,8.5 20,8.5t20,-8.5q8.5,-8.5 8.5,-20t-8.5,-20L520,480l129,-129q8.5,-8.5 8.5,-20t-8.5,-20q-8.5,-8.5 -20,-8.5t-20,8.5L480,440 351,311q-8.5,-8.5 -20,-8.5t-20,8.5q-8.5,8.5 -8.5,20t8.5,20l129,129 -129,129q-8.5,8.5 -8.5,20t8.5,20q8.5,8.5 20,8.5t20,-8.5l129,-129ZM480.06,875q-80.97,0 -153.13,-31.26 -72.16,-31.26 -125.8,-85Q147.5,705 116.25,632.98 85,560.95 85,480.06q0,-81.97 31.26,-154.13 31.26,-72.16 85,-125.55Q255,147 327.02,116q72.02,-31 152.91,-31 81.97,0 154.13,31.13 72.17,31.13 125.55,84.5Q813,254 844,326.02q31,72.02 31,153.91 0,80.97 -31.01,153.13 -31.01,72.16 -84.5,125.8Q706,812.5 633.98,843.75 561.95,875 480.06,875Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_chat.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M272,558.5h252q10.94,0 19.22,-8.36t8.28,-20.72q0,-11.92 -8.41,-20.17Q534.67,501 523,501L271,501q-11.5,0 -19.75,8.46 -8.25,8.46 -8.25,20.22 0,12.32 8.38,20.58T272,558.5ZM272,429.5h417.5q10.94,0 19.22,-8.36T717,400.42q0,-11.92 -8.41,-20.17Q700.17,372 688.5,372L271,372q-11.5,0 -19.75,8.46 -8.25,8.46 -8.25,20.22 0,12.32 8.38,20.58T272,429.5ZM272,300.5h417.5q10.94,0 19.22,-8.36T717,271.42q0,-11.92 -8.41,-20.17Q700.17,243 688.5,243L271,243q-11.5,0 -19.75,8.46 -8.25,8.46 -8.25,20.22 0,12.32 8.38,20.58T272,300.5ZM85,804L85,142q0,-21.97 17.27,-39.73Q119.53,84.5 142.5,84.5h675q21.97,0 39.73,17.77Q875,120.03 875,142v516q0,21.97 -17.77,39.73Q839.47,715.5 817.5,715.5L242.21,715.5L133.5,824q-13.5,13.5 -31,6.17T85,804ZM142.5,733.5L218,658h599.5L817.5,142h-675v591.5ZM142.5,142v591.5L142.5,142Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_check.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M378.46,699.5q-5.73,0 -10.49,-2 -4.76,-2 -9.47,-6.5L179.09,511.59q-8.59,-8.59 -8.59,-21.09t8.41,-21q8.41,-8.5 20.25,-8.5 11.84,0 20.41,8.57L378.5,628.5l360.94,-360.94Q747.78,259 759.9,259q12.12,0 21.1,8.5 8.5,8.5 8.5,20.61 0,12.11 -8.59,20.48L398.5,691q-4.79,4.5 -9.55,6.5 -4.76,2 -10.49,2Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_check_circle_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m421.5,571.5 l-97.56,-98.06Q315,465 302.5,465q-12.5,0 -22,9.5 -9,9 -9,21.5t8.82,20.82L401.5,639q8.32,9 19.91,9T442,639l237,-237q9.5,-9.5 9.5,-22t-9.5,-22.5q-10,-8.5 -23,-8t-21.37,8.87L421.5,571.5ZM480,875q-80.91,0 -153.07,-31.26 -72.16,-31.26 -125.8,-85Q147.5,705 116.25,632.91 85,560.83 85,480q0,-81.91 31.26,-154.07 31.26,-72.16 85,-125.55Q255,147 327.09,116 399.17,85 480,85q81.91,0 154.07,31.01 72.16,31.01 125.55,84.5Q813,254 844,326.09 875,398.17 875,480q0,80.91 -31.01,153.07 -31.01,72.16 -84.5,125.8Q706,812.5 633.91,843.75 561.83,875 480,875Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_check_fill.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M378.46,699.5q-5.73,0 -10.49,-2 -4.76,-2 -9.47,-6.5L179.09,511.59q-8.59,-8.59 -8.59,-21.09t8.41,-21q8.41,-8.5 20.25,-8.5 11.84,0 20.41,8.57L378.5,628.5l360.94,-360.94Q747.78,259 759.9,259q12.12,0 21.1,8.5 8.5,8.5 8.5,20.61 0,12.11 -8.59,20.48L398.5,691q-4.79,4.5 -9.55,6.5 -4.76,2 -10.49,2Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_chevron_right.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M355.5,695.5q-8,-9.5 -8.5,-20.75t8.43,-20.18L531,479 354.43,302.43Q346.5,294.5 347,281.75t8.5,-20.75q9.5,-9.5 20.5,-9t19.86,8.86L593.5,459q4.5,4.58 6.75,9.34t2.25,10.7q0,5.94 -2.25,10.7 -2.25,4.76 -6.75,9.26L396.86,695.64Q388,704.5 376.5,704q-11.5,-0.5 -21,-8.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_circle.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M480.06,875q-80.97,0 -153.13,-31.26 -72.16,-31.26 -125.8,-85Q147.5,705 116.25,632.98 85,560.95 85,480.06q0,-81.97 31.26,-154.13 31.26,-72.16 85,-125.55Q255,147 327.02,116q72.02,-31 152.91,-31 81.97,0 154.13,31.13 72.17,31.13 125.55,84.5Q813,254 844,326.02q31,72.02 31,153.91 0,80.97 -31.01,153.13 -31.01,72.16 -84.5,125.8Q706,812.5 633.98,843.75 561.95,875 480.06,875ZM479.97,817.5Q620.5,817.5 719,718.53t98.5,-238.5Q817.5,339.5 719.03,241t-239,-98.5q-139.53,0 -238.53,98.47t-99,239q0,139.53 98.97,238.53t238.5,99ZM480,480Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_circle_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M480.06,875q-80.97,0 -153.13,-31.26 -72.16,-31.26 -125.8,-85Q147.5,705 116.25,632.98 85,560.95 85,480.06q0,-81.97 31.26,-154.13 31.26,-72.16 85,-125.55Q255,147 327.02,116q72.02,-31 152.91,-31 81.97,0 154.13,31.13 72.17,31.13 125.55,84.5Q813,254 844,326.02q31,72.02 31,153.91 0,80.97 -31.01,153.13 -31.01,72.16 -84.5,125.8Q706,812.5 633.98,843.75 561.95,875 480.06,875Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_code.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M657.5,696.5q-9,9 -20.5,8.5t-20,-9.5q-9,-8.5 -9,-20.5t9,-21l176,-176 -175,-175.5q-9,-8.5 -8.5,-20.5t9.5,-21q8.5,-8.5 20.25,-8.5T660,261l196,197q8,8.5 8,20.25T856,498L657.5,696.5ZM301.5,693.5 L104.5,497.5q-8.5,-8 -8.5,-19.75t8.5,-20.25L303,259q8.5,-8.5 20.5,-8.5t21,8.5q8.5,9 8.5,21t-8.5,20.5L167,478l175.5,175q8.5,9 8.5,20.5t-8.5,20q-9,9 -20.75,9t-20.25,-9Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_content_copy.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M184,872q-22.97,0 -40.23,-17.27Q126.5,837.47 126.5,814.5v-567q0,-12.25 8.43,-20.63 8.43,-8.38 20.5,-8.38 12.07,0 20.33,8.38T184,247.5v567h439q11.68,0 20.09,8.46 8.41,8.46 8.41,20.21 0,12.32 -8.41,20.58Q634.67,872 623,872L184,872ZM299,757q-22.97,0 -40.23,-17.27Q241.5,722.47 241.5,699.5v-556q0,-22.97 17.27,-40.23Q276.03,86 299,86h437.71q22.23,0 39.76,17.27Q794,120.53 794,143.5v556q0,22.97 -17.53,40.23Q758.94,757 736.71,757L299,757ZM299,699.5h437.5v-556L299,143.5v556ZM299,699.5v-556,556Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_content_paste.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M182.5,835q-24.97,0 -41.23,-16.03Q125,802.94 125,777.5L125,182q0,-25.44 16.03,-41.47Q157.06,124.5 182.5,124.5h203.06q5.94,-34.5 32.59,-57 26.65,-22.5 62.22,-22.5 34.63,0 61.38,22.5t33.25,57h203.5q24.97,0 41.23,16.03Q836,156.56 836,182v595.5q0,25.44 -16.27,41.47Q803.47,835 778.5,835h-596ZM182.5,777.5h596L778.5,182L721,182v57.5q0,12.25 -8.38,20.38T692,268L268.5,268q-12.25,0 -20.38,-8.13T240,239.5L240,182h-57.5v595.5ZM480.25,180q16.25,0 27.5,-11.25t11.25,-27.5q0,-16.25 -11.29,-27.5 -11.29,-11.25 -27.21,-11.25 -16.5,0 -27.75,11.29Q441.5,125.07 441.5,141q0,16.5 11.25,27.75t27.5,11.25Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_database.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M480,840q-151,0 -255.5,-46.5T120,680L120,280q0,-66 105.5,-113T480,120q149,0 254.5,47T840,280v400q0,67 -104.5,113.5T480,840ZM480,352q86,0 176.5,-26.5T773,266q-27,-32 -117.5,-59T480,180q-88,0 -177,26t-117,60q28,35 116,60.5T480,352ZM479,566q42,0 84,-4.5t80.5,-13.5q38.5,-9 73.5,-22t63,-29L780,342q-29,16 -64,29t-74,22q-39,9 -80,14t-83,5q-42,0 -84,-5t-80.5,-14q-38.5,-9 -73,-22T180,342v155q27,16 61,29t72.5,22q38.5,9 80.5,13.5t85,4.5ZM480,780q48,0 99,-8.5t93.5,-22.5q42.5,-14 72,-31t35.5,-35L780,558q-28,16 -63,28.5T643.5,608q-38.5,9 -80,13.5T479,626q-43,0 -85,-4.5T313.5,608q-38.5,-9 -72.5,-21.5T180,558v126q5,17 34,34.5t72,31q43,13.5 94,22t100,8.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_delete.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M262.5,835q-22.97,0 -40.23,-17.27Q205,800.47 205,777.5v-566h-11.5q-12.25,0 -20.63,-8.43 -8.38,-8.43 -8.38,-20.5 0,-12.07 8.38,-20.33T193.5,154h155.69q0,-12.43 7.92,-20.71Q365.02,125 377.5,125L583,125q12.48,0 20.44,8.34 7.96,8.34 7.96,20.66h156.3q11.55,0 19.92,8.46T796,182.67q0,12.32 -8.41,20.58 -8.41,8.25 -20.09,8.25h-12v566q0,22.97 -17.27,40.23Q720.97,835 698,835L262.5,835ZM262.5,211.5v566L698,777.5v-566L262.5,211.5ZM369.5,663.5q0,12.25 8.53,20.38t20.39,8.13q11.86,0 20.22,-8.13Q427,675.75 427,663.5v-339q0,-12.25 -8.46,-20.63t-20.21,-8.38q-12.32,0 -20.58,8.38T369.5,324.5v339ZM533.5,663.5q0,12.25 8.53,20.38t20.39,8.13q11.86,0 20.22,-8.13Q591,675.75 591,663.5v-339q0,-12.25 -8.46,-20.63t-20.21,-8.38q-12.32,0 -20.58,8.38T533.5,324.5v339ZM262.5,211.5v566,-566Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_delete_forever.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M262.5,835q-22.97,0 -40.23,-17.27Q205,800.47 205,777.5v-566h-11.5q-12.25,0 -20.63,-8.43 -8.38,-8.43 -8.38,-20.5 0,-12.07 8.38,-20.33T193.5,154h155.69q0,-12.43 7.92,-20.71Q365.02,125 377.5,125L583,125q12.48,0 20.44,8.34 7.96,8.34 7.96,20.66h156.3q11.55,0 19.92,8.46T796,182.67q0,12.32 -8.41,20.58 -8.41,8.25 -20.09,8.25h-12v566q0,22.97 -17.27,40.23Q720.97,835 698,835L262.5,835ZM262.5,211.5v566L698,777.5v-566L262.5,211.5ZM262.5,211.5v566,-566ZM480.25,538.5L576,635q10.5,10 23.75,10t22.75,-10q9.5,-9.33 10,-22.98 0.5,-13.65 -10,-22.52L527,491.77l95.5,-97.73q9.5,-9.37 10,-23.02 0.5,-13.65 -9.81,-22.63Q613.23,339 599.43,339q-13.8,0 -23.43,9.57L480.5,445.5l-95,-97q-8.38,-10 -22.19,-9.75Q349.5,339 339,348.5q-10.5,10 -10,23.25T339,395l96,97 -96.06,96.56Q329.5,598.5 329.5,611.75q0,13.25 9.56,23.18Q349.5,645 362.75,645q13.25,0 22.69,-9.94L480.25,538.5Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_delete_forever_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M480.5,538.5 L576,635q10.33,10 23.67,10 13.33,0 22.85,-9.91Q632,625.73 632,612.12t-9.5,-22.62L527,492l95.5,-98q10.5,-9.83 10.5,-23.17 0,-13.33 -10.36,-22.35 -9.41,-9.48 -22.78,-9.73Q586.5,338.5 576,348.5l-95.5,97 -95,-97q-8.38,-10 -22.19,-9.75 -13.81,0.25 -24.29,9.61 -9.52,8.91 -9.52,22.78Q329.5,385 339,395l96,97 -96,96.5q-9.5,9.88 -9.5,23.19 0,13.31 9.41,23.29Q349.27,645 362.63,645t22.87,-10l95,-96.5ZM262.5,835q-22.94,0 -40.22,-17.28Q205,800.44 205,777.5v-566h-11.5q-12.5,0 -20.75,-8.25t-8.25,-20.75q0,-12 8.25,-20.25T193.5,154L349,154q0,-12.5 7.89,-20.75Q364.77,125 377.5,125L583,125q12.73,0 20.61,8.18Q611.5,141.35 611.5,154h156q12,0 20.25,8.25T796,182.5q0,12.5 -8.25,20.75t-20.25,8.25h-12v566q0,22.94 -17.28,40.22Q720.94,835 698,835L262.5,835Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_dns.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M288.47,247q-20.64,0 -34.8,14.15 -14.17,14.15 -14.17,34.38 0,20.64 14.31,34.8 14.31,14.17 34.75,14.17Q309,344.5 323,330.19q14,-14.31 14,-34.75Q337,275 322.85,261q-14.15,-14 -34.38,-14ZM288.47,655.5q-20.64,0 -34.8,14.31 -14.17,14.31 -14.17,34.75Q239.5,725 253.81,739q14.31,14 34.75,14Q309,753 323,738.85q14,-14.15 14,-34.38 0,-20.64 -14.15,-34.8 -14.15,-14.17 -34.38,-14.17ZM158,127h643q15.5,0 25,9.14 9.5,9.14 9.5,24.92L835.5,425q0,17.64 -9.5,29.07 -9.5,11.43 -25,11.43L158,465.5q-14.5,0 -24,-11.49t-9.5,-29.22L124.5,161.12q0,-15.77 9.5,-24.94Q143.5,127 158,127ZM182,184.5L182,408h596L778,184.5L182,184.5ZM158,534.5h639q14.5,0 26.5,12.5t12,27.87L835.5,833.5q0,20.21 -12,30.36Q811.5,874 797,874L163,874q-15.5,0 -27,-10.22 -11.5,-10.22 -11.5,-30.53L124.5,575.03q0,-15.53 9.5,-28.03 9.5,-12.5 24,-12.5ZM182,592v224.5h596L778,592L182,592ZM182,184.5L182,408 182,184.5ZM182,592v224.5L182,592Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_do_not_disturb_on.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M311.5,505.5L649,505.5q11.68,0 20.09,-8.43 8.41,-8.43 8.41,-20.5 0,-12.07 -8.41,-20.33Q660.67,448 649,448L311.5,448q-12.25,0 -20.63,8.46t-8.38,20.21q0,12.32 8.38,20.58t20.63,8.25ZM480.33,875q-81.7,0 -153.63,-31.26t-125.56,-85Q147.5,705 116.25,633.14 85,561.27 85,479.56q0,-81.79 31.26,-153.79 31.26,-72 85,-125.39Q255,147 326.86,116q71.86,-31 153.57,-31 81.79,0 153.79,31.13 72,31.13 125.39,84.5Q813,254 844,326.02q31,72.02 31,153.65 0,81.71 -31.01,153.63 -31.01,71.93 -84.5,125.38 -53.49,53.45 -125.51,84.89Q561.95,875 480.33,875ZM480.47,817.5Q620.5,817.5 719,718.53t98.5,-239Q817.5,339.5 719.22,241q-98.28,-98.5 -239.19,-98.5 -139.53,0 -238.53,98.28 -99,98.28 -99,239.19 0,139.53 98.97,238.53t239,99ZM480,480Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_done_filled.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M378.46,699.5q-5.73,0 -10.49,-2 -4.76,-2 -9.47,-6.5L179.09,511.59q-8.59,-8.59 -8.59,-21.09t8.41,-21q8.41,-8.5 20.25,-8.5 11.84,0 20.41,8.57L378.5,628.5l360.94,-360.94Q747.78,259 759.9,259q12.12,0 21.1,8.5 8.5,8.5 8.5,20.61 0,12.11 -8.59,20.48L398.5,691q-4.79,4.5 -9.55,6.5 -4.76,2 -10.49,2Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_download.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M479.83,634.5q-5.67,0 -10.5,-2t-9.33,-7L311.64,477.15Q302.5,468.5 303,456.5t9.25,-20.5q8.75,-8.5 20.5,-8.5T353,436l98.5,99.5L451.5,194q0,-12.25 8.18,-20.63 8.18,-8.38 20.5,-8.38 12.32,0 20.58,8.38T509,194v341.5l99.06,-99.5q8.44,-8.5 20.19,-8.5t20.5,8.5q8.75,8.5 8.75,20.5t-8.82,20.79L500,625.5q-4.58,5 -9.54,7 -4.96,2 -10.63,2ZM222,793q-22.97,0 -40.23,-17.27Q164.5,758.47 164.5,735.5v-113q0,-12.25 8.43,-20.63 8.43,-8.38 20.5,-8.38 12.07,0 20.33,8.38T222,622.5v113h516v-113q0,-12.25 8.43,-20.63 8.43,-8.38 20.5,-8.38 12.07,0 20.33,8.38t8.25,20.63v113q0,22.97 -17.27,40.23Q760.97,793 738,793L222,793Z"/>
-</vector>

apps/android/app/src/main/res/drawable/ic_draft.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.dp"
-    android:height="24.dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M255.69,838.85q-22.26,0 -38.46,-16.2 -16.2,-16.2 -16.2,-38.44L201.04,175.79q0,-22.24 16.2,-38.44 16.2,-16.2 38.61,-16.2h333.61l169.5,169v493.89q0,22.41 -16.2,38.61 -16.2,16.2 -38.46,16.2L255.69,838.85ZM574.42,304.23L574.42,151.35L255.85,151.35q-9.23,0 -16.92,7.69 -7.69,7.69 -7.69,16.92v608.08q0,9.23 7.69,16.92 7.69,7.69 16.92,7.69h448.31q9.23,0 16.92,-7.69 7.69,-7.69 7.69,-16.92L728.77,304.23L574.42,304.23ZM231.23,151.35v152.88,-152.88 657.31,-657.31Z"/>
-</vector>