remove withTmpFile

.github/workflows/build.yml

@@ -50,16 +50,16 @@ jobs:
         include:
           - os: ubuntu-20.04
             cache_path: ~/.stack
-            asset_name: simplex-chat-ubuntu-20_04-x86-64
-          - os: ubuntu-18.04
-            cache_path: ~/.stack
-            asset_name: simplex-chat-ubuntu-18_04-x86-64
-          - os: macos-latest
-            cache_path: ~/.stack
-            asset_name: simplex-chat-macos-x86-64
-          - os: windows-latest
-            cache_path: C:/sr
-            asset_name: simplex-chat-windows-x86-64
+            asset_name: simplex-stress-test
+          # - os: ubuntu-18.04
+          #   cache_path: ~/.stack
+          #   asset_name: simplex-chat-ubuntu-18_04-x86-64
+          # - os: macos-latest
+          #   cache_path: ~/.stack
+          #   asset_name: simplex-chat-macos-x86-64
+          # - os: windows-latest
+          #   cache_path: C:/sr
+          #   asset_name: simplex-chat-windows-x86-64
     steps:
       - name: Clone project
         uses: actions/checkout@v2
@@ -92,7 +92,7 @@ jobs:
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.unix_build.outputs.local_install_root }}/bin/simplex-chat
+          file: ${{ steps.unix_build.outputs.local_install_root }}/bin/simplex-stress-test
           asset_name: ${{ matrix.asset_name }}
           tag: ${{ github.ref }}
 

PRIVACY.md

@@ -1,90 +0,0 @@
-# SimpleX Chat Terms & Privacy Policy
-
-SimpleX Chat is the first chat platform that is 100% private by design - not only it has no access to your messages (thanks to open-source double-ratchet end-to-end encryption protocol and additional encryption layers), it also has no access to your profile and contacts - we do not have access to your connections graph.
-
-## 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.
-
-### 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.
-
-Messages. SimpleX Chat cannot decrypt or otherwise access the content or 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 temporarily offline. Your message history is stored only on your own devices.
-
-Connections with other users. When you create a connection with another user, two messaging queues are created on our servers (we use separate queues for direct and response messages, that can be on two different servers), or on the servers that you configured in the app, in case it allows such configuration. At the time of updating this document only our terminal app allows configuring the servers, our mobile apps will allow such configuration in the near future. Our servers do not store information about which queues are linked to your profile on the device, and they do not have any information in common that 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 unique encryption keys, different for each queue, and separate for sender and recipient of the messages that are transmitted through the queue.
-
-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, 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.
-
-The cases when SimpleX Chat may need to share the data we temporarily store on the servers:
-
-- To meet any applicable law, regulation, legal process or enforceable governmental request.
-- To enforce applicable Terms, including investigation of potential violations.
-- To detect, prevent, or otherwise address fraud, security, or technical issues.
-- To protect against harm to the rights, property, or safety of SimpleX Chat, our users, or the public as required or permitted by law.
-
-### 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.
-
-Please also read our Terms of Service.
-
-If you have questions about our Privacy Policy please contact us at chat@simplex.chat.
-
-## Terms of Service
-
-You accept to 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.
-
-**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 users - 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.
-
-**Operating our services**. For the purpose of operating our Services, you agree that your end-to-end encrypted messages are transferred via our servers in the United Kingdom, the United States and other countries where we have or use facilities and service providers or partners.
-
-**Software**. You agree to downloading and installing updates to our Services when they are available; they would only be automatic if you configure your devices in this way.
-
-**Traffic and device costs**. You are solely responsible for the traffic and device costs on which you use our Services, and any associated taxes.
-
-**Legal and acceptable usage**. You agree to use our Services only for legal and acceptable purposes. You will not use (or assist others in using) our Services in ways that: 1) violate or infringe the rights of SimpleX Chat, our users, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal or impermissible communications, e.g. spam.
-
-**Damage to SimpleX Chat**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit our Services in unauthorized manners, or in ways that harm SimpleX Chat, our Services, or systems. For example, you must not 1) access our Services or systems without authorization, other than by using the apps; 2) disrupt the integrity or performance of our Services; 3) collect information about our users in any manner; or 4) sell, rent, or charge for our Services.
-
-**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.
-
-**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.
-
-**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)
-
-**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.
-
-**Disclaimers**. YOU USE OUR SERVICES AT YOUR OWN RISK AND SUBJECT TO THE FOLLOWING DISCLAIMERS. WE PROVIDE OUR SERVICES ON AN “AS IS” BASIS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, AND FREEDOM FROM COMPUTER VIRUS OR OTHER HARMFUL CODE. SIMPLEX DOES NOT WARRANT THAT ANY INFORMATION PROVIDED BY US IS ACCURATE, COMPLETE, OR USEFUL, THAT OUR SERVICES WILL BE OPERATIONAL, ERROR-FREE, SECURE, OR SAFE, OR THAT OUR SERVICES WILL FUNCTION WITHOUT DISRUPTIONS, DELAYS, OR IMPERFECTIONS. WE DO NOT CONTROL, AND ARE NOT RESPONSIBLE FOR, CONTROLLING HOW OR WHEN OUR USERS USE OUR SERVICES. WE ARE NOT RESPONSIBLE FOR THE ACTIONS OR INFORMATION (INCLUDING CONTENT) OF OUR USERS OR OTHER THIRD PARTIES. YOU RELEASE US, AFFILIATES, DIRECTORS, OFFICERS, EMPLOYEES, PARTNERS, AND AGENTS ("SIMPLEX PARTIES") FROM ANY CLAIM, COMPLAINT, CAUSE OF ACTION, CONTROVERSY, OR DISPUTE (TOGETHER, "CLAIM") AND DAMAGES, KNOWN AND UNKNOWN, RELATING TO, ARISING OUT OF, OR IN ANY WAY CONNECTED WITH ANY SUCH CLAIM YOU HAVE AGAINST ANY THIRD PARTIES.
-
-**Limitation of liability**. THE SIMPLEX PARTIES WILL NOT BE LIABLE TO YOU FOR ANY LOST PROFITS OR CONSEQUENTIAL, SPECIAL, PUNITIVE, INDIRECT, OR INCIDENTAL DAMAGES RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR TERMS, US, OR OUR SERVICES, EVEN IF THE SIMPLEX PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR AGGREGATE LIABILITY RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR TERMS, US, OR OUR SERVICES WILL NOT EXCEED ONE DOLLAR ($1). THE FOREGOING DISCLAIMER OF CERTAIN DAMAGES AND LIMITATION OF LIABILITY WILL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW. THE LAWS OF SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO SOME OR ALL OF THE EXCLUSIONS AND LIMITATIONS SET FORTH ABOVE MAY NOT APPLY TO YOU. NOTWITHSTANDING ANYTHING TO THE CONTRARY IN OUR TERMS, IN SUCH CASES, THE LIABILITY OF THE SIMPLEX PARTIES WILL BE LIMITED TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-
-**Availability**. Our Services may be interrupted, including for maintenance, upgrades, or network or equipment failures. We may discontinue some or all of our Services, including certain features and the support for certain devices and platforms, at any time.
-
-**Resolving disputes**. You agree to resolve any Claim you have with us relating to or arising from our Terms, us, or our Services in the courts of England and Wales. You also agree to submit to the personal jurisdiction of such courts for the purpose of resolving all such disputes. The laws of England govern our Terms, as well as any disputes, whether in court or arbitration, which might arise between SimpleX Chat and you, without regard to conflict of law provisions.
-
-**Changes to the terms**. SimpleX Chat may update the Terms from time to time. Your continued use of our Services confirms your acceptance of our updated Terms and supersedes any prior Terms. You will comply with all applicable export control and trade sanctions laws. Our Terms cover the entire agreement between you and SimpleX Chat regarding our Services. If you do not agree with our Terms, you should stop using our Services.
-
-**Enforcing the terms**. If we fail to enforce any of our Terms, that does not mean we waive the right to enforce them. If any provision of the Terms is deemed unlawful, void, or unenforceable, that provision shall be deemed severable from our Terms and shall not affect the enforceability of the remaining provisions. Our Services are not intended for distribution to or use in any country where such distribution or use would violate local law or would subject us to any regulations in another country. We reserve the right to limit our Services in any country. If you have specific questions about these Terms, please contact us at chat@simplex.chat.
-
-**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 March 1, 2022

README.md

@@ -1,32 +1,22 @@
 <img src="images/simplex-chat-logo.svg" alt="SimpleX logo" width="100%">
 
-# SimpleX - the first chat platform that is 100% private by design - it has no access to your connection graph!
+# SimpleX Chat
+
+SimpleX - private and secure open-source chat and application platform - public beta for iOS now available!
 
 [![GitHub build](https://github.com/simplex-chat/simplex-chat/workflows/build/badge.svg)](https://github.com/simplex-chat/simplex-chat/actions?query=workflow%3Abuild)
 [![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)
-[![Follow on Twitter](https://img.shields.io/twitter/follow/SimpleXChat?style=social)](https://twitter.com/SimpleXChat)
+[![Follow on Twitter](https://img.shields.io/twitter/follow/SimpleXChat?style=social)](https://twitter.com/simplexchat)
 [![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
 
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apple_store.svg" alt="iOS app" height="42">](https://apps.apple.com/us/app/simplex-chat/id1605771084)
-&nbsp;
-[![Android app](https://github.com/simplex-chat/.github/blob/master/profile/images/google_play.svg)](https://play.google.com/store/apps/details?id=chat.simplex.app)
-&nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/f_droid.svg" alt="F-Droid" height="41">](https://app.simplex.chat)
-&nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/testflight.png" alt="iOS TestFlight" height="41">](https://testflight.apple.com/join/DWuT2LQu)
-&nbsp;
-[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="APK" height="41">](https://github.com/simplex-chat/website/raw/master/simplex.apk)
-
-- 🖲 Protects your messages and metadata - who you talk to and when.
-- 🔐 Double ratchet encryption.
-- 📱 Mobile apps for Android ([Google Play](https://play.google.com/store/apps/details?id=chat.simplex.app), [APK](https://github.com/simplex-chat/website/raw/master/simplex.apk)) and [iOS](https://apps.apple.com/us/app/simplex-chat/id1605771084). [See the announcement here](https://github.com/simplex-chat/simplex-chat/blob/master/blog/20220308-simplex-chat-mobile-apps.md).
-- 🚀 [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](https://github.com/simplex-chat/simplex-chat) on Linux, MacOS, Windows.
+SimpleX Chat apps (both terminal UI and [iOS public beta](https://testflight.apple.com/join/DWuT2LQu)) use [SimpleXMQ](https://github.com/simplex-chat/simplexmq) message broker.
 
 See [SimpleX overview](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information on platform objectives and technical design.
 
-### :zap: Quick installation of a terminal app
+***SimpleX Chat [public beta for iOS 15 is available via TestFlight](https://testflight.apple.com/join/DWuT2LQu)** - it will help us a lot if you test it! [See the announcement here](https://github.com/simplex-chat/simplex-chat/blob/stable/blog/20220214-simplex-chat-ios-public-beta.md).*
+
+### :zap: Quick installation
 
 ```sh
 curl -o- https://raw.githubusercontent.com/simplex-chat/simplex-chat/master/install.sh | bash

apps/android/.gitignore

@@ -7,11 +7,18 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
-/.idea/deploymentTargetDropDown.xml
-/.idea/misc.xml
 .DS_Store
-/build
+build/
+release/
+debug/
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar

apps/android/.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

apps/android/.idea/codeStyles/Project.xml

@@ -1,12 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="SPACE_BEFORE_EXTEND_COLON" value="false" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="3" />
-      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="0" />
-      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
@@ -120,25 +113,5 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="RIGHT_MARGIN" value="140" />
-      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="0" />
-      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
-      <option name="CALL_PARAMETERS_WRAP" value="0" />
-      <option name="METHOD_PARAMETERS_WRAP" value="0" />
-      <option name="EXTENDS_LIST_WRAP" value="0" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="0" />
-      <option name="ASSIGNMENT_WRAP" value="0" />
-      <option name="METHOD_ANNOTATION_WRAP" value="0" />
-      <option name="CLASS_ANNOTATION_WRAP" value="0" />
-      <option name="FIELD_ANNOTATION_WRAP" value="0" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
   </code_scheme>
 </component>

apps/android/.idea/codeStyles/codeStyleConfig.xml

@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>

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/misc.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.2328125" />
+        <entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.2328125" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="1.0" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

apps/android/app/.gitignore

@@ -1 +0,0 @@
-/build

apps/android/app/build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization'
+    id 'kotlin-android'
 }
 
 android {
@@ -9,18 +8,15 @@ android {
 
     defaultConfig {
         applicationId "chat.simplex.app"
-        minSdk 29
+        minSdk 24
         targetSdk 32
-        versionCode 17
-        versionName "1.4"
+        versionCode 1
+        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'arm64-v8a'
         }
-        vectorDrawables {
-            useSupportLibrary true
-        }
         externalNativeBuild {
             cmake {
                 cppFlags ''
@@ -40,13 +36,6 @@ android {
     }
     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"
     }
     externalNativeBuild {
         cmake {
@@ -55,50 +44,17 @@ android {
         }
     }
     buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-    }
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
+        viewBinding true
     }
 }
 
 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 'org.jetbrains.kotlinx:kotlinx-datetime:0.3.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
-    implementation "androidx.compose.material:material-icons-extended:$compose_version"
-    implementation "androidx.navigation:navigation-compose:2.4.1"
-    implementation "com.google.accompanist:accompanist-insets:0.23.0"
-
-    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 'com.google.zxing:core:3.4.0'
-    implementation 'com.google.mlkit:barcode-scanning:17.0.2'
-    //Camera Permission
-    implementation "com.google.accompanist:accompanist-permissions:0.23.0"
-
-    testImplementation 'junit:junit:4.13.2'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    testImplementation 'junit:junit:4.+'
     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"
-}
+}

apps/android/app/src/androidTest/java/chat/simplex/app/ExampleInstrumentedTest.kt

@@ -1,11 +1,13 @@
 package chat.simplex.app
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
 import org.junit.Test
 import org.junit.runner.RunWith
 
+import org.junit.Assert.*
+
 /**
  * Instrumented test, which will execute on an Android device.
  *

apps/android/app/src/main/AndroidManifest.xml

@@ -2,47 +2,26 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="chat.simplex.app">
 
-  <uses-feature android:name="android.hardware.camera" />
-  <uses-permission android:name="android.permission.CAMERA" />
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
   <application
-    android:name="SimplexApp"
     android:allowBackup="true"
-    android:icon="@mipmap/icon"
+    android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
+    android:roundIcon="@mipmap/ic_launcher_round"
     android:supportsRtl="true"
     android:theme="@style/Theme.SimpleX">
     <activity
       android:name=".MainActivity"
-      android:exported="true"
-      android:label="@string/app_name"
-      android:windowSoftInputMode="adjustResize"
-      android:theme="@style/Theme.SimpleX">
+      android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
+
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
-
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="simplex" />
-      </intent-filter>
     </activity>
-    <provider
-        android:name="androidx.core.content.FileProvider"
-        android:authorities="chat.simplex.app.provider"
-        android:exported="false"
-        android:grantUriPermissions="true">
-      <meta-data
-          android:name="android.support.FILE_PROVIDER_PATHS"
-          android:resource="@xml/file_paths"/>
-    </provider>
   </application>
 
-</manifest>
+</manifest>

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

@@ -8,7 +8,7 @@ void setLineBuffering(void);
 int pipe_std_to_socket(const char * name);
 
 JNIEXPORT jint JNICALL
-Java_chat_simplex_app_SimplexAppKt_pipeStdOutToSocket(JNIEnv *env, __unused jclass clazz, jstring socket_name) {
+Java_chat_simplex_app_MainActivityKt_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);
@@ -16,28 +16,50 @@ Java_chat_simplex_app_SimplexAppKt_pipeStdOutToSocket(JNIEnv *env, __unused jcla
 }
 
 JNIEXPORT void JNICALL
-Java_chat_simplex_app_SimplexAppKt_initHS(__unused JNIEnv *env, __unused jclass clazz) {
+Java_chat_simplex_app_MainActivityKt_initHS(__unused JNIEnv *env, __unused jclass clazz) {
     hs_init(NULL, NULL);
     setLineBuffering();
 }
 
 // from simplex-chat
-typedef void* chat_ctrl;
+typedef void* chat_store;
+typedef void* controller;
 
-extern chat_ctrl chat_init(const char * path);
-extern char *chat_send_cmd(chat_ctrl ctrl, const char *cmd);
-extern char *chat_recv_msg(chat_ctrl ctrl);
+extern chat_store chat_init_store(const char * path);
+extern char *chat_get_user(chat_store store);
+extern char *chat_create_user(chat_store store, const char *data);
+extern controller chat_start(chat_store store);
+extern char *chat_send_cmd(controller ctl, const char *cmd);
+extern char *chat_recv_msg(controller ctl);
 
 JNIEXPORT jlong JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatInit(JNIEnv *env, __unused jclass clazz, jstring datadir) {
+Java_chat_simplex_app_MainActivityKt_chatInit(JNIEnv *env, __unused jclass clazz, jstring datadir) {
     const char *_data = (*env)->GetStringUTFChars(env, datadir, JNI_FALSE);
-    jlong res = (jlong)chat_init(_data);
+    jlong res = (jlong)chat_init_store(_data);
     (*env)->ReleaseStringUTFChars(env, datadir, _data);
     return res;
 }
 
 JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatSendCmd(JNIEnv *env, __unused jclass clazz, jlong controller, jstring msg) {
+Java_chat_simplex_app_MainActivityKt_chatGetUser(JNIEnv *env, __unused jclass clazz, jlong controller) {
+    return (*env)->NewStringUTF(env, chat_get_user((void*)controller));
+}
+
+JNIEXPORT jstring JNICALL
+Java_chat_simplex_app_MainActivityKt_chatCreateUser(JNIEnv *env, __unused jclass clazz, jlong controller, jstring data) {
+    const char *_data = (*env)->GetStringUTFChars(env, data, JNI_FALSE);
+    jstring res = (*env)->NewStringUTF(env, chat_create_user((void*)controller, _data));
+    (*env)->ReleaseStringUTFChars(env, data, _data);
+    return res;
+}
+
+JNIEXPORT jlong JNICALL
+Java_chat_simplex_app_MainActivityKt_chatStart(JNIEnv *env, jclass clazz, jlong controller) {
+    return (jlong)chat_start((void*)controller);
+}
+
+JNIEXPORT jstring JNICALL
+Java_chat_simplex_app_MainActivityKt_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);
@@ -45,6 +67,6 @@ Java_chat_simplex_app_SimplexAppKt_chatSendCmd(JNIEnv *env, __unused jclass claz
 }
 
 JNIEXPORT jstring JNICALL
-Java_chat_simplex_app_SimplexAppKt_chatRecvMsg(JNIEnv *env, __unused jclass clazz, jlong controller) {
+Java_chat_simplex_app_MainActivityKt_chatRecvMsg(JNIEnv *env, __unused jclass clazz, jlong controller) {
     return (*env)->NewStringUTF(env, chat_recv_msg((void*)controller));
 }

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

@@ -1,119 +1,123 @@
 package chat.simplex.app
 
-import android.app.Application
-import android.content.Intent
-import android.net.Uri
+import android.net.LocalServerSocket
 import android.os.Bundle
 import android.util.Log
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.activity.viewModels
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.lifecycle.AndroidViewModel
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.NtfManager
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.SplashView
-import chat.simplex.app.views.WelcomeView
-import chat.simplex.app.views.chat.ChatView
-import chat.simplex.app.views.chatlist.ChatListView
-import chat.simplex.app.views.chatlist.openChat
-import chat.simplex.app.views.helpers.AlertManager
-import chat.simplex.app.views.helpers.withApi
-import chat.simplex.app.views.newchat.*
+import android.view.inputmethod.EditorInfo
+import android.widget.ScrollView
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatEditText
+import java.io.BufferedReader
+import java.io.InputStreamReader
+import java.lang.ref.WeakReference
+import java.util.*
+import java.util.concurrent.Semaphore
+import kotlin.concurrent.thread
 
-//import kotlinx.serialization.decodeFromString
+// ghc's rts
+external fun initHS()
+// android-support
+external fun pipeStdOutToSocket(socketName: String) : Int
 
-class MainActivity: ComponentActivity() {
-  private val vm by viewModels<SimplexViewModel>()
+// simplex-chat
+typealias Store = Long
+typealias Controller = Long
+external fun chatInit(filesDir: String): Store
+external fun chatGetUser(controller: Store) : String
+external fun chatCreateUser(controller: Store, data: String) : String
+external fun chatStart(controller: Store) : Controller
+external fun chatSendCmd(controller: Controller, msg: String) : String
+external fun chatRecvMsg(controller: Controller) : String
 
+class MainActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
+    weakActivity = WeakReference(this)
+
     super.onCreate(savedInstanceState)
-//    testJson()
-    processIntent(intent, vm.chatModel)
-//    vm.app.initiateBackgroundWork()
-    setContent {
-      SimpleXTheme {
-        Surface(
-          Modifier
-            .background(MaterialTheme.colors.background)
-            .fillMaxSize()
-        ) {
-          MainPage(vm.chatModel)
+    setContentView(R.layout.activity_main)
+
+    val store : Store = chatInit(this.applicationContext.filesDir.toString())
+    // create user if needed
+    if(chatGetUser(store) == "{}") {
+      chatCreateUser(store, """
+                    {"displayName": "test", "fullName": "android test"}
+                    """.trimIndent())
+    }
+    Log.d("SIMPLEX (user)", chatGetUser(store))
+
+    val controller = chatStart(store)
+
+    val cmdinput = this.findViewById<AppCompatEditText>(R.id.cmdInput)
+
+    cmdinput.setOnEditorActionListener { _, actionId, _ ->
+      when (actionId) {
+        EditorInfo.IME_ACTION_SEND -> {
+          Log.d("SIMPLEX SEND", chatSendCmd(controller, cmdinput.text.toString()))
+          cmdinput.text?.clear()
+          true
+        }
+        else -> false
+      }
+    }
+
+    thread(name="receiver") {
+      val chatlog = FifoQueue<String>(500)
+      while(true) {
+        val msg = chatRecvMsg(controller)
+        Log.d("SIMPLEX RECV", msg)
+        chatlog.add(msg)
+        val currentText = chatlog.joinToString("\n")
+        weakActivity.get()?.runOnUiThread {
+          val log = weakActivity.get()?.findViewById<TextView>(R.id.chatlog)
+          val scroll = weakActivity.get()?.findViewById<ScrollView>(R.id.scroller)
+          log?.text = currentText
+          scroll?.scrollTo(0, scroll.getChildAt(0).height)
         }
       }
     }
   }
-}
 
-class SimplexViewModel(application: Application): AndroidViewModel(application) {
-  val app = getApplication<SimplexApp>()
-  val chatModel = app.chatModel
-}
+  companion object {
+    lateinit var weakActivity : WeakReference<MainActivity>
+    init {
+      val socketName = "local.socket.address.listen.native.cmd2"
 
-@Composable
-fun MainPage(chatModel: ChatModel) {
-  Box {
-    when (chatModel.userCreated.value) {
-      null -> SplashView()
-      false -> WelcomeView(chatModel)
-      true ->
-        if (chatModel.chatId.value == null) ChatListView(chatModel)
-        else ChatView(chatModel)
-    }
-    ModalManager.shared.showInView()
-    AlertManager.shared.showInView()
-  }
-}
+      val s = Semaphore(0)
+      thread(name="stdout/stderr pipe") {
+        Log.d("SIMPLEX", "starting server")
+        val server = LocalServerSocket(socketName)
+        Log.d("SIMPLEX", "started server")
+        s.release()
+        val receiver = server.accept()
+        Log.d("SIMPLEX", "started receiver")
+        val logbuffer = FifoQueue<String>(500)
+        if (receiver != null) {
+          val inStream = receiver.inputStream
+          val inStreamReader = InputStreamReader(inStream)
+          val input = BufferedReader(inStreamReader)
 
-fun processIntent(intent: Intent?, chatModel: ChatModel) {
-  when (intent?.action) {
-    NtfManager.OpenChatAction -> {
-      val chatId = intent.getStringExtra("chatId")
-      Log.d(TAG, "processIntent: OpenChatAction $chatId")
-      if (chatId != null) {
-        val cInfo = chatModel.getChat(chatId)?.chatInfo
-        if (cInfo != null) withApi { openChat(chatModel, cInfo) }
-      }
-    }
-    "android.intent.action.VIEW" -> {
-      val uri = intent.data
-      if (uri != null) connectIfOpenedViaUri(uri, chatModel)
-    }
-  }
-}
-
-fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
-  Log.d(TAG, "connectIfOpenedViaUri: opened via link")
-  if (chatModel.currentUser.value == null) {
-    // TODO open from chat list view
-    chatModel.appOpenUrl.value = uri
-  } else {
-    withUriAction(uri) { action ->
-      AlertManager.shared.showAlertMsg(
-        title = "Connect via $action link?",
-        text = "Your profile will be sent to the contact that you received this link from.",
-        confirmText = "Connect",
-        onConfirm = {
-          withApi {
-            Log.d(TAG, "connectIfOpenedViaUri: connecting")
-            connectViaUri(chatModel, action, uri)
+          while(true) {
+            val line = input.readLine() ?: break
+            Log.d("SIMPLEX (stdout/stderr)", line)
+            logbuffer.add(line)
           }
         }
-      )
+      }
+
+      System.loadLibrary("app-lib")
+
+      s.acquire()
+      pipeStdOutToSocket(socketName)
+
+      initHS()
     }
   }
 }
 
-//fun testJson() {
-//  val str: String = """
-//  """.trimIndent()
-//
-//  println(json.decodeFromString<APIResponse>(str))
-//}
+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/SimplexApp.kt

@@ -1,95 +0,0 @@
-package chat.simplex.app
-
-import android.app.Application
-import android.net.LocalServerSocket
-import android.util.Log
-import chat.simplex.app.model.*
-import chat.simplex.app.views.helpers.withApi
-import java.io.BufferedReader
-import java.io.InputStreamReader
-import java.util.*
-import java.util.concurrent.Semaphore
-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 chatInit(path: String): ChatCtrl
-external fun chatSendCmd(ctrl: ChatCtrl, msg: String) : String
-external fun chatRecvMsg(ctrl: ChatCtrl) : String
-
-//class SimplexApp: Application(), LifecycleEventObserver {
-class SimplexApp: Application() {
-  private lateinit var controller: ChatController
-  lateinit var chatModel: ChatModel
-  private lateinit var ntfManager: NtfManager
-
-  override fun onCreate() {
-    super.onCreate()
-//    ProcessLifecycleOwner.get().lifecycle.addObserver(this)
-    ntfManager = NtfManager(applicationContext)
-    val ctrl = chatInit(applicationContext.filesDir.toString())
-    controller = ChatController(ctrl, ntfManager, applicationContext)
-    chatModel = controller.chatModel
-    withApi {
-      val user = controller.apiGetActiveUser()
-      if (user != null) controller.startChat(user)
-    }
-  }
-
-//  override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
-//    Log.d(TAG, "onStateChanged: $event")
-//    if (event == Lifecycle.Event.ON_STOP) {
-//      Log.e(TAG, "BGManager schedule ${Clock.System.now()}")
-//      BGManager.schedule(applicationContext)
-//    }
-//  }
-
-  companion object {
-    init {
-      val socketName = "local.socket.address.listen.native.cmd2"
-
-      val s = Semaphore(0)
-      thread(name="stdout/stderr pipe") {
-        Log.d(TAG, "starting server")
-        val server = LocalServerSocket(socketName)
-        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)
-
-          while(true) {
-            val line = input.readLine() ?: break
-            Log.w("$TAG (stdout/stderr)", line)
-            logbuffer.add(line)
-          }
-        }
-      }
-
-      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/model/BGManager.kt

@@ -1,44 +0,0 @@
-package chat.simplex.app.model
-
-import android.content.Context
-import android.util.Log
-import androidx.work.*
-import chat.simplex.app.TAG
-import kotlinx.datetime.Clock
-import java.time.Duration
-
-class BGManager(appContext: Context, workerParams: WorkerParameters): //, ctrl: ChatCtrl):
-  Worker(appContext, workerParams) {
-//  val controller = ctrl
-
-  init {}
-
-  override fun doWork(): Result {
-    Log.e(TAG, "BGManager doWork ${Clock.System.now()}")
-    schedule(applicationContext)
-    getNewItems()
-    return Result.success()
-  }
-
-  private fun getNewItems() {
-    Log.e(TAG, "BGManager getNewItems")
-//    val json = chatRecvMsg(controller)
-//    val r = APIResponse.decodeStr(json).resp
-//    Log.d(TAG, "chatRecvMsg: ${r.responseType}")
-  }
-
-  companion object {
-    val constraints = Constraints.Builder()
-      .setRequiredNetworkType(NetworkType.CONNECTED)
-      .build()
-
-    fun schedule(appContext: Context) {
-      val request = OneTimeWorkRequestBuilder<BGManager>()
-        .setInitialDelay(Duration.ofMinutes(10))
-        .setConstraints(constraints)
-        .build()
-      WorkManager.getInstance(appContext)
-        .enqueue(request)
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt

@@ -1,772 +0,0 @@
-package chat.simplex.app.model
-
-import android.net.Uri
-import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.*
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.font.*
-import androidx.compose.ui.text.style.TextDecoration
-import chat.simplex.app.ui.theme.SecretColor
-import chat.simplex.app.ui.theme.SimplexBlue
-import kotlinx.datetime.*
-import kotlinx.serialization.*
-import kotlinx.serialization.descriptors.*
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.*
-
-class ChatModel(val controller: ChatController) {
-  var currentUser = mutableStateOf<User?>(null)
-  var userCreated = mutableStateOf<Boolean?>(null)
-  var chats = mutableStateListOf<Chat>()
-  var chatId = mutableStateOf<String?>(null)
-  var chatItems = mutableStateListOf<ChatItem>()
-
-  var connReqInvitation: String? = null
-  var terminalItems = mutableStateListOf<TerminalItem>()
-  var userAddress = mutableStateOf<String?>(null)
-  var userSMPServers = mutableStateOf<(List<String>)?>(null)
-  // set when app is opened via contact or invitation URI
-  var appOpenUrl = mutableStateOf<Uri?>(null)
-
-  fun updateUserProfile(profile: Profile) {
-    val user = currentUser.value
-    if (user != null) {
-      currentUser.value = user.copy(profile = profile)
-    }
-  }
-
-  fun hasChat(id: String): Boolean = chats.firstOrNull { it.id == id } != null
-  fun getChat(id: String): Chat? = chats.firstOrNull { it.id == id }
-  private fun getChatIndex(id: String): Int = chats.indexOfFirst { it.id == id }
-  fun addChat(chat: Chat) = chats.add(index = 0, chat)
-
-  fun updateChatInfo(cInfo: ChatInfo) {
-    val i = getChatIndex(cInfo.id)
-    if (i >= 0) chats[i] = chats[i].copy(chatInfo = cInfo)
-  }
-
-  fun updateContact(contact: Contact) {
-    val cInfo = ChatInfo.Direct(contact)
-    if (hasChat(contact.id)) {
-      updateChatInfo(cInfo)
-    } else {
-      addChat(Chat(chatInfo = cInfo, chatItems = arrayListOf()))
-    }
-  }
-
-  fun updateNetworkStatus(contact: Contact, status: Chat.NetworkStatus) {
-    val i = getChatIndex(contact.id)
-    if (i >= 0) {
-      val chat = chats[i]
-      chats[i] = chat.copy(serverInfo = chat.serverInfo.copy(networkStatus = status))
-    }
-  }
-
-  fun replaceChat(id: String, chat: Chat) {
-    val i = getChatIndex(id)
-    if (i >= 0) {
-      chats[i] = chat
-    } else {
-      // invalid state, correcting
-      chats.add(index = 0, chat)
-    }
-  }
-
-  fun addChatItem(cInfo: ChatInfo, cItem: ChatItem) {
-    // update previews
-    val i = getChatIndex(cInfo.id)
-    val chat: Chat
-    if (i >= 0) {
-      chat = chats[i]
-      chats[i] = chat.copy(
-        chatItems = arrayListOf(cItem),
-        chatStats =
-          if (cItem.meta.itemStatus is CIStatus.RcvNew) {
-            val minUnreadId = if(chat.chatStats.minUnreadItemId == 0L) cItem.id else chat.chatStats.minUnreadItemId
-            chat.chatStats.copy(unreadCount = chat.chatStats.unreadCount + 1, minUnreadItemId = minUnreadId)
-          }
-          else
-            chat.chatStats
-      )
-      if (i > 0) {
-        popChat_(i)
-      }
-    } else {
-      addChat(Chat(chatInfo = cInfo, chatItems = arrayListOf(cItem)))
-    }
-    // add to current chat
-    if (chatId.value == cInfo.id) {
-      chatItems.add(cItem)
-    }
-  }
-
-  fun upsertChatItem(cInfo: ChatInfo, cItem: ChatItem): Boolean {
-    // update previews
-    val i = getChatIndex(cInfo.id)
-    val chat: Chat
-    val res: Boolean
-    if (i >= 0) {
-      chat = chats[i]
-      val pItem = chat.chatItems.last()
-      if (pItem.id == cItem.id) {
-        chats[i] = chat.copy(chatItems = arrayListOf(cItem))
-      }
-      res = false
-    } else {
-      addChat(Chat(chatInfo = cInfo, chatItems = arrayListOf(cItem)))
-      res = true
-    }
-    // update current chat
-    if (chatId.value == cInfo.id) {
-      val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
-      if (itemIndex >= 0) {
-        chatItems[itemIndex] = cItem
-        return false
-      } else {
-        chatItems.add(cItem)
-        return true
-      }
-    } else {
-      return res
-    }
-  }
-
-  fun markChatItemsRead(cInfo: ChatInfo) {
-    val chatIdx = getChatIndex(cInfo.id)
-    // update current chat
-    if (chatId.value == cInfo.id) {
-      var i = 0
-      while (i < chatItems.count()) {
-        val item = chatItems[i]
-        if (item.meta.itemStatus is CIStatus.RcvNew) {
-          chatItems[i] = item.copy(meta=item.meta.copy(itemStatus = CIStatus.RcvRead()))
-        }
-        i += 1
-      }
-      val chat = chats[chatIdx]
-      chats[chatIdx] = chat.copy(
-        chatItems = chatItems,
-        chatStats = chat.chatStats.copy(unreadCount = 0, minUnreadItemId = chat.chatItems.last().id + 1)
-      )
-    }
-
-  }
-
-//  func popChat(_ id: String) {
-//    if let i = getChatIndex(id) {
-//      popChat_(i)
-//    }
-//  }
-
-  private fun popChat_(i: Int) {
-    val chat = chats.removeAt(i)
-    chats.add(index = 0, chat)
-  }
-
-  fun removeChat(id: String) {
-    chats.removeAll { it.id == id }
-  }
-}
-
-enum class ChatType(val type: String) {
-  Direct("@"),
-  Group("#"),
-  ContactRequest("<@");
-
-  val chatTypeName: String get () =
-    when (this) {
-      Direct -> "contact"
-      Group -> "group"
-      ContactRequest -> "contact request"
-    }
-}
-
-@Serializable
-data class User(
-  val userId: Long,
-  val userContactId: Long,
-  val localDisplayName: String,
-  val profile: Profile,
-  val activeUser: Boolean
-): NamedChat {
-  override val displayName: String get() = profile.displayName
-  override val fullName: String get() = profile.fullName
-  override val image: String? get() = profile.image
-
-  companion object {
-    val sampleData = User(
-      userId = 1,
-      userContactId = 1,
-      localDisplayName = "alice",
-      profile = Profile.sampleData,
-      activeUser = true
-    )
-  }
-}
-
-typealias ChatId = String
-
-interface NamedChat {
-  val displayName: String
-  val fullName: String
-  val image: String?
-  val chatViewName: String
-    get() = displayName + (if (fullName == "" || fullName == displayName) "" else " / $fullName")
-}
-
-interface SomeChat {
-  val chatType: ChatType
-  val localDisplayName: String
-  val id: ChatId
-  val apiId: Long
-  val ready: Boolean
-  val createdAt: Instant
-}
-
-@Serializable
-data class Chat (
-  val chatInfo: ChatInfo,
-  val chatItems: List<ChatItem>,
-  val chatStats: ChatStats = ChatStats(),
-  val serverInfo: ServerInfo = ServerInfo(NetworkStatus.Unknown())
-) {
-  val id: String get() = chatInfo.id
-
-  @Serializable
-  data class ChatStats(val unreadCount: Int = 0, val minUnreadItemId: Long = 0)
-
-  @Serializable
-  data class ServerInfo(val networkStatus: NetworkStatus)
-
-  @Serializable
-  sealed class NetworkStatus {
-    val statusString: String get() = if (this is Connected) "Server connected" else "Connecting server…"
-    val statusExplanation: String get() =
-      when {
-        this is Connected -> "You are connected to the server used to receive messages from this contact."
-        this is Error -> "Trying to connect to the server used to receive messages from this contact (error: $error)."
-        else -> "Trying to connect to the server used to receive messages from this contact."
-      }
-
-    @Serializable @SerialName("unknown") class Unknown: NetworkStatus()
-    @Serializable @SerialName("connected") class Connected: NetworkStatus()
-    @Serializable @SerialName("disconnected") class Disconnected: NetworkStatus()
-    @Serializable @SerialName("error") class Error(val error: String): NetworkStatus()
-  }
-
-  companion object {
-    val sampleData = Chat(
-      chatInfo = ChatInfo.Direct.sampleData,
-      chatItems = arrayListOf(ChatItem.getSampleData())
-    )
-  }
-}
-
-@Serializable
-sealed class ChatInfo: SomeChat, NamedChat {
-  @Serializable @SerialName("direct")
-  class Direct(val contact: Contact): ChatInfo() {
-    override val chatType get() = ChatType.Direct
-    override val localDisplayName get() = contact.localDisplayName
-    override val id get() = contact.id
-    override val apiId get() = contact.apiId
-    override val ready get() = contact.ready
-    override val createdAt get() = contact.createdAt
-    override val displayName get() = contact.displayName
-    override val fullName get() = contact.fullName
-    override val image get() = contact.image
-
-    companion object {
-      val sampleData = Direct(Contact.sampleData)
-    }
-  }
-
-  @Serializable @SerialName("group")
-  class Group(val groupInfo: GroupInfo): ChatInfo() {
-    override val chatType get() = ChatType.Group
-    override val localDisplayName get() = groupInfo.localDisplayName
-    override val id get() = groupInfo.id
-    override val apiId get() = groupInfo.apiId
-    override val ready get() = groupInfo.ready
-    override val createdAt get() = groupInfo.createdAt
-    override val displayName get() = groupInfo.displayName
-    override val fullName get() = groupInfo.fullName
-    override val image get() = groupInfo.image
-
-    companion object {
-      val sampleData = Group(GroupInfo.sampleData)
-    }
-  }
-
-  @Serializable @SerialName("contactRequest")
-  class ContactRequest(val contactRequest: UserContactRequest): ChatInfo() {
-    override val chatType get() = ChatType.ContactRequest
-    override val localDisplayName get() = contactRequest.localDisplayName
-    override val id get() = contactRequest.id
-    override val apiId get() = contactRequest.apiId
-    override val ready get() = contactRequest.ready
-    override val createdAt get() = contactRequest.createdAt
-    override val displayName get() = contactRequest.displayName
-    override val fullName get() = contactRequest.fullName
-    override val image get() = contactRequest.image
-
-    companion object {
-      val sampleData = ContactRequest(UserContactRequest.sampleData)
-    }
-  }
-}
-
-@Serializable
-class Contact(
-  val contactId: Long,
-  override val localDisplayName: String,
-  val profile: Profile,
-  val activeConn: Connection,
-  val viaGroup: Long? = null,
-  override val createdAt: Instant
-): SomeChat, NamedChat {
-  override val chatType get() = ChatType.Direct
-  override val id get() = "@$contactId"
-  override val apiId get() = contactId
-  override val ready get() = activeConn.connStatus == "ready" || activeConn.connStatus == "snd-ready"
-  override val displayName get() = profile.displayName
-  override val fullName get() = profile.fullName
-  override val image get() = profile.image
-
-  companion object {
-    val sampleData = Contact(
-      contactId = 1,
-      localDisplayName = "alice",
-      profile = Profile.sampleData,
-      activeConn = Connection.sampleData,
-      createdAt = Clock.System.now()
-    )
-  }
-}
-
-@Serializable
-class ContactSubStatus(
-  val contact: Contact,
-  val contactError: ChatError? = null
-)
-
-@Serializable
-class Connection(val connStatus: String) {
-  companion object {
-    val sampleData = Connection(connStatus = "ready")
-  }
-}
-
-@Serializable
-class Profile(
-  val displayName: String,
-  val fullName: String,
-  val image: String? = null
-  ) {
-  companion object {
-    val sampleData = Profile(
-      displayName = "alice",
-      fullName = "Alice"
-    )
-  }
-}
-
-@Serializable
-class GroupInfo (
-  val groupId: Long,
-  override val localDisplayName: String,
-  val groupProfile: GroupProfile,
-  override val createdAt: Instant
-): SomeChat, NamedChat {
-  override val chatType get() = ChatType.Group
-  override val id get() = "#$groupId"
-  override val apiId get() = groupId
-  override val ready get() = true
-  override val displayName get() = groupProfile.displayName
-  override val fullName get() = groupProfile.fullName
-  override val image get() = groupProfile.image
-
-  companion object {
-    val sampleData = GroupInfo(
-      groupId = 1,
-      localDisplayName = "team",
-      groupProfile = GroupProfile.sampleData,
-      createdAt = Clock.System.now()
-    )
-  }
-}
-
-@Serializable
-class GroupProfile (
-  override val displayName: String,
-  override val fullName: String,
-  override val image: String? = null
-): NamedChat {
-  companion object {
-    val sampleData = GroupProfile(
-      displayName = "team",
-      fullName = "My Team"
-    )
-  }
-}
-
-@Serializable
-class GroupMember (
-  val groupMemberId: Long,
-  val memberId: String,
-//    var memberRole: GroupMemberRole
-//    var memberCategory: GroupMemberCategory
-//    var memberStatus: GroupMemberStatus
-//    var invitedBy: InvitedBy
-  val localDisplayName: String,
-  val memberProfile: Profile,
-  val memberContactId: Long?
-//    var activeConn: Connection?
-) {
-  companion object {
-    val sampleData = GroupMember(
-      groupMemberId = 1,
-      memberId = "abcd",
-      localDisplayName = "alice",
-      memberProfile = Profile.sampleData,
-      memberContactId = 1
-    )
-  }
-}
-
-@Serializable
-class MemberSubError (
-  val member: GroupMember,
-  val memberError: ChatError
-)
-
-@Serializable
-class UserContactRequest (
-  val contactRequestId: Long,
-  override val localDisplayName: String,
-  val profile: Profile,
-  override val createdAt: Instant
-): SomeChat, NamedChat {
-  override val chatType get() = ChatType.ContactRequest
-  override val id get() = "<@$contactRequestId"
-  override val apiId get() = contactRequestId
-  override val ready get() = true
-  override val displayName get() = profile.displayName
-  override val fullName get() = profile.fullName
-  override val image get() = profile.image
-
-  companion object {
-    val sampleData = UserContactRequest(
-      contactRequestId = 1,
-      localDisplayName = "alice",
-      profile = Profile.sampleData,
-      createdAt = Clock.System.now()
-    )
-  }
-}
-
-@Serializable
-class AChatItem (
-  val chatInfo: ChatInfo,
-  val chatItem: ChatItem
-)
-
-@Serializable
-data class ChatItem (
-  val chatDir: CIDirection,
-  val meta: CIMeta,
-  val content: CIContent,
-  val formattedText: List<FormattedText>? = null,
-  val quotedItem: CIQuote? = null
-) {
-  val id: Long get() = meta.itemId
-  val timestampText: String get() = meta.timestampText
-  val isRcvNew: Boolean get() = meta.itemStatus is CIStatus.RcvNew
-
-  val memberDisplayName: String? get() =
-    if (chatDir is CIDirection.GroupRcv) chatDir.groupMember.memberProfile.displayName
-    else null
-
-  companion object {
-    fun getSampleData(
-      id: Long = 1,
-      dir: CIDirection = CIDirection.DirectSnd(),
-      ts: Instant = Clock.System.now(),
-      text: String = "hello\nthere",
-      status: CIStatus = CIStatus.SndNew(),
-      quotedItem: CIQuote? = null,
-      itemDeleted: Boolean = false,
-      itemEdited: Boolean = false,
-      editable: Boolean = true
-    ) =
-      ChatItem(
-        chatDir = dir,
-        meta = CIMeta.getSample(id, ts, text, status, itemDeleted, itemEdited, editable),
-        content = CIContent.SndMsgContent(msgContent = MsgContent.MCText(text)),
-        quotedItem = quotedItem
-      )
-  }
-}
-
-@Serializable
-sealed class CIDirection {
-  abstract val sent: Boolean
-
-  @Serializable @SerialName("directSnd")
-  class DirectSnd: CIDirection() {
-    override val sent get() = true
-  }
-
-  @Serializable @SerialName("directRcv")
-  class DirectRcv: CIDirection() {
-    override val sent get() = false
-  }
-
-  @Serializable @SerialName("groupSnd")
-  class GroupSnd: CIDirection() {
-    override val sent get() = true
-  }
-
-  @Serializable @SerialName("groupRcv")
-  class GroupRcv(val groupMember: GroupMember): CIDirection() {
-    override val sent get() = false
-  }
-}
-
-@Serializable
-data class CIMeta (
-  val itemId: Long,
-  val itemTs: Instant,
-  val itemText: String,
-  val itemStatus: CIStatus,
-  val createdAt: Instant,
-  val itemDeleted: Boolean,
-  val itemEdited: Boolean,
-  val editable: Boolean
-) {
-  val timestampText: String get() = getTimestampText(itemTs)
-
-  companion object {
-    fun getSample(
-      id: Long, ts: Instant, text: String, status: CIStatus = CIStatus.SndNew(),
-      itemDeleted: Boolean = false, itemEdited: Boolean = false, editable: Boolean = true
-    ): CIMeta =
-      CIMeta(
-        itemId = id,
-        itemTs = ts,
-        itemText = text,
-        itemStatus = status,
-        createdAt = ts,
-        itemDeleted = itemDeleted,
-        itemEdited = itemEdited,
-        editable = editable
-      )
-  }
-}
-
-fun getTimestampText(t: Instant): String {
-  val tz = TimeZone.currentSystemDefault()
-  val now: LocalDateTime = Clock.System.now().toLocalDateTime(tz)
-  val time: LocalDateTime = t.toLocalDateTime(tz)
-  val recent = now.date == time.date ||
-      (now.date.minus(time.date).days == 1 && now.hour < 12 && time.hour >= 18 )
-  return if (recent) String.format("%02d:%02d", time.hour, time.minute)
-                else String.format("%02d/%02d", time.dayOfMonth, time.monthNumber)
-}
-
-@Serializable
-sealed class CIStatus {
-  @Serializable @SerialName("sndNew")
-  class SndNew: CIStatus()
-
-  @Serializable @SerialName("sndSent")
-  class SndSent: CIStatus()
-
-  @Serializable @SerialName("sndErrorAuth")
-  class SndErrorAuth: CIStatus()
-
-  @Serializable @SerialName("sndError")
-  class SndError(val agentError: AgentErrorType): CIStatus()
-
-  @Serializable @SerialName("rcvNew")
-  class RcvNew: CIStatus()
-
-  @Serializable @SerialName("rcvRead")
-  class RcvRead: CIStatus()
-}
-
-interface ItemContent {
-  val text: String
-}
-
-@Serializable
-sealed class CIContent: ItemContent {
-  abstract override val text: String
-
-  @Serializable @SerialName("sndMsgContent")
-  class SndMsgContent(val msgContent: MsgContent): CIContent() {
-    override val text get() = msgContent.text
-  }
-
-  @Serializable @SerialName("rcvMsgContent")
-  class RcvMsgContent(val msgContent: MsgContent): CIContent() {
-    override val text get() = msgContent.text
-  }
-
-  @Serializable @SerialName("sndFileInvitation")
-  class SndFileInvitation(val fileId: Long, val filePath: String): CIContent() {
-    override val text get() = "sending files is not supported yet"
-  }
-
-  @Serializable @SerialName("rcvFileInvitation")
-  class RcvFileInvitation(val rcvFileTransfer: RcvFileTransfer): CIContent() {
-    override val text get() = "receiving files is not supported yet"
-  }
-}
-
-@Serializable
-class CIQuote (
-  val chatDir: CIDirection? = null,
-  val itemId: Long? = null,
-  val sharedMsgId: String? = null,
-  val sentAt: Instant,
-  val content: MsgContent,
-  val formattedText: List<FormattedText>? = null
-): ItemContent {
-  override val text: String get() = content.text
-
-  fun sender(user: User): String? = when (chatDir) {
-    is CIDirection.DirectSnd -> "you"
-    is CIDirection.DirectRcv -> null
-    is CIDirection.GroupSnd -> user.displayName
-    is CIDirection.GroupRcv -> chatDir.groupMember.memberProfile.displayName
-    null -> null
-  }
-
-  companion object {
-    fun getSample(itemId: Long?, sentAt: Instant, text: String, chatDir: CIDirection?): CIQuote =
-      CIQuote(chatDir = chatDir, itemId = itemId, sentAt = sentAt, content = MsgContent.MCText(text))
-  }
-}
-
-@Serializable(with = MsgContentSerializer::class)
-sealed class MsgContent {
-  abstract val text: String
-
-  class MCText(override val text: String): MsgContent()
-  class MCUnknown(val type: String? = null, override val text: String, val json: JsonElement): MsgContent()
-
-  val cmdString: String get() = when (this) {
-    is MCText -> "text $text"
-    is MCUnknown -> "json $json"
-  }
-}
-
-object MsgContentSerializer : KSerializer<MsgContent> {
-  @OptIn(InternalSerializationApi::class)
-  override val descriptor: SerialDescriptor = buildSerialDescriptor("MsgContent", PolymorphicKind.SEALED) {
-    element("MCText", buildClassSerialDescriptor("MCText") {
-      element<String>("text")
-    })
-    element("MCUnknown", buildClassSerialDescriptor("MCUnknown"))
-  }
-
-  override fun deserialize(decoder: Decoder): MsgContent {
-    require(decoder is JsonDecoder)
-    val json = decoder.decodeJsonElement()
-    return if (json is JsonObject) {
-      if ("type" in json) {
-        val t = json["type"]?.jsonPrimitive?.content ?: ""
-        val text = json["text"]?.jsonPrimitive?.content ?: "unknown message format"
-        when (t) {
-          "text" -> MsgContent.MCText(text)
-          else -> MsgContent.MCUnknown(t, text, json)
-        }
-      } else {
-        MsgContent.MCUnknown(text = "invalid message format", json = json)
-      }
-    } else {
-      MsgContent.MCUnknown(text = "invalid message format", json = json)
-    }
-  }
-
-  override fun serialize(encoder: Encoder, value: MsgContent) {
-    require(encoder is JsonEncoder)
-    val json = when (value) {
-      is MsgContent.MCText ->
-        buildJsonObject {
-          put("type", "text")
-          put("text", value.text)
-        }
-      is MsgContent.MCUnknown -> value.json
-    }
-    encoder.encodeJsonElement(json)
-  }
-}
-
-@Serializable
-class FormattedText(val text: String, val format: Format? = null) {
-  val link: String? = when (format) {
-    is Format.Uri -> text
-    is Format.Email -> "mailto:$text"
-    is Format.Phone -> "tel:$text"
-    else -> null
-  }
-}
-
-@Serializable
-sealed class Format {
-  @Serializable @SerialName("bold") class Bold: Format()
-  @Serializable @SerialName("italic") class Italic: Format()
-  @Serializable @SerialName("strikeThrough") class StrikeThrough: Format()
-  @Serializable @SerialName("snippet") class Snippet: Format()
-  @Serializable @SerialName("secret") class Secret: Format()
-  @Serializable @SerialName("colored") class Colored(val color: FormatColor): Format()
-  @Serializable @SerialName("uri") class Uri: Format()
-  @Serializable @SerialName("email") class Email: Format()
-  @Serializable @SerialName("phone") class Phone: Format()
-
-  val style: SpanStyle @Composable get() = when (this) {
-    is Bold -> SpanStyle(fontWeight = FontWeight.Bold)
-    is Italic -> SpanStyle(fontStyle = FontStyle.Italic)
-    is StrikeThrough -> SpanStyle(textDecoration = TextDecoration.LineThrough)
-    is Snippet -> SpanStyle(fontFamily = FontFamily.Monospace)
-    is Secret -> SpanStyle(color = Color.Transparent, background = SecretColor)
-    is Colored -> SpanStyle(color = this.color.uiColor)
-    is Uri -> linkStyle
-    is Email -> linkStyle
-    is Phone -> linkStyle
-  }
-
-  companion object {
-    val linkStyle @Composable get() = SpanStyle(color = MaterialTheme.colors.primary, textDecoration = TextDecoration.Underline)
-  }
-}
-
-@Serializable
-enum class FormatColor(val color: String) {
-  red("red"),
-  green("green"),
-  blue("blue"),
-  yellow("yellow"),
-  cyan("cyan"),
-  magenta("magenta"),
-  black("black"),
-  white("white");
-
-  val uiColor: Color @Composable get() = when (this) {
-    red -> Color.Red
-    green -> Color.Green
-    blue -> SimplexBlue
-    yellow -> Color.Yellow
-    cyan -> Color.Cyan
-    magenta -> Color.Magenta
-    black -> MaterialTheme.colors.onBackground
-    white -> MaterialTheme.colors.onBackground
-  }
-}
-
-@Serializable
-class RcvFileTransfer

apps/android/app/src/main/java/chat/simplex/app/model/NtfManager.kt

@@ -1,90 +0,0 @@
-package chat.simplex.app.model
-
-import android.app.*
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import chat.simplex.app.*
-import kotlinx.datetime.Clock
-
-class NtfManager(val context: Context) {
-  companion object {
-    const val MessageChannel: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
-    const val MessageGroup: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
-    const val OpenChatAction: String = "chat.simplex.app.OPEN_CHAT"
-  }
-
-  private val manager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-  private var prevNtfTime = mutableMapOf<String, Long>()
-  private val msgNtfTimeoutMs = 30000L
-
-  init {
-    manager.createNotificationChannel(NotificationChannel(
-      MessageChannel,
-      "SimpleX Chat messages",
-      NotificationManager.IMPORTANCE_HIGH
-    ))
-  }
-
-  fun notifyMessageReceived(cInfo: ChatInfo, cItem: ChatItem) {
-    Log.d(TAG, "notifyMessageReceived ${cInfo.id}")
-    val now = Clock.System.now().toEpochMilliseconds()
-    val recentNotification = (now - prevNtfTime.getOrDefault(cInfo.id, 0) < msgNtfTimeoutMs)
-    prevNtfTime[cInfo.id] = now
-
-    val notification = NotificationCompat.Builder(context, MessageChannel)
-      .setContentTitle(cInfo.displayName)
-      .setContentText(hideSecrets(cItem))
-      .setPriority(NotificationCompat.PRIORITY_HIGH)
-      .setGroup(MessageGroup)
-      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-      .setSmallIcon(R.drawable.ntf_icon)
-      .setColor(0x88FFFF)
-      .setAutoCancel(true)
-      .setContentIntent(getMsgPendingIntent(cInfo))
-      .setSilent(recentNotification)
-      .build()
-
-    val summary = NotificationCompat.Builder(context, MessageChannel)
-      .setSmallIcon(R.drawable.ntf_icon)
-      .setColor(0x88FFFF)
-      .setGroup(MessageGroup)
-      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-      .setGroupSummary(true)
-      .build()
-
-    with(NotificationManagerCompat.from(context)) {
-      // using cInfo.id only shows one notification per chat and updates it when the message arrives
-      notify(cInfo.id.hashCode(), notification)
-      notify(0, summary)
-    }
-  }
-
-  private fun hideSecrets(cItem: ChatItem): String {
-    val md = cItem.formattedText
-    return if (md == null) {
-      cItem.content.text
-    } else {
-      var res = ""
-      for (ft in md) {
-        res += if (ft.format is Format.Secret) "..." else ft.text
-      }
-      res
-    }
-  }
-
-  private fun getMsgPendingIntent(cInfo: ChatInfo) : PendingIntent{
-    Log.d(TAG, "getMsgPendingIntent ${cInfo.id}")
-    val uniqueInt = (System.currentTimeMillis() and 0xfffffff).toInt()
-    val intent = Intent(context, MainActivity::class.java)
-      .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-      .putExtra("chatId", cInfo.id)
-      .setAction(OpenChatAction)
-    return TaskStackBuilder.create(context).run {
-      addNextIntentWithParentStack(intent)
-      getPendingIntent(uniqueInt, PendingIntent.FLAG_IMMUTABLE)
-    }
-  }
-}

apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt

@@ -1,806 +0,0 @@
-package chat.simplex.app.model
-
-import android.app.ActivityManager
-import android.app.ActivityManager.RunningAppProcessInfo
-import android.content.Context
-import android.util.Log
-import androidx.compose.runtime.mutableStateOf
-import chat.simplex.app.*
-import chat.simplex.app.views.helpers.AlertManager
-import chat.simplex.app.views.helpers.withApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
-import kotlinx.serialization.*
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.jsonObject
-import kotlin.concurrent.thread
-
-typealias ChatCtrl = Long
-
-open class ChatController(val ctrl: ChatCtrl, val ntfManager: NtfManager, val appContext: Context) {
-  var chatModel = ChatModel(this)
-
-  suspend fun startChat(u: User) {
-    Log.d(TAG, "user: $u")
-    try {
-      apiStartChat()
-      chatModel.userAddress.value = apiGetUserAddress()
-      chatModel.userSMPServers.value = getUserSMPServers()
-      chatModel.chats.addAll(apiGetChats())
-      chatModel.currentUser = mutableStateOf(u)
-      chatModel.userCreated.value = true
-      startReceiver()
-      Log.d(TAG, "started chat")
-    } catch(e: Error) {
-      Log.e(TAG, "failed starting chat $e")
-      throw e
-    }
-  }
-
-  fun startReceiver() {
-    thread(name="receiver") {
-      withApi { recvMspLoop() }
-    }
-  }
-
-  open fun isAppOnForeground(context: Context): Boolean {
-    val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
-    val appProcesses = activityManager.runningAppProcesses ?: return false
-    val packageName = context.packageName
-    for (appProcess in appProcesses) {
-      if (appProcess.importance == RunningAppProcessInfo.IMPORTANCE_FOREGROUND && appProcess.processName == packageName) {
-        return true
-      }
-    }
-    return false
-  }
-
-  suspend fun sendCmd(cmd: CC): CR {
-    return withContext(Dispatchers.IO) {
-      val c = cmd.cmdString
-      chatModel.terminalItems.add(TerminalItem.cmd(cmd))
-      val json = chatSendCmd(ctrl, c)
-      Log.d(TAG, "sendCmd: ${cmd.cmdType}")
-      val r = APIResponse.decodeStr(json)
-      Log.d(TAG, "sendCmd response type ${r.resp.responseType}")
-      if (r.resp is CR.Response || r.resp is CR.Invalid) {
-        Log.d(TAG, "sendCmd response json $json")
-      }
-      chatModel.terminalItems.add(TerminalItem.resp(r.resp))
-      r.resp
-    }
-  }
-
-  suspend fun recvMsg(): CR {
-    return withContext(Dispatchers.IO) {
-      val json = chatRecvMsg(ctrl)
-      val r = APIResponse.decodeStr(json).resp
-      Log.d(TAG, "chatRecvMsg: ${r.responseType}")
-      if (r is CR.Response || r is CR.Invalid) Log.d(TAG, "chatRecvMsg json: $json")
-      r
-    }
-  }
-
-  suspend fun recvMspLoop() {
-    processReceivedMsg(recvMsg())
-    recvMspLoop()
-  }
-
-  suspend fun apiGetActiveUser(): User? {
-    val r = sendCmd(CC.ShowActiveUser())
-    if (r is CR.ActiveUser) return r.user
-    Log.d(TAG, "apiGetActiveUser: ${r.responseType} ${r.details}")
-    chatModel.userCreated.value = false
-    return null
-  }
-
-  suspend fun apiCreateActiveUser(p: Profile): User {
-    val r = sendCmd(CC.CreateActiveUser(p))
-    if (r is CR.ActiveUser) return r.user
-    Log.d(TAG, "apiCreateActiveUser: ${r.responseType} ${r.details}")
-    throw Error("user not created ${r.responseType} ${r.details}")
-  }
-
-  suspend fun apiStartChat() {
-    val r = sendCmd(CC.StartChat())
-    if (r is CR.ChatStarted ) return
-    throw Error("failed starting chat: ${r.responseType} ${r.details}")
-  }
-
-  suspend fun apiGetChats(): List<Chat> {
-    val r = sendCmd(CC.ApiGetChats())
-    if (r is CR.ApiChats ) return r.chats
-    throw Error("failed getting the list of chats: ${r.responseType} ${r.details}")
-  }
-
-  suspend fun apiGetChat(type: ChatType, id: Long): Chat? {
-    val r = sendCmd(CC.ApiGetChat(type, id))
-    if (r is CR.ApiChat ) return r.chat
-    Log.e(TAG, "apiGetChat bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun apiSendMessage(type: ChatType, id: Long, quotedItemId: Long? = null, mc: MsgContent): AChatItem? {
-    val cmd = if (quotedItemId == null) CC.ApiSendMessage(type, id, mc)
-              else CC.ApiSendMessageQuote(type, id, quotedItemId, mc)
-    val r = sendCmd(cmd)
-    if (r is CR.NewChatItem ) return r.chatItem
-    Log.e(TAG, "apiSendMessage bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun apiUpdateMessage(type: ChatType, id: Long, itemId: Long, mc: MsgContent): AChatItem? {
-    val r = sendCmd(CC.ApiUpdateMessage(type, id, itemId, mc))
-    if (r is CR.ChatItemUpdated) return r.chatItem
-    Log.e(TAG, "apiUpdateMessage bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun apiDeleteMessage(type: ChatType, id: Long, itemId: Long, mode: MsgDeleteMode): AChatItem? {
-    val r = sendCmd(CC.ApiDeleteMessage(type, id, itemId, mode))
-    if (r is CR.ChatItemDeleted) return r.chatItem
-    Log.e(TAG, "apiDeleteMessage bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun getUserSMPServers(): List<String>? {
-    val r = sendCmd(CC.GetUserSMPServers())
-    if (r is CR.UserSMPServers) return r.smpServers
-    Log.e(TAG, "getUserSMPServers bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun setUserSMPServers(smpServers: List<String>): Boolean {
-    val r = sendCmd(CC.SetUserSMPServers(smpServers))
-    return when (r) {
-      is CR.CmdOk -> true
-      else -> {
-        Log.e(TAG, "setUserSMPServers bad response: ${r.responseType} ${r.details}")
-        AlertManager.shared.showAlertMsg(
-          "Error saving SMP servers",
-          "Make sure SMP server addresses are in correct format, line separated and are not duplicated"
-        )
-        false
-      }
-    }
-  }
-
-  suspend fun apiAddContact(): String? {
-    val r = sendCmd(CC.AddContact())
-    if (r is CR.Invitation) return r.connReqInvitation
-    Log.e(TAG, "apiAddContact bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun apiConnect(connReq: String): Boolean  {
-    val r = sendCmd(CC.Connect(connReq))
-    when {
-      r is CR.SentConfirmation || r is CR.SentInvitation -> return true
-      r is CR.ContactAlreadyExists -> {
-        AlertManager.shared.showAlertMsg("Contact already exists",
-          "You are already connected to ${r.contact.displayName} via this link"
-        )
-        return false
-      }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat
-          && r.chatError.errorType is ChatErrorType.InvalidConnReq -> {
-        AlertManager.shared.showAlertMsg("Invalid connection link",
-          "Please check that you used the correct link or ask your contact to send you another one."
-        )
-        return false
-      }
-      else -> {
-        apiErrorAlert("apiConnect", "Connection error", r)
-        return false
-      }
-    }
-  }
-
-  suspend fun apiDeleteChat(type: ChatType, id: Long): Boolean {
-    val r = sendCmd(CC.ApiDeleteChat(type, id))
-    when (r) {
-      is CR.ContactDeleted -> return true // TODO groups
-      is CR.ChatCmdError -> {
-        val e = r.chatError
-        if (e is ChatError.ChatErrorChat && e.errorType is ChatErrorType.ContactGroups) {
-          AlertManager.shared.showAlertMsg(
-            "Can't delete contact!",
-            "Contact ${e.errorType.contact.displayName} cannot be deleted, it is a member of the group(s) ${e.errorType.groupNames}"
-          )
-        }
-      }
-      else -> apiErrorAlert("apiDeleteChat", "Error deleting ${type.chatTypeName}", r)
-    }
-    return false
-  }
-
-  suspend fun apiUpdateProfile(profile: Profile): Profile? {
-    val r = sendCmd(CC.ApiUpdateProfile(profile))
-    if (r is CR.UserProfileNoChange) return profile
-    if (r is CR.UserProfileUpdated) return r.toProfile
-    Log.e(TAG, "apiUpdateProfile bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun apiCreateUserAddress(): String? {
-    val r = sendCmd(CC.CreateMyAddress())
-    if (r is CR.UserContactLinkCreated) return r.connReqContact
-    Log.e(TAG, "apiCreateUserAddress bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun apiDeleteUserAddress(): Boolean {
-    val r = sendCmd(CC.DeleteMyAddress())
-    if (r is CR.UserContactLinkDeleted) return true
-    Log.e(TAG, "apiDeleteUserAddress bad response: ${r.responseType} ${r.details}")
-    return false
-  }
-
-  suspend fun apiGetUserAddress(): String? {
-    val r = sendCmd(CC.ShowMyAddress())
-    if (r is CR.UserContactLink) return r.connReqContact
-    if (r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore
-      && r.chatError.storeError is StoreError.UserContactLinkNotFound) {
-      return null
-    }
-    Log.e(TAG, "apiGetUserAddress bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun apiAcceptContactRequest(contactReqId: Long): Contact? {
-    val r = sendCmd(CC.ApiAcceptContact(contactReqId))
-    if (r is CR.AcceptingContactRequest) return r.contact
-    Log.e(TAG, "apiAcceptContactRequest bad response: ${r.responseType} ${r.details}")
-    return null
-  }
-
-  suspend fun apiRejectContactRequest(contactReqId: Long): Boolean {
-    val r = sendCmd(CC.ApiRejectContact(contactReqId))
-    if (r is CR.ContactRequestRejected) return true
-    Log.e(TAG, "apiRejectContactRequest bad response: ${r.responseType} ${r.details}")
-    return false
-  }
-
-  suspend fun apiChatRead(type: ChatType, id: Long, range: CC.ItemRange): Boolean {
-    val r = sendCmd(CC.ApiChatRead(type, id, range))
-    if (r is CR.CmdOk) return true
-    Log.e(TAG, "apiChatRead bad response: ${r.responseType} ${r.details}")
-    return false
-  }
-
-  fun apiErrorAlert(method: String, title: String, r: CR) {
-    val errMsg = "${r.responseType}: ${r.details}"
-    Log.e(TAG, "$method bad response: $errMsg")
-    AlertManager.shared.showAlertMsg(title, errMsg)
-  }
-
-  fun processReceivedMsg(r: CR) {
-    chatModel.terminalItems.add(TerminalItem.resp(r))
-    when (r) {
-      is CR.ContactConnected -> {
-        chatModel.updateContact(r.contact)
-        chatModel.updateNetworkStatus(r.contact, Chat.NetworkStatus.Connected())
-//        NtfManager.shared.notifyContactConnected(contact)
-      }
-      is CR.ReceivedContactRequest -> {
-        val contactRequest = r.contactRequest
-        val cInfo = ChatInfo.ContactRequest(contactRequest)
-        chatModel.addChat(Chat(chatInfo = cInfo, chatItems = listOf()))
-//        NtfManager.shared.notifyContactRequest(contactRequest)
-      }
-      is CR.ContactUpdated -> {
-        val cInfo = ChatInfo.Direct(r.toContact)
-        if (chatModel.hasChat(r.toContact.id)) {
-          chatModel.updateChatInfo(cInfo)
-        }
-      }
-      is CR.ContactSubscribed -> processContactSubscribed(r.contact)
-      is CR.ContactDisconnected -> {
-        chatModel.updateContact(r.contact)
-        chatModel.updateNetworkStatus(r.contact, Chat.NetworkStatus.Disconnected())
-      }
-      is CR.ContactSubError -> processContactSubError(r.contact, r.chatError)
-      is CR.ContactSubSummary -> {
-        for (sub in r.contactSubscriptions) {
-          val err = sub.contactError
-          if (err == null) processContactSubscribed(sub.contact)
-          else processContactSubError(sub.contact, sub.contactError)
-        }
-      }
-      is CR.NewChatItem -> {
-        val cInfo = r.chatItem.chatInfo
-        val cItem = r.chatItem.chatItem
-        chatModel.addChatItem(cInfo, cItem)
-        if (!isAppOnForeground(appContext) || chatModel.chatId.value != cInfo.id) {
-          ntfManager.notifyMessageReceived(cInfo, cItem)
-        }
-      }
-      is CR.ChatItemStatusUpdated -> {
-        val cInfo = r.chatItem.chatInfo
-        val cItem = r.chatItem.chatItem
-        if (chatModel.upsertChatItem(cInfo, cItem)) {
-          ntfManager.notifyMessageReceived(cInfo, cItem)
-        }
-      }
-      is CR.ChatItemUpdated -> {
-        val cInfo = r.chatItem.chatInfo
-        val cItem = r.chatItem.chatItem
-        if (chatModel.upsertChatItem(cInfo, cItem)) {
-          ntfManager.notifyMessageReceived(cInfo, cItem)
-        }
-      }
-      is CR.ChatItemDeleted -> {
-        // TODO
-      }
-      else ->
-        Log.d(TAG , "unsupported event: ${r.responseType}")
-    }
-  }
-
-  fun processContactSubscribed(contact: Contact) {
-    chatModel.updateContact(contact)
-    chatModel.updateNetworkStatus(contact, Chat.NetworkStatus.Connected())
-  }
-
-  fun processContactSubError(contact: Contact, chatError: ChatError) {
-    chatModel.updateContact(contact)
-    val e = chatError
-    val err: String =
-      if (e is ChatError.ChatErrorAgent) {
-        val a = e.agentError
-        when {
-          a is AgentErrorType.BROKER && a.brokerErr is BrokerErrorType.NETWORK -> "network"
-          a is AgentErrorType.SMP && a.smpErr is SMPErrorType.AUTH -> "contact deleted"
-          else -> e.string
-        }
-      }
-      else e.string
-    chatModel.updateNetworkStatus(contact, Chat.NetworkStatus.Error(err))
-  }
-}
-
-enum class MsgDeleteMode(val mode: String) {
-  Broadcast("broadcast"),
-  Internal("internal");
-}
-
-// ChatCommand
-sealed class CC {
-  class Console(val cmd: String): CC()
-  class ShowActiveUser: CC()
-  class CreateActiveUser(val profile: Profile): CC()
-  class StartChat: CC()
-  class ApiGetChats: CC()
-  class ApiGetChat(val type: ChatType, val id: Long): CC()
-  class ApiSendMessage(val type: ChatType, val id: Long, val mc: MsgContent): CC()
-  class ApiSendMessageQuote(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent): CC()
-  class ApiUpdateMessage(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent): CC()
-  class ApiDeleteMessage(val type: ChatType, val id: Long, val itemId: Long, val mode: MsgDeleteMode): CC()
-  class GetUserSMPServers(): CC()
-  class SetUserSMPServers(val smpServers: List<String>): CC()
-  class AddContact: CC()
-  class Connect(val connReq: String): CC()
-  class ApiDeleteChat(val type: ChatType, val id: Long): CC()
-  class ApiUpdateProfile(val profile: Profile): CC()
-  class CreateMyAddress: CC()
-  class DeleteMyAddress: CC()
-  class ShowMyAddress: CC()
-  class ApiAcceptContact(val contactReqId: Long): CC()
-  class ApiRejectContact(val contactReqId: Long): CC()
-  class ApiChatRead(val type: ChatType, val id: Long, val range: ItemRange): CC()
-
-  val cmdString: String get() = when (this) {
-    is Console -> cmd
-    is ShowActiveUser -> "/u"
-    is CreateActiveUser -> "/u ${profile.displayName} ${profile.fullName}"
-    is StartChat -> "/_start"
-    is ApiGetChats -> "/_get chats"
-    is ApiGetChat -> "/_get chat ${chatRef(type, id)} count=100"
-    is ApiSendMessage -> "/_send ${chatRef(type, id)} ${mc.cmdString}"
-    is ApiSendMessageQuote -> "/_send_quote ${chatRef(type, id)} $itemId ${mc.cmdString}"
-    is ApiUpdateMessage -> "/_update item ${chatRef(type, id)} $itemId ${mc.cmdString}"
-    is ApiDeleteMessage -> "/_delete item ${chatRef(type, id)} $itemId $mode"
-    is GetUserSMPServers -> "/smp_servers"
-    is SetUserSMPServers -> "/smp_servers ${smpServersStr(smpServers)}"
-    is AddContact -> "/connect"
-    is Connect -> "/connect $connReq"
-    is ApiDeleteChat -> "/_delete ${chatRef(type, id)}"
-    is ApiUpdateProfile -> "/_profile ${json.encodeToString(profile)}"
-    is CreateMyAddress -> "/address"
-    is DeleteMyAddress -> "/delete_address"
-    is ShowMyAddress -> "/show_address"
-    is ApiAcceptContact -> "/_accept $contactReqId"
-    is ApiRejectContact -> "/_reject $contactReqId"
-    is ApiChatRead -> "/_read chat ${chatRef(type, id)} from=${range.from} to=${range.to}"
-  }
-
-  val cmdType: String get() = when (this) {
-    is Console -> "console command"
-    is ShowActiveUser -> "showActiveUser"
-    is CreateActiveUser -> "createActiveUser"
-    is StartChat -> "startChat"
-    is ApiGetChats -> "apiGetChats"
-    is ApiGetChat -> "apiGetChat"
-    is ApiSendMessage -> "apiSendMessage"
-    is ApiSendMessageQuote -> "apiSendMessageQuote"
-    is ApiUpdateMessage -> "apiUpdateMessage"
-    is ApiDeleteMessage -> "apiDeleteMessage"
-    is GetUserSMPServers -> "getUserSMPServers"
-    is SetUserSMPServers -> "setUserSMPServers"
-    is AddContact -> "addContact"
-    is Connect -> "connect"
-    is ApiDeleteChat -> "apiDeleteChat"
-    is ApiUpdateProfile -> "updateProfile"
-    is CreateMyAddress -> "createMyAddress"
-    is DeleteMyAddress -> "deleteMyAddress"
-    is ShowMyAddress -> "showMyAddress"
-    is ApiAcceptContact -> "apiAcceptContact"
-    is ApiRejectContact -> "apiRejectContact"
-    is ApiChatRead -> "apiChatRead"
-  }
-
-  class ItemRange(val from: Long, val to: Long)
-
-  companion object {
-    fun chatRef(chatType: ChatType, id: Long) = "${chatType.type}${id}"
-
-    fun smpServersStr(smpServers: List<String>) = if (smpServers.isEmpty()) "default" else smpServers.joinToString(separator = ",")
-  }
-}
-
-val json = Json {
-  prettyPrint = true
-  ignoreUnknownKeys = true
-}
-
-@Serializable
-class APIResponse(val resp: CR, val corr: String? = null) {
-  companion object {
-    fun decodeStr(str: String): APIResponse {
-      return try {
-        json.decodeFromString(str)
-      } catch(e: Exception) {
-        try {
-          Log.d(TAG, e.localizedMessage)
-          val data = json.parseToJsonElement(str).jsonObject
-          APIResponse(
-            resp = CR.Response(data["resp"]!!.jsonObject["type"]?.toString() ?: "invalid", json.encodeToString(data)),
-            corr = data["corr"]?.toString()
-          )
-        } catch(e: Exception) {
-          APIResponse(CR.Invalid(str))
-        }
-      }
-    }
-  }
-}
-
-// ChatResponse
-@Serializable
-sealed class CR {
-  @Serializable @SerialName("activeUser") class ActiveUser(val user: User): CR()
-  @Serializable @SerialName("chatStarted") class ChatStarted: CR()
-  @Serializable @SerialName("chatRunning") class ChatRunning: CR()
-  @Serializable @SerialName("apiChats") class ApiChats(val chats: List<Chat>): CR()
-  @Serializable @SerialName("apiChat") class ApiChat(val chat: Chat): CR()
-  @Serializable @SerialName("userSMPServers") class UserSMPServers(val smpServers: List<String>): CR()
-  @Serializable @SerialName("invitation") class Invitation(val connReqInvitation: String): CR()
-  @Serializable @SerialName("sentConfirmation") class SentConfirmation: CR()
-  @Serializable @SerialName("sentInvitation") class SentInvitation: CR()
-  @Serializable @SerialName("contactAlreadyExists") class ContactAlreadyExists(val contact: Contact): CR()
-  @Serializable @SerialName("contactDeleted") class ContactDeleted(val contact: Contact): CR()
-  @Serializable @SerialName("userProfileNoChange") class UserProfileNoChange: CR()
-  @Serializable @SerialName("userProfileUpdated") class UserProfileUpdated(val fromProfile: Profile, val toProfile: Profile): CR()
-  @Serializable @SerialName("userContactLink") class UserContactLink(val connReqContact: String): CR()
-  @Serializable @SerialName("userContactLinkCreated") class UserContactLinkCreated(val connReqContact: String): CR()
-  @Serializable @SerialName("userContactLinkDeleted") class UserContactLinkDeleted: CR()
-  @Serializable @SerialName("contactConnected") class ContactConnected(val contact: Contact): CR()
-  @Serializable @SerialName("receivedContactRequest") class ReceivedContactRequest(val contactRequest: UserContactRequest): CR()
-  @Serializable @SerialName("acceptingContactRequest") class AcceptingContactRequest(val contact: Contact): CR()
-  @Serializable @SerialName("contactRequestRejected") class ContactRequestRejected: CR()
-  @Serializable @SerialName("contactUpdated") class ContactUpdated(val toContact: Contact): CR()
-  @Serializable @SerialName("contactSubscribed") class ContactSubscribed(val contact: Contact): CR()
-  @Serializable @SerialName("contactDisconnected") class ContactDisconnected(val contact: Contact): CR()
-  @Serializable @SerialName("contactSubError") class ContactSubError(val contact: Contact, val chatError: ChatError): CR()
-  @Serializable @SerialName("contactSubSummary") class ContactSubSummary(val contactSubscriptions: List<ContactSubStatus>): CR()
-  @Serializable @SerialName("groupSubscribed") class GroupSubscribed(val group: GroupInfo): CR()
-  @Serializable @SerialName("memberSubErrors") class MemberSubErrors(val memberSubErrors: List<MemberSubError>): CR()
-  @Serializable @SerialName("groupEmpty") class GroupEmpty(val group: GroupInfo): CR()
-  @Serializable @SerialName("userContactLinkSubscribed") class UserContactLinkSubscribed: CR()
-  @Serializable @SerialName("newChatItem") class NewChatItem(val chatItem: AChatItem): CR()
-  @Serializable @SerialName("chatItemStatusUpdated") class ChatItemStatusUpdated(val chatItem: AChatItem): CR()
-  @Serializable @SerialName("chatItemUpdated") class ChatItemUpdated(val chatItem: AChatItem): CR()
-  @Serializable @SerialName("chatItemDeleted") class ChatItemDeleted(val chatItem: AChatItem): CR()
-  @Serializable @SerialName("cmdOk") class CmdOk: CR()
-  @Serializable @SerialName("chatCmdError") class ChatCmdError(val chatError: ChatError): CR()
-  @Serializable @SerialName("chatError") class ChatRespError(val chatError: ChatError): CR()
-  @Serializable class Response(val type: String, val json: String): CR()
-  @Serializable class Invalid(val str: String): CR()
-
-  val responseType: String get() = when(this) {
-    is ActiveUser -> "activeUser"
-    is ChatStarted -> "chatStarted"
-    is ChatRunning -> "chatRunning"
-    is ApiChats -> "apiChats"
-    is ApiChat -> "apiChat"
-    is UserSMPServers -> "userSMPServers"
-    is Invitation -> "invitation"
-    is SentConfirmation -> "sentConfirmation"
-    is SentInvitation -> "sentInvitation"
-    is ContactAlreadyExists -> "contactAlreadyExists"
-    is ContactDeleted -> "contactDeleted"
-    is UserProfileNoChange -> "userProfileNoChange"
-    is UserProfileUpdated -> "userProfileUpdated"
-    is UserContactLink -> "userContactLink"
-    is UserContactLinkCreated -> "userContactLinkCreated"
-    is UserContactLinkDeleted -> "userContactLinkDeleted"
-    is ContactConnected -> "contactConnected"
-    is ReceivedContactRequest -> "receivedContactRequest"
-    is AcceptingContactRequest -> "acceptingContactRequest"
-    is ContactRequestRejected -> "contactRequestRejected"
-    is ContactUpdated -> "contactUpdated"
-    is ContactSubscribed -> "contactSubscribed"
-    is ContactDisconnected -> "contactDisconnected"
-    is ContactSubError -> "contactSubError"
-    is ContactSubSummary -> "contactSubSummary"
-    is GroupSubscribed -> "groupSubscribed"
-    is MemberSubErrors -> "memberSubErrors"
-    is GroupEmpty -> "groupEmpty"
-    is UserContactLinkSubscribed -> "userContactLinkSubscribed"
-    is NewChatItem -> "newChatItem"
-    is ChatItemStatusUpdated -> "chatItemStatusUpdated"
-    is ChatItemUpdated -> "chatItemUpdated"
-    is ChatItemDeleted -> "chatItemDeleted"
-    is CmdOk -> "cmdOk"
-    is ChatCmdError -> "chatCmdError"
-    is ChatRespError -> "chatError"
-    is Response -> "* $type"
-    is Invalid -> "* invalid json"
-  }
-
-  val details: String get() = when(this) {
-    is ActiveUser -> json.encodeToString(user)
-    is ChatStarted -> noDetails()
-    is ChatRunning -> noDetails()
-    is ApiChats -> json.encodeToString(chats)
-    is ApiChat -> json.encodeToString(chat)
-    is UserSMPServers -> json.encodeToString(smpServers)
-    is Invitation -> connReqInvitation
-    is SentConfirmation -> noDetails()
-    is SentInvitation -> noDetails()
-    is ContactAlreadyExists -> json.encodeToString(contact)
-    is ContactDeleted -> json.encodeToString(contact)
-    is UserProfileNoChange -> noDetails()
-    is UserProfileUpdated -> json.encodeToString(toProfile)
-    is UserContactLink -> connReqContact
-    is UserContactLinkCreated -> connReqContact
-    is UserContactLinkDeleted -> noDetails()
-    is ContactConnected -> json.encodeToString(contact)
-    is ReceivedContactRequest -> json.encodeToString(contactRequest)
-    is AcceptingContactRequest -> json.encodeToString(contact)
-    is ContactRequestRejected -> noDetails()
-    is ContactUpdated -> json.encodeToString(toContact)
-    is ContactSubscribed -> json.encodeToString(contact)
-    is ContactDisconnected -> json.encodeToString(contact)
-    is ContactSubError -> "error:\n${chatError.string}\ncontact:\n${json.encodeToString(contact)}"
-    is ContactSubSummary -> json.encodeToString(contactSubscriptions)
-    is GroupSubscribed -> json.encodeToString(group)
-    is MemberSubErrors -> json.encodeToString(memberSubErrors)
-    is GroupEmpty -> json.encodeToString(group)
-    is UserContactLinkSubscribed -> noDetails()
-    is NewChatItem -> json.encodeToString(chatItem)
-    is ChatItemStatusUpdated -> json.encodeToString(chatItem)
-    is ChatItemUpdated -> json.encodeToString(chatItem)
-    is ChatItemDeleted -> json.encodeToString(chatItem)
-    is CmdOk -> noDetails()
-    is ChatCmdError -> chatError.string
-    is ChatRespError -> chatError.string
-    is Response -> json
-    is Invalid -> str
-  }
-
-  fun noDetails(): String ="${responseType}: no details"
-}
-
-abstract class TerminalItem {
-  abstract val id: Long
-  val date: Instant = Clock.System.now()
-  abstract val label: String
-  abstract val details: String
-
-  class Cmd(override val id: Long, val cmd: CC): TerminalItem() {
-    override val label get() = "> ${cmd.cmdString}"
-    override val details get() = cmd.cmdString
-  }
-
-  class Resp(override val id: Long, val resp: CR): TerminalItem() {
-    override val label get() = "< ${resp.responseType}"
-    override val details get() = resp.details
-  }
-
-  companion object {
-    val sampleData = listOf(
-        Cmd(0, CC.ShowActiveUser()),
-        Resp(1, CR.ActiveUser(User.sampleData))
-    )
-
-    fun cmd(c: CC) = Cmd(System.currentTimeMillis(), c)
-    fun resp(r: CR) = Resp(System.currentTimeMillis(), r)
-  }
-}
-
-@Serializable
-sealed class ChatError {
-  val string: String get() = when (this) {
-    is ChatErrorChat -> "chat ${errorType.string}"
-    is ChatErrorAgent -> "agent ${agentError.string}"
-    is ChatErrorStore -> "store ${storeError.string}"
-  }
-  @Serializable @SerialName("error") class ChatErrorChat(val errorType: ChatErrorType): ChatError()
-  @Serializable @SerialName("errorAgent") class ChatErrorAgent(val agentError: AgentErrorType): ChatError()
-  @Serializable @SerialName("errorStore") class ChatErrorStore(val storeError: StoreError): ChatError()
-}
-
-@Serializable
-sealed class ChatErrorType {
-  val string: String get() = when (this) {
-    is InvalidConnReq -> "invalidConnReq"
-    is ContactGroups -> "groupNames $groupNames"
-  }
-  @Serializable @SerialName("invalidConnReq") class InvalidConnReq: ChatErrorType()
-  @Serializable @SerialName("contactGroups") class ContactGroups(val contact: Contact, val groupNames: List<String>): ChatErrorType()
-}
-
-@Serializable
-sealed class StoreError {
-  val string: String get() = when (this) {
-    is UserContactLinkNotFound -> "userContactLinkNotFound"
-  }
-  @Serializable @SerialName("userContactLinkNotFound") class UserContactLinkNotFound: StoreError()
-}
-
-@Serializable
-sealed class AgentErrorType {
-  val string: String get() = when (this) {
-    is CMD -> "CMD ${cmdErr.string}"
-    is CONN -> "CONN ${connErr.string}"
-    is SMP -> "SMP ${smpErr.string}"
-    is BROKER -> "BROKER ${brokerErr.string}"
-    is AGENT -> "AGENT ${agentErr.string}"
-    is INTERNAL -> "INTERNAL $internalErr"
-  }
-  @Serializable @SerialName("CMD") class CMD(val cmdErr: CommandErrorType): AgentErrorType()
-  @Serializable @SerialName("CONN") class CONN(val connErr: ConnectionErrorType): AgentErrorType()
-  @Serializable @SerialName("SMP") class SMP(val smpErr: SMPErrorType): AgentErrorType()
-  @Serializable @SerialName("BROKER") class BROKER(val brokerErr: BrokerErrorType): AgentErrorType()
-  @Serializable @SerialName("AGENT") class AGENT(val agentErr: SMPAgentError): AgentErrorType()
-  @Serializable @SerialName("INTERNAL") class INTERNAL(val internalErr: String): AgentErrorType()
-}
-
-@Serializable
-sealed class CommandErrorType {
-  val string: String get() = when (this) {
-    is PROHIBITED -> "PROHIBITED"
-    is SYNTAX -> "SYNTAX"
-    is NO_CONN -> "NO_CONN"
-    is SIZE -> "SIZE"
-    is LARGE -> "LARGE"
-  }
-  @Serializable @SerialName("PROHIBITED") class PROHIBITED: CommandErrorType()
-  @Serializable @SerialName("SYNTAX") class SYNTAX: CommandErrorType()
-  @Serializable @SerialName("NO_CONN") class NO_CONN: CommandErrorType()
-  @Serializable @SerialName("SIZE") class SIZE: CommandErrorType()
-  @Serializable @SerialName("LARGE") class LARGE: CommandErrorType()
-}
-
-@Serializable
-sealed class ConnectionErrorType {
-  val string: String get() = when (this) {
-    is NOT_FOUND -> "NOT_FOUND"
-    is DUPLICATE -> "DUPLICATE"
-    is SIMPLEX -> "SIMPLEX"
-    is NOT_ACCEPTED -> "NOT_ACCEPTED"
-    is NOT_AVAILABLE -> "NOT_AVAILABLE"
-  }
-  @Serializable @SerialName("NOT_FOUND") class NOT_FOUND: ConnectionErrorType()
-  @Serializable @SerialName("DUPLICATE") class DUPLICATE: ConnectionErrorType()
-  @Serializable @SerialName("SIMPLEX") class SIMPLEX: ConnectionErrorType()
-  @Serializable @SerialName("NOT_ACCEPTED") class NOT_ACCEPTED: ConnectionErrorType()
-  @Serializable @SerialName("NOT_AVAILABLE") class NOT_AVAILABLE: ConnectionErrorType()
-}
-
-@Serializable
-sealed class BrokerErrorType {
-  val string: String get() = when (this) {
-    is RESPONSE -> "RESPONSE ${smpErr.string}"
-    is UNEXPECTED -> "UNEXPECTED"
-    is NETWORK -> "NETWORK"
-    is TRANSPORT -> "TRANSPORT ${transportErr.string}"
-    is TIMEOUT -> "TIMEOUT"
-  }
-  @Serializable @SerialName("RESPONSE") class RESPONSE(val smpErr: SMPErrorType): BrokerErrorType()
-  @Serializable @SerialName("UNEXPECTED") class UNEXPECTED: BrokerErrorType()
-  @Serializable @SerialName("NETWORK") class NETWORK: BrokerErrorType()
-  @Serializable @SerialName("TRANSPORT") class TRANSPORT(val transportErr: SMPTransportError): BrokerErrorType()
-  @Serializable @SerialName("TIMEOUT") class TIMEOUT: BrokerErrorType()
-}
-
-@Serializable
-sealed class SMPErrorType {
-  val string: String get() = when (this) {
-    is BLOCK -> "BLOCK"
-    is SESSION -> "SESSION"
-    is CMD -> "CMD ${cmdErr.string}"
-    is AUTH -> "AUTH"
-    is QUOTA -> "QUOTA"
-    is NO_MSG -> "NO_MSG"
-    is LARGE_MSG -> "LARGE_MSG"
-    is INTERNAL -> "INTERNAL"
-  }
-  @Serializable @SerialName("BLOCK") class BLOCK: SMPErrorType()
-  @Serializable @SerialName("SESSION") class SESSION: SMPErrorType()
-  @Serializable @SerialName("CMD") class CMD(val cmdErr: SMPCommandError): SMPErrorType()
-  @Serializable @SerialName("AUTH") class AUTH: SMPErrorType()
-  @Serializable @SerialName("QUOTA") class QUOTA: SMPErrorType()
-  @Serializable @SerialName("NO_MSG") class NO_MSG: SMPErrorType()
-  @Serializable @SerialName("LARGE_MSG") class LARGE_MSG: SMPErrorType()
-  @Serializable @SerialName("INTERNAL") class INTERNAL: SMPErrorType()
-}
-
-@Serializable
-sealed class SMPCommandError {
-  val string: String get() = when (this) {
-    is UNKNOWN -> "UNKNOWN"
-    is SYNTAX -> "SYNTAX"
-    is NO_AUTH -> "NO_AUTH"
-    is HAS_AUTH -> "HAS_AUTH"
-    is NO_QUEUE -> "NO_QUEUE"
-  }
-  @Serializable @SerialName("UNKNOWN") class UNKNOWN: SMPCommandError()
-  @Serializable @SerialName("SYNTAX") class SYNTAX: SMPCommandError()
-  @Serializable @SerialName("NO_AUTH") class NO_AUTH: SMPCommandError()
-  @Serializable @SerialName("HAS_AUTH") class HAS_AUTH: SMPCommandError()
-  @Serializable @SerialName("NO_QUEUE") class NO_QUEUE: SMPCommandError()
-}
-
-@Serializable
-sealed class SMPTransportError {
-  val string: String get() = when (this) {
-    is BadBlock -> "badBlock"
-    is LargeMsg -> "largeMsg"
-    is BadSession -> "badSession"
-    is Handshake -> "handshake ${handshakeErr.string}"
-  }
-  @Serializable @SerialName("badBlock") class BadBlock: SMPTransportError()
-  @Serializable @SerialName("largeMsg") class LargeMsg: SMPTransportError()
-  @Serializable @SerialName("badSession") class BadSession: SMPTransportError()
-  @Serializable @SerialName("handshake") class Handshake(val handshakeErr: SMPHandshakeError): SMPTransportError()
-}
-
-@Serializable
-sealed class SMPHandshakeError {
-  val string: String get() = when (this) {
-    is PARSE -> "PARSE"
-    is VERSION -> "VERSION"
-    is IDENTITY -> "IDENTITY"
-  }
-  @Serializable @SerialName("PARSE") class PARSE: SMPHandshakeError()
-  @Serializable @SerialName("VERSION") class VERSION: SMPHandshakeError()
-  @Serializable @SerialName("IDENTITY") class IDENTITY: SMPHandshakeError()
-}
-
-@Serializable
-sealed class SMPAgentError {
-  val string: String get() = when (this) {
-    is A_MESSAGE -> "A_MESSAGE"
-    is A_PROHIBITED -> "A_PROHIBITED"
-    is A_VERSION -> "A_VERSION"
-    is A_ENCRYPTION -> "A_ENCRYPTION"
-  }
-  @Serializable @SerialName("A_MESSAGE") class A_MESSAGE: SMPAgentError()
-  @Serializable @SerialName("A_PROHIBITED") class A_PROHIBITED: SMPAgentError()
-  @Serializable @SerialName("A_VERSION") class A_VERSION: SMPAgentError()
-  @Serializable @SerialName("A_ENCRYPTION") class A_ENCRYPTION: SMPAgentError()
-}

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Color.kt

@@ -1,15 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple200 = Color(0xFFBB86FC)
-val Purple500 = Color(0xFF6200EE)
-val Purple700 = Color(0xFF3700B3)
-val Teal200 = Color(0xFF03DAC5)
-val Gray = Color(0x22222222)
-val SimplexBlue = Color(0, 136, 255, 255)
-val SimplexGreen = Color(98, 196, 103, 255)
-val SecretColor = Color(0x40808080)
-val LightGray = Color(241, 242, 246, 255)
-val DarkGray = Color(43, 44, 46, 255)
-val HighOrLowlight = Color(134, 135, 139, 255)

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Shape.kt

@@ -1,11 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Shapes
-import androidx.compose.ui.unit.dp
-
-val Shapes = Shapes(
-  small = RoundedCornerShape(4.dp),
-  medium = RoundedCornerShape(4.dp),
-  large = RoundedCornerShape(0.dp)
-)

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Theme.kt

@@ -1,48 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-
-private val DarkColorPalette = darkColors(
-  primary = SimplexBlue,
-  primaryVariant = SimplexGreen,
-  secondary = DarkGray,
-//  background = Color.Black,
-//  surface = Color.Black,
-//  background = Color(0xFF121212),
-//  surface = Color(0xFF121212),
-//  error = Color(0xFFCF6679),
-//  onPrimary = Color.Black,
-//  onSecondary = Color.Black,
-//  onBackground = Color.White,
-//  onSurface = Color.White,
-//  onError: Color = Color.Black,
-)
-private val LightColorPalette = lightColors(
-  primary = SimplexBlue,
-  primaryVariant = SimplexGreen,
-  secondary = LightGray,
-//  background = Color.White,
-//  surface = Color.White
-//  onPrimary = Color.White,
-//  onSecondary = Color.Black,
-//  onBackground = Color.Black,
-//  onSurface = Color.Black,
-)
-
-@Composable
-fun SimpleXTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
-  val colors = if (darkTheme) {
-    DarkColorPalette
-  } else {
-    LightColorPalette
-  }
-
-  MaterialTheme(
-    colors = colors,
-    typography = Typography,
-    shapes = Shapes,
-    content = content
-  )
-}

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Type.kt

@@ -1,46 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.material.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-// Set of Material typography styles to start with
-val Typography = Typography(
-  h1 = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 32.sp,
-  ),
-  h2 = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 24.sp
-  ),
-  h3 = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 19.sp
-  ),
-  body1 = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 17.sp
-  ),
-  body2 = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 16.sp
-  ),
-  button = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 16.sp,
-  ),
-  caption = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 20.sp
-  )
-)

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

@@ -1,25 +0,0 @@
-package chat.simplex.app.views
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-
-@Composable
-fun SplashView() {
-  Surface(
-    Modifier
-      .background(MaterialTheme.colors.background)
-      .fillMaxSize()
-  ) {
-//    Image(
-//      painter = painterResource(R.drawable.logo),
-//      contentDescription = "Simplex Icon",
-//      modifier = Modifier
-//        .height(230.dp)
-//        .align(Alignment.Center)
-//    )
-  }
-}

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

@@ -1,107 +0,0 @@
-package chat.simplex.app.views
-
-import android.annotation.SuppressLint
-import android.content.res.Configuration
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.*
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-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.model.*
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.SendMsgView
-import chat.simplex.app.views.helpers.CloseSheetBar
-import chat.simplex.app.views.helpers.withApi
-import chat.simplex.app.views.newchat.ModalManager
-import com.google.accompanist.insets.ProvideWindowInsets
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.launch
-
-@Composable
-fun TerminalView(chatModel: ChatModel, close: () -> Unit) {
-  BackHandler(onBack = close)
-  TerminalLayout(chatModel.terminalItems, close) { cmd ->
-    withApi {
-      // show "in progress"
-      chatModel.controller.sendCmd(CC.Console(cmd))
-      // hide "in progress"
-    }
-  }
-}
-
-@Composable
-fun TerminalLayout(terminalItems: List<TerminalItem>, close: () -> Unit, sendCommand: (String) -> Unit) {
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    Scaffold(
-      topBar = { CloseSheetBar(close) },
-      bottomBar = { SendMsgView(msg = remember { mutableStateOf("") }, sendCommand) },
-      modifier = Modifier.navigationBarsWithImePadding()
-    ) { contentPadding ->
-      Surface(
-        modifier = Modifier
-          .padding(contentPadding)
-          .fillMaxWidth()
-          .background(MaterialTheme.colors.background)
-      ) {
-        TerminalLog(terminalItems)
-      }
-    }
-  }
-}
-
-@Composable
-fun TerminalLog(terminalItems: List<TerminalItem>) {
-  val listState = rememberLazyListState()
-  val scope = rememberCoroutineScope()
-  LazyColumn(state = listState) {
-    items(terminalItems) { item ->
-      Text("${item.date.toString().subSequence(11, 19)} ${item.label}",
-        style = TextStyle(fontFamily = FontFamily.Monospace, fontSize = 18.sp, color = MaterialTheme.colors.primary),
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-        modifier = Modifier
-          .padding(horizontal = 8.dp, vertical = 4.dp)
-          .clickable {
-            ModalManager.shared.showModal {
-              SelectionContainer(modifier = Modifier.verticalScroll(rememberScrollState())) {
-                Text(item.details)
-              }
-            }
-          }
-      )
-    }
-    val len = terminalItems.count()
-    if (len > 1) {
-      scope.launch {
-        listState.animateScrollToItem(len - 1)
-      }
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewTerminalLayout() {
-  SimpleXTheme {
-    TerminalLayout(
-      terminalItems = TerminalItem.sampleData,
-      close = {},
-      sendCommand = {}
-    )
-  }
-}

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

@@ -1,159 +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.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.Profile
-import chat.simplex.app.views.helpers.withApi
-import com.google.accompanist.insets.ProvideWindowInsets
-import com.google.accompanist.insets.navigationBarsWithImePadding
-
-@Composable
-fun WelcomeView(chatModel: ChatModel) {
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    Box(
-      modifier = Modifier
-        .fillMaxSize()
-        .background(color = MaterialTheme.colors.background)
-    ) {
-      Column(
-        verticalArrangement = Arrangement.SpaceBetween,
-        modifier = Modifier
-          .verticalScroll(rememberScrollState())
-          .fillMaxSize()
-          .background(color = MaterialTheme.colors.background)
-          .padding(12.dp)
-      ) {
-        Image(
-          painter = painterResource(R.drawable.logo),
-          contentDescription = "Simplex Logo",
-          modifier = Modifier.padding(vertical = 15.dp)
-        )
-        Text(
-          "You control your chat!",
-          style = MaterialTheme.typography.h4,
-          color = MaterialTheme.colors.onBackground
-        )
-        Text(
-          "The messaging and application platform protecting your privacy and security.",
-          style = MaterialTheme.typography.body1,
-          color = MaterialTheme.colors.onBackground
-        )
-        Spacer(Modifier.height(8.dp))
-        Text(
-          "We don't store any of your contacts or messages (once delivered) on the servers.",
-          style = MaterialTheme.typography.body1,
-          color = MaterialTheme.colors.onBackground
-        )
-        Spacer(Modifier.height(24.dp))
-        CreateProfilePanel(chatModel)
-      }
-    }
-  }
-}
-
-
-fun isValidDisplayName(name: String) : Boolean {
-  return (name.firstOrNull { it.isWhitespace() }) == null
-}
-
-@Composable
-fun CreateProfilePanel(chatModel: ChatModel) {
-  var displayName by remember { mutableStateOf("") }
-  var fullName by remember { mutableStateOf("") }
-
-  Column(
-    modifier=Modifier.fillMaxSize()
-  ) {
-    Text(
-      "Create profile",
-      style = MaterialTheme.typography.h4,
-      color = MaterialTheme.colors.onBackground,
-      modifier = Modifier.padding(vertical = 5.dp)
-    )
-    Text(
-      "Your profile is stored on your device and shared only with your contacts.",
-      style = MaterialTheme.typography.body1,
-      color = MaterialTheme.colors.onBackground
-    )
-    Spacer(Modifier.height(10.dp))
-    Text(
-      "Display Name",
-      style = MaterialTheme.typography.h6,
-      color = MaterialTheme.colors.onBackground,
-      modifier = Modifier.padding(bottom = 3.dp)
-    )
-    BasicTextField(
-      value = displayName,
-      onValueChange = { displayName = it },
-      modifier = Modifier
-        .fillMaxWidth()
-        .background(MaterialTheme.colors.secondary)
-        .height(40.dp)
-        .clip(RoundedCornerShape(5.dp))
-        .padding(8.dp)
-        .navigationBarsWithImePadding(),
-      textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
-      keyboardOptions = KeyboardOptions(
-        capitalization = KeyboardCapitalization.None,
-        autoCorrect = false
-      ),
-      singleLine = true
-    )
-    val errorText = if(!isValidDisplayName(displayName)) "Display name cannot contain whitespace." else ""
-
-    Text(
-      errorText,
-      fontSize = 15.sp,
-      color = MaterialTheme.colors.error
-    )
-
-    Spacer(Modifier.height(3.dp))
-    Text(
-      "Full Name (Optional)",
-      style = MaterialTheme.typography.h6,
-      color = MaterialTheme.colors.onBackground,
-      modifier = Modifier.padding(bottom = 5.dp)
-    )
-    BasicTextField(
-      value = fullName,
-      onValueChange = { fullName = it },
-      modifier = Modifier
-        .fillMaxWidth()
-        .background(MaterialTheme.colors.secondary)
-        .height(40.dp)
-        .clip(RoundedCornerShape(3.dp))
-        .padding(8.dp)
-        .navigationBarsWithImePadding(),
-      textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
-      keyboardOptions = KeyboardOptions(
-        capitalization = KeyboardCapitalization.None,
-        autoCorrect = false
-      ),
-      singleLine = true
-    )
-    Spacer(Modifier.height(20.dp))
-    Button(onClick = {
-      withApi {
-        val user = chatModel.controller.apiCreateActiveUser(
-          Profile(displayName, fullName, null)
-        )
-        chatModel.controller.startChat(user)
-      }
-    },
-    enabled = (displayName.isNotEmpty() && isValidDisplayName(displayName))
-    ) { Text("Create") }
-  }
-}

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

@@ -1,135 +0,0 @@
-package chat.simplex.app.views.chat
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
-import androidx.compose.material.icons.outlined.Circle
-import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun ChatInfoView(chatModel: ChatModel, close: () -> Unit) {
-  BackHandler(onBack = close)
-  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
-  if (chat != null) {
-    ChatInfoLayout(chat,
-      close = close,
-      deleteContact = {
-        AlertManager.shared.showAlertMsg(
-          title = "Delete contact?",
-          text = "Contact and all messages will be deleted - this cannot be undone!",
-          confirmText = "Delete",
-          onConfirm = {
-            val cInfo = chat.chatInfo
-            withApi {
-              val r = chatModel.controller.apiDeleteChat(cInfo.chatType, cInfo.apiId)
-              if (r) {
-                chatModel.removeChat(cInfo.id)
-                chatModel.chatId.value = null
-                close()
-              }
-            }
-          }
-        )
-      }
-    )
-  }
-}
-
-@Composable
-fun ChatInfoLayout(chat: Chat, close: () -> Unit, deleteContact: () -> Unit) {
-  Column(Modifier
-    .fillMaxSize()
-    .background(MaterialTheme.colors.background)
-    .padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    CloseSheetBar(close)
-    Spacer(Modifier.size(48.dp))
-    ChatInfoImage(chat, size = 192.dp)
-    val cInfo = chat.chatInfo
-    Text(
-      cInfo.displayName, style = MaterialTheme.typography.h1,
-      color = MaterialTheme.colors.onBackground,
-      modifier = Modifier.padding(top = 32.dp).padding(bottom = 8.dp)
-    )
-    Text(
-      cInfo.fullName, style = MaterialTheme.typography.h2,
-      color = MaterialTheme.colors.onBackground,
-      modifier = Modifier.padding(bottom = 16.dp)
-    )
-
-    if (cInfo is ChatInfo.Direct) {
-      Column(horizontalAlignment = Alignment.CenterHorizontally) {
-        Row(Modifier.padding(horizontal = 32.dp)) {
-          ServerImage(chat)
-          Text(
-            chat.serverInfo.networkStatus.statusString,
-            textAlign = TextAlign.Center,
-            color = MaterialTheme.colors.onBackground,
-            modifier = Modifier.padding(start = 8.dp)
-          )
-        }
-        Text(
-          chat.serverInfo.networkStatus.statusExplanation,
-          style = MaterialTheme.typography.body2,
-          color = MaterialTheme.colors.onBackground,
-          textAlign = TextAlign.Center,
-          modifier = Modifier.padding(top = 16.dp).padding(horizontal = 16.dp)
-        )
-      }
-
-      Spacer(Modifier.weight(1F))
-
-      Box(Modifier.padding(48.dp)) {
-        SimpleButton(
-          "Delete contact", icon = Icons.Outlined.Delete,
-          color = Color.Red,
-          click = deleteContact
-        )
-      }
-    }
-  }
-}
-
-@Composable
-fun ServerImage(chat: Chat) {
-  val status = chat.serverInfo.networkStatus
-  when {
-    status is Chat.NetworkStatus.Connected ->
-      Icon(Icons.Filled.Circle, "Connected", tint = MaterialTheme.colors.primaryVariant)
-    status is Chat.NetworkStatus.Disconnected ->
-      Icon(Icons.Filled.Pending, "Disconnected", tint = HighOrLowlight)
-    status is Chat.NetworkStatus.Error ->
-      Icon(Icons.Filled.Error, "Error", tint = HighOrLowlight)
-    else ->
-      Icon(Icons.Outlined.Circle, "Pending", tint = HighOrLowlight)
-  }
-}
-
-@Preview
-@Composable
-fun PreviewChatInfoLayout() {
-  SimpleXTheme {
-    ChatInfoLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = arrayListOf(),
-        serverInfo = Chat.ServerInfo(Chat.NetworkStatus.Error("agent BROKER TIMEOUT"))
-      ),
-      close = {}, deleteContact = {}
-    )
-  }
-}

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

@@ -1,259 +0,0 @@
-package chat.simplex.app.views.chat
-
-import android.content.res.Configuration
-import android.util.Log
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ArrowBack
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.mapSaver
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
-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.TAG
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.item.ChatItemView
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.ModalManager
-import com.google.accompanist.insets.ProvideWindowInsets
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.datetime.Clock
-
-@Composable
-fun ChatView(chatModel: ChatModel) {
-  val chat: Chat? = chatModel.chats.firstOrNull { chat -> chat.chatInfo.id == chatModel.chatId.value }
-  val user = chatModel.currentUser.value
-  if (chat == null || user == null) {
-    chatModel.chatId.value = null
-  } else {
-    val quotedItem = remember { mutableStateOf<ChatItem?>(null) }
-    val editingItem = remember { mutableStateOf<ChatItem?>(null) }
-    var msg = remember { mutableStateOf("") }
-    BackHandler { chatModel.chatId.value = null }
-    // TODO a more advanced version would mark as read only if in view
-    LaunchedEffect(chat.chatItems) {
-      Log.d(TAG, "ChatView ${chatModel.chatId.value}: LaunchedEffect")
-      delay(1000L)
-      if (chat.chatItems.count() > 0) {
-        chatModel.markChatItemsRead(chat.chatInfo)
-        withApi {
-          chatModel.controller.apiChatRead(
-            chat.chatInfo.chatType,
-            chat.chatInfo.apiId,
-            CC.ItemRange(chat.chatStats.minUnreadItemId, chat.chatItems.last().id)
-          )
-        }
-      }
-    }
-    ChatLayout(user, chat, chatModel.chatItems, msg, quotedItem, editingItem,
-      back = { chatModel.chatId.value = null },
-      info = { ModalManager.shared.showCustomModal { close -> ChatInfoView(chatModel, close) } },
-      sendMessage = { msg ->
-        withApi {
-          // show "in progress"
-          val cInfo = chat.chatInfo
-          val ei = editingItem.value
-          if (ei != null) {
-            val updatedItem = chatModel.controller.apiUpdateMessage(
-              type = cInfo.chatType,
-              id = cInfo.apiId,
-              itemId = ei.meta.itemId,
-              mc = MsgContent.MCText(msg)
-            )
-            if (updatedItem != null) chatModel.upsertChatItem(cInfo, updatedItem.chatItem)
-          } else {
-            val newItem = chatModel.controller.apiSendMessage(
-              type = cInfo.chatType,
-              id = cInfo.apiId,
-              quotedItemId = quotedItem.value?.meta?.itemId,
-              mc = MsgContent.MCText(msg)
-            )
-            if (newItem != null) chatModel.addChatItem(cInfo, newItem.chatItem)
-          }
-          // hide "in progress"
-          editingItem.value = null
-          quotedItem.value = null
-        }
-      },
-      resetMessage = { msg.value = "" }
-    )
-  }
-}
-
-@Composable
-fun ChatLayout(
-  user: User,
-  chat: Chat,
-  chatItems: List<ChatItem>,
-  msg: MutableState<String>,
-  quotedItem: MutableState<ChatItem?>,
-  editingItem: MutableState<ChatItem?>,
-  back: () -> Unit,
-  info: () -> Unit,
-  sendMessage: (String) -> Unit,
-  resetMessage: () -> Unit
-) {
-  Surface(
-    Modifier
-      .fillMaxWidth()
-      .background(MaterialTheme.colors.background)
-  ) {
-    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-      Scaffold(
-        topBar = { ChatInfoToolbar(chat, back, info) },
-        bottomBar = { ComposeView(msg, quotedItem, editingItem, sendMessage, resetMessage) },
-        modifier = Modifier.navigationBarsWithImePadding()
-      ) { contentPadding ->
-        Box(Modifier.padding(contentPadding)) {
-          ChatItemsList(user, chatItems, msg, quotedItem, editingItem)
-        }
-      }
-    }
-  }
-}
-
-@Composable
-fun ChatInfoToolbar(chat: Chat, back: () -> Unit, info: () -> Unit) {
-  Box(
-    Modifier
-      .height(60.dp)
-      .padding(horizontal = 8.dp),
-    contentAlignment = Alignment.CenterStart
-  ) {
-    IconButton(onClick = back) {
-      Icon(
-        Icons.Outlined.ArrowBack,
-        "Back",
-        tint = MaterialTheme.colors.primary,
-        modifier = Modifier.padding(10.dp)
-      )
-    }
-    Row(
-      Modifier
-        .padding(horizontal = 68.dp)
-        .fillMaxWidth()
-        .clickable(onClick = info),
-      horizontalArrangement = Arrangement.Center,
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      val cInfo = chat.chatInfo
-      ChatInfoImage(chat, size = 40.dp)
-      Column(
-        Modifier.padding(start = 8.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
-      ) {
-        Text(
-          cInfo.displayName, fontWeight = FontWeight.Bold,
-          maxLines = 1, overflow = TextOverflow.Ellipsis
-        )
-        if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName) {
-          Text(
-            cInfo.fullName,
-            maxLines = 1, overflow = TextOverflow.Ellipsis
-          )
-        }
-      }
-    }
-  }
-}
-
-data class CIListState(val scrolled: Boolean, val itemCount: Int, val keyboardState: KeyboardState)
-
-val CIListStateSaver = run {
-  val scrolledKey = "scrolled"
-  val countKey = "itemCount"
-  val keyboardKey = "keyboardState"
-  mapSaver(
-    save = { mapOf(scrolledKey to it.scrolled, countKey to it.itemCount, keyboardKey to it.keyboardState) },
-    restore = { CIListState(it[scrolledKey] as Boolean, it[countKey] as Int, it[keyboardKey] as KeyboardState) }
-  )
-}
-
-@Composable
-fun ChatItemsList(
-  user: User,
-  chatItems: List<ChatItem>,
-  msg: MutableState<String>,
-  quotedItem: MutableState<ChatItem?>,
-  editingItem: MutableState<ChatItem?>
-) {
-  val listState = rememberLazyListState()
-  val keyboardState by getKeyboardState()
-  val ciListState = rememberSaveable(stateSaver = CIListStateSaver) {
-    mutableStateOf(CIListState(false, chatItems.count(), keyboardState))
-  }
-  val scope = rememberCoroutineScope()
-  val uriHandler = LocalUriHandler.current
-  val cxt = LocalContext.current
-  LazyColumn(state = listState) {
-    items(chatItems) { cItem ->
-      ChatItemView(user, cItem, msg, quotedItem, editingItem, cxt, uriHandler)
-    }
-    val len = chatItems.count()
-    if (len > 1 && (keyboardState != ciListState.value.keyboardState || !ciListState.value.scrolled || len != ciListState.value.itemCount)) {
-      scope.launch {
-        ciListState.value = CIListState(true, len, keyboardState)
-        listState.animateScrollToItem(len - 1)
-      }
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatLayout() {
-  SimpleXTheme {
-    val chatItems = listOf(
-      ChatItem.getSampleData(
-        1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      ),
-      ChatItem.getSampleData(
-        2, CIDirection.DirectRcv(), Clock.System.now(), "hello"
-      ),
-      ChatItem.getSampleData(
-        3, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      ),
-      ChatItem.getSampleData(
-        4, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      ),
-      ChatItem.getSampleData(
-        5, CIDirection.DirectRcv(), Clock.System.now(), "hello"
-      )
-    )
-    ChatLayout(
-      user = User.sampleData,
-      chat = Chat(
-        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = chatItems,
-        chatStats = Chat.ChatStats()
-      ),
-      chatItems = chatItems,
-      msg = remember { mutableStateOf("") },
-      quotedItem = remember { mutableStateOf(null) },
-      editingItem = remember { mutableStateOf(null) },
-      back = {},
-      info = {},
-      sendMessage = {},
-      resetMessage = {}
-    )
-  }
-}

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

@@ -1,29 +0,0 @@
-package chat.simplex.app.views.chat
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.runtime.*
-import chat.simplex.app.model.ChatItem
-
-// TODO ComposeState
-
-@Composable
-fun ComposeView(
-  msg: MutableState<String>,
-  quotedItem: MutableState<ChatItem?>,
-  editingItem: MutableState<ChatItem?>,
-  sendMessage: (String) -> Unit,
-  resetMessage: () -> Unit
-) {
-  Column {
-    when {
-      quotedItem.value != null -> {
-        ContextItemView(quotedItem)
-      }
-      editingItem.value != null -> {
-        ContextItemView(editingItem, editing = editingItem.value != null, resetMessage)
-      }
-      else -> {}
-    }
-    SendMsgView(msg, sendMessage, editing = editingItem.value != null)
-  }
-}

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

@@ -1,90 +0,0 @@
-package chat.simplex.app.views.chat
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Close
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.CIDirection
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.item.*
-import kotlinx.datetime.Clock
-
-@Composable
-fun ContextItemView(
-  contextItem: MutableState<ChatItem?>,
-  editing: Boolean = false,
-  resetMessage: () -> Unit = {}
-) {
-  val cxtItem = contextItem.value
-  if (cxtItem != null) {
-    val sent = cxtItem.chatDir.sent
-    Row(
-      Modifier
-        .padding(top = 8.dp)
-        .background(if (sent) SentColorLight else ReceivedColorLight),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      Box(
-        Modifier
-          .padding(start = 16.dp)
-          .padding(vertical = 12.dp)
-          .fillMaxWidth()
-          .weight(1F)
-      ) {
-        ContextItemText(cxtItem)
-      }
-      IconButton(onClick = {
-        contextItem.value = null
-        if (editing) {
-          resetMessage()
-        }
-      }) {
-        Icon(
-          Icons.Outlined.Close,
-          contentDescription = "Cancel",
-          tint = MaterialTheme.colors.primary,
-          modifier = Modifier.padding(10.dp)
-        )
-      }
-    }
-  }
-}
-
-@Composable
-private fun ContextItemText(cxtItem: ChatItem) {
-  val member = cxtItem.memberDisplayName
-  if (member == null) {
-    Text(cxtItem.content.text, maxLines = 3)
-  } else {
-    val annotatedText = buildAnnotatedString {
-      withStyle(boldFont) { append(member) }
-      append(": ${cxtItem.content.text}")
-    }
-    Text(annotatedText, maxLines = 3)
-  }
-}
-
-@Preview
-@Composable
-fun PreviewContextItemView() {
-  SimpleXTheme {
-    ContextItemView(
-      contextItem = remember {
-        mutableStateOf(
-          ChatItem.getSampleData(
-            1, CIDirection.DirectRcv(), Clock.System.now(), "hello"
-          )
-        )
-      }
-    )
-  }
-}

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

@@ -1,122 +0,0 @@
-package chat.simplex.app.views.chat
-
-import android.content.res.Configuration
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-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.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.outlined.ArrowUpward
-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.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.item.*
-
-@Composable
-fun SendMsgView(msg: MutableState<String>, sendMessage: (String) -> Unit, editing: Boolean = false) {
-  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
-  var textStyle by remember { mutableStateOf(smallFont) }
-  BasicTextField(
-    value = msg.value,
-    onValueChange = {
-      msg.value = it
-      textStyle = if (isShortEmoji(it)) {
-        if (it.codePoints().count() < 4) largeEmojiFont else mediumEmojiFont
-      } else {
-        smallFont
-      }
-    },
-    textStyle = textStyle,
-    maxLines = 16,
-    keyboardOptions = KeyboardOptions.Default.copy(
-      capitalization = KeyboardCapitalization.Sentences,
-      autoCorrect = true
-    ),
-    modifier = Modifier.padding(8.dp),
-    cursorBrush = SolidColor(HighOrLowlight),
-    decorationBox = { innerTextField ->
-      Surface(
-        shape = RoundedCornerShape(18.dp),
-        border = BorderStroke(1.dp, MaterialTheme.colors.secondary)
-      ) {
-        Row(
-          Modifier.background(MaterialTheme.colors.background),
-          verticalAlignment = Alignment.Bottom
-        ) {
-          Box(
-            Modifier
-              .weight(1f)
-              .padding(horizontal = 12.dp)
-              .padding(top = 5.dp)
-              .padding(bottom = 7.dp)
-          ) {
-            innerTextField()
-          }
-          val color = if (msg.value.isNotEmpty()) MaterialTheme.colors.primary else Color.Gray
-          Icon(
-            if (editing) Icons.Filled.Check else Icons.Outlined.ArrowUpward,
-            "Send Message",
-            tint = Color.White,
-            modifier = Modifier
-              .size(36.dp)
-              .padding(4.dp)
-              .clip(CircleShape)
-              .background(color)
-              .clickable {
-                if (msg.value.isNotEmpty()) {
-                  sendMessage(msg.value)
-                  msg.value = ""
-                  textStyle = smallFont
-                }
-              }
-          )
-        }
-      }
-    }
-  )
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSendMsgView() {
-  SimpleXTheme {
-    SendMsgView(
-      msg = remember { mutableStateOf("") },
-      sendMessage = { msg -> println(msg) }
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSendMsgViewEditing() {
-  SimpleXTheme {
-    SendMsgView(
-      msg = remember { mutableStateOf("") },
-      sendMessage = { msg -> println(msg) },
-      editing = true
-    )
-  }
-}

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

@@ -1,60 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.Icon
-import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.CIDirection
-import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.HighOrLowlight
-import kotlinx.datetime.Clock
-
-@Composable
-fun CIMetaView(chatItem: ChatItem) {
-  Row(
-    horizontalArrangement = Arrangement.spacedBy(4.dp),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    if (chatItem.meta.itemEdited) {
-      Icon(
-        Icons.Filled.Edit,
-        modifier = Modifier.height(12.dp),
-        contentDescription = "Edited",
-        tint = HighOrLowlight,
-      )
-    }
-    Text(
-      chatItem.timestampText,
-      color = HighOrLowlight,
-      fontSize = 14.sp
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaView() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-    )
-  )
-}
-
-@Preview
-@Composable
-fun PreviewCIMetaViewEdited() {
-  CIMetaView(
-    chatItem = ChatItem.getSampleData(
-      1, CIDirection.DirectSnd(), Clock.System.now(), "hello",
-      itemEdited = true
-    )
-  )
-}

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

@@ -1,110 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import android.content.Context
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.UriHandler
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.copyText
-import chat.simplex.app.views.helpers.shareText
-import kotlinx.datetime.Clock
-
-@Composable
-fun ChatItemView(
-  user: User,
-  cItem: ChatItem,
-  msg: MutableState<String>,
-  quotedItem: MutableState<ChatItem?>,
-  editingItem: MutableState<ChatItem?>,
-  cxt: Context,
-  uriHandler: UriHandler? = null
-) {
-  val sent = cItem.chatDir.sent
-  val alignment = if (sent) Alignment.CenterEnd else Alignment.CenterStart
-  var showMenu by remember { mutableStateOf(false) }
-  Box(
-    modifier = Modifier
-      .padding(bottom = 4.dp)
-      .fillMaxWidth()
-      .padding(
-        start = if (sent) 86.dp else 16.dp,
-        end = if (sent) 16.dp else 86.dp,
-      ),
-    contentAlignment = alignment,
-  ) {
-    Column(Modifier.combinedClickable(onLongClick = { showMenu = true }, onClick = {})) {
-      if (cItem.quotedItem == null && isShortEmoji(cItem.content.text)) {
-        EmojiItemView(cItem)
-      } else {
-        FramedItemView(user, cItem, uriHandler)
-      }
-      DropdownMenu(expanded = showMenu, onDismissRequest = { showMenu = false }) {
-        ItemAction("Reply", Icons.Outlined.Reply, onClick = {
-          editingItem.value = null
-          quotedItem.value = cItem
-          showMenu = false
-        })
-        ItemAction("Share", Icons.Outlined.Share, onClick = {
-          shareText(cxt, cItem.content.text)
-          showMenu = false
-        })
-        ItemAction("Copy", Icons.Outlined.ContentCopy, onClick = {
-          copyText(cxt, cItem.content.text)
-          showMenu = false
-        })
-//        if (cItem.chatDir.sent && cItem.meta.editable) {
-//          ItemAction("Edit", Icons.Filled.Edit, onClick = {
-//            quotedItem.value = null
-//            editingItem.value = cItem
-//            msg.value = cItem.content.text
-//            showMenu = false
-//          })
-//        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit) {
-  DropdownMenuItem(onClick) {
-    Row {
-      Text(
-        text, modifier = Modifier
-          .fillMaxWidth()
-          .weight(1F)
-      )
-      Icon(icon, text, tint = HighOrLowlight)
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewChatItemView() {
-  SimpleXTheme {
-    ChatItemView(
-      User.sampleData,
-      ChatItem.getSampleData(
-        1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
-      ),
-      msg = remember { mutableStateOf("") },
-      quotedItem = remember { mutableStateOf(null) },
-      editingItem = remember { mutableStateOf(null) },
-      cxt = LocalContext.current
-    )
-  }
-}

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

@@ -1,42 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-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.text.TextStyle
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.ChatItem
-
-val largeEmojiFont: TextStyle = TextStyle(fontSize = 48.sp)
-val mediumEmojiFont: TextStyle = TextStyle(fontSize = 36.sp)
-
-@Composable
-fun EmojiItemView(chatItem: ChatItem) {
-  Column(
-    Modifier.padding(vertical = 8.dp, horizontal = 12.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    EmojiText(chatItem.content.text)
-    CIMetaView(chatItem)
-  }
-}
-
-@Composable
-fun EmojiText(text: String) {
-  val s = text.trim()
-  Text(s, style = if (s.codePoints().count() < 4) largeEmojiFont else mediumEmojiFont)
-}
-
-private fun isSimpleEmoji(c: Int): Boolean = c > 0x238C
-
-fun isEmoji(c: Int): Boolean = isSimpleEmoji(c) // || isCombinedIntoEmoji(c)
-
-// TODO count perceived emojis, possibly using icu4j
-fun isShortEmoji(str: String): Boolean {
-  val s = str.trim()
-  return s.codePoints().count() in 1..5 && s.codePoints().allMatch(::isEmoji)
-}

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

@@ -1,155 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.UriHandler
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.tooling.preview.*
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.SimpleXTheme
-import kotlinx.datetime.Clock
-
-val SentColorLight = Color(0x1E45B8FF)
-val ReceivedColorLight = Color(0x20B1B0B5)
-val SentQuoteColorLight = Color(0x2545B8FF)
-val ReceivedQuoteColorLight = Color(0x25B1B0B5)
-
-@Composable
-fun FramedItemView(user: User, ci: ChatItem, uriHandler: UriHandler? = null) {
-  val sent = ci.chatDir.sent
-  Surface(
-    shape = RoundedCornerShape(18.dp),
-    color = if (sent) SentColorLight else ReceivedColorLight
-  ) {
-    Box(contentAlignment = Alignment.BottomEnd) {
-      Column(Modifier.width(IntrinsicSize.Max)) {
-        val qi = ci.quotedItem
-        if (qi != null) {
-          Box(
-            Modifier
-              .background(if (sent) SentQuoteColorLight else ReceivedQuoteColorLight)
-              .padding(vertical = 6.dp, horizontal = 12.dp)
-              .fillMaxWidth()
-          ) {
-            MarkdownText(
-              qi, sender = qi.sender(user), senderBold = true, maxLines = 3,
-              style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface)
-            )
-          }
-        }
-        Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
-          if (ci.formattedText == null && isShortEmoji(ci.content.text)) {
-            Column(
-              Modifier
-                .padding(bottom = 2.dp)
-                .fillMaxWidth(),
-              horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-              EmojiText(ci.content.text)
-              Text("")
-            }
-          } else {
-            MarkdownText(
-              ci.content, ci.formattedText, ci.memberDisplayName,
-              metaText = ci.timestampText, edited = ci.meta.itemEdited, uriHandler = uriHandler, senderBold = true
-            )
-          }
-        }
-      }
-      Box(Modifier.padding(bottom = 6.dp, end = 12.dp)) {
-        CIMetaView(ci)
-      }
-    }
-  }
-}
-
-class EditedProvider: PreviewParameterProvider<Boolean> {
-  override val values = listOf(false, true).asSequence()
-}
-
-@Preview
-@Composable
-fun PreviewTextItemViewSnd(@PreviewParameter(EditedProvider::class) edited: Boolean) {
-  SimpleXTheme {
-    FramedItemView(
-      User.sampleData,
-      ChatItem.getSampleData(
-        1, CIDirection.DirectSnd(), Clock.System.now(), "hello", itemEdited = edited
-      )
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewTextItemViewRcv(@PreviewParameter(EditedProvider::class) edited: Boolean) {
-  SimpleXTheme {
-    FramedItemView(
-      User.sampleData,
-      ChatItem.getSampleData(
-        1, CIDirection.DirectRcv(), Clock.System.now(), "hello", itemEdited = edited
-      )
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewTextItemViewLong(@PreviewParameter(EditedProvider::class) edited: Boolean) {
-  SimpleXTheme {
-    FramedItemView(
-      User.sampleData,
-      ChatItem.getSampleData(
-        1,
-        CIDirection.DirectSnd(),
-        Clock.System.now(),
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
-        itemEdited = edited
-      )
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewTextItemViewQuote(@PreviewParameter(EditedProvider::class) edited: Boolean) {
-  SimpleXTheme {
-    FramedItemView(
-      User.sampleData,
-      ChatItem.getSampleData(
-        1, CIDirection.DirectSnd(),
-        Clock.System.now(),
-        "https://simplex.chat",
-        CIStatus.SndSent(),
-        quotedItem = CIQuote.getSample(1, Clock.System.now(), "hi", chatDir = CIDirection.DirectRcv()),
-        itemEdited = edited
-      )
-    )
-  }
-}
-
-@Preview
-@Composable
-fun PreviewTextItemViewEmoji(@PreviewParameter(EditedProvider::class) edited: Boolean) {
-  SimpleXTheme {
-    FramedItemView(
-      User.sampleData,
-      ChatItem.getSampleData(
-        1, CIDirection.DirectSnd(),
-        Clock.System.now(),
-        "👍",
-        CIStatus.SndSent(),
-        quotedItem = CIQuote.getSample(1, Clock.System.now(), "Lorem ipsum dolor sit amet", chatDir = CIDirection.DirectRcv()),
-        itemEdited = edited
-      )
-    )
-  }
-}

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

@@ -1,89 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.UriHandler
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.*
-
-val reserveTimestampStyle = SpanStyle(color = Color.Transparent)
-val boldFont = SpanStyle(fontWeight = FontWeight.Medium)
-
-fun appendGroupMember(b: AnnotatedString.Builder, chatItem: ChatItem, groupMemberBold: Boolean) {
-  if (chatItem.chatDir is CIDirection.GroupRcv) {
-    val name = chatItem.chatDir.groupMember.memberProfile.displayName
-    if (groupMemberBold) b.withStyle(boldFont) { append(name) }
-    else b.append(name)
-    b.append(": ")
-  }
-}
-
-fun appendSender(b: AnnotatedString.Builder, sender: String?, senderBold: Boolean) {
-  if (sender != null) {
-    if (senderBold) b.withStyle(boldFont) { append(sender) }
-    else b.append(sender)
-    b.append(": ")
-  }
-}
-
-@Composable
-fun MarkdownText (
-  content: ItemContent,
-  formattedText: List<FormattedText>? = null,
-  sender: String? = null,
-  metaText: String? = null,
-  edited: Boolean = false,
-  style: TextStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onSurface, lineHeight = 22.sp),
-  maxLines: Int = Int.MAX_VALUE,
-  overflow: TextOverflow = TextOverflow.Clip,
-  uriHandler: UriHandler? = null,
-  senderBold: Boolean = false,
-  modifier: Modifier = Modifier
-) {
-  val reserve = if (edited) "      " else "   "
-  if (formattedText == null) {
-    val annotatedText = buildAnnotatedString {
-      appendSender(this, sender, senderBold)
-      append(content.text)
-      if (metaText != null) withStyle(reserveTimestampStyle) { append(reserve + metaText) }
-    }
-    Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow)
-  } else {
-    var hasLinks = false
-    val annotatedText = buildAnnotatedString {
-      appendSender(this, sender, senderBold)
-      for (ft in formattedText) {
-        if (ft.format == null) append(ft.text)
-        else {
-          val link = ft.link
-          if (link != null) {
-            hasLinks = true
-            withAnnotation(tag = "URL", annotation = link) {
-              withStyle(ft.format.style) { append(ft.text) }
-            }
-          } else {
-            withStyle(ft.format.style) { append(ft.text) }
-          }
-        }
-      }
-      if (metaText != null) withStyle(reserveTimestampStyle) { append(reserve + metaText) }
-    }
-    if (hasLinks && uriHandler != null) {
-      ClickableText(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow,
-        onClick = { offset ->
-          annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
-            .firstOrNull()?.let { annotation -> uriHandler.openUri(annotation.item) }
-        }
-      )
-    } else {
-      Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow)
-    }
-  }
-}

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

@@ -1,117 +0,0 @@
-package chat.simplex.app.views.chat
-
-import android.content.res.Configuration
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.PersonAdd
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalUriHandler
-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 chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.usersettings.simplexTeamUri
-
-val bold = SpanStyle(fontWeight = FontWeight.Bold)
-
-@Composable
-fun ChatHelpView(addContact: (() -> Unit)? = null) {
-  Column(
-    horizontalAlignment = Alignment.Start,
-    verticalArrangement = Arrangement.spacedBy(10.dp)
-  ) {
-    val uriHandler = LocalUriHandler.current
-
-    Text("Thank you for installing SimpleX Chat!")
-    Text(
-      buildAnnotatedString {
-        append("You can ")
-        withStyle(SpanStyle(color = MaterialTheme.colors.primary)) {
-          append("connect to SimpleX Chat founder")
-        }
-        append(".")
-      },
-      modifier = Modifier.clickable(onClick = {
-        uriHandler.openUri(simplexTeamUri)
-      })
-    )
-
-    Column(
-      Modifier.padding(top = 24.dp),
-      horizontalAlignment = Alignment.Start,
-      verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      Text(
-        "To start a new chat",
-        style = MaterialTheme.typography.h2
-      )
-      Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(8.dp)
-      ) {
-        Text("Tap button")
-        Icon(
-          Icons.Outlined.PersonAdd,
-          "Add Contact",
-          modifier = if (addContact != null) Modifier.clickable(onClick = addContact) else Modifier,
-        )
-        Text("above, then:")
-      }
-      Text(
-        buildAnnotatedString {
-          withStyle(bold) { append("Add new contact") }
-          append(": to create your one-time QR Code for your contact.")
-        }
-      )
-      Text(
-        buildAnnotatedString {
-          withStyle(bold) { append("Scan QR code") }
-          append(": to connect to your contact who shows QR code to you.")
-        }
-      )
-    }
-
-    Column(
-      Modifier.padding(top = 24.dp),
-      horizontalAlignment = Alignment.Start,
-      verticalArrangement = Arrangement.spacedBy(10.dp)
-    ) {
-      Text("To connect via link", style = MaterialTheme.typography.h2)
-      Text("If you received SimpleX Chat invitation link you can open it in your browser:")
-      Text(
-        buildAnnotatedString {
-          append("\uD83D\uDCBB desktop: scan displayed QR code from the app, via ")
-          withStyle(bold) { append("Scan QR code") }
-          append(".")
-        }
-      )
-      Text(
-        buildAnnotatedString {
-          append("\uD83D\uDCF1 mobile: tap ")
-          withStyle(bold) { append("Open in mobile app") }
-          append(", then tap ")
-          withStyle(bold) { append("Connect") }
-          append(" in the app.")
-        }
-      )
-    }
-  }
-}
-
-@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/ChatListNavLinkView.kt

@@ -1,165 +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.Divider
-import androidx.compose.material.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.toMutableStateList
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.AlertManager
-import chat.simplex.app.views.helpers.withApi
-import kotlinx.datetime.Clock
-
-@Composable
-fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
-  ChatListNavLinkLayout(
-    chat = chat,
-    click = {
-      if (chat.chatInfo is ChatInfo.ContactRequest) {
-        contactRequestAlertDialog(chat.chatInfo, chatModel)
-      } else {
-        withApi { openChat(chatModel, chat.chatInfo) }
-      }
-    }
-  )
-}
-
-suspend fun openChat(chatModel: ChatModel, cInfo: ChatInfo) {
-  val chat = chatModel.controller.apiGetChat(cInfo.chatType, cInfo.apiId)
-  if (chat != null) {
-    chatModel.chatItems = chat.chatItems.toMutableStateList()
-    chatModel.chatId.value = cInfo.id
-  }
-}
-
-fun contactRequestAlertDialog(contactRequest: ChatInfo.ContactRequest, chatModel: ChatModel) {
-  AlertManager.shared.showAlertDialog(
-    title = "Accept connection request?",
-    text = "If you choose to reject sender will NOT be notified",
-    confirmText = "Accept",
-    onConfirm = {
-      withApi {
-        val contact = chatModel.controller.apiAcceptContactRequest(contactRequest.apiId)
-        if (contact != null) {
-          val chat = Chat(ChatInfo.Direct(contact), listOf())
-          chatModel.replaceChat(contactRequest.id, chat)
-        }
-      }
-    },
-    dismissText = "Reject",
-    onDismiss = {
-      withApi {
-        chatModel.controller.apiRejectContactRequest(contactRequest.apiId)
-        chatModel.removeChat(contactRequest.id)
-      }
-    }
-  )
-}
-
-@Composable
-fun ChatListNavLinkLayout(chat: Chat, click: () -> Unit) {
-  Surface(
-    modifier = Modifier
-      .fillMaxWidth()
-      .clickable(onClick = click)
-      .height(88.dp)
-  ) {
-    Row(
-      modifier = Modifier
-        .fillMaxWidth()
-        .padding(vertical = 8.dp)
-        .padding(start = 8.dp)
-        .padding(end = 12.dp),
-      verticalAlignment = Alignment.Top
-    ) {
-      if (chat.chatInfo is ChatInfo.ContactRequest) {
-        ContactRequestView(chat)
-      } else {
-        ChatPreviewView(chat)
-      }
-    }
-  }
-  Divider(Modifier.padding(horizontal = 8.dp))
-}
-
-@Preview
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatListNavLinkDirect() {
-  SimpleXTheme {
-    ChatListNavLinkLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = listOf(
-          ChatItem.getSampleData(
-            1,
-            CIDirection.DirectSnd(),
-            Clock.System.now(),
-            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
-          )
-        ),
-        chatStats = Chat.ChatStats()
-      ),
-      click = {}
-    )
-  }
-}
-
-@Preview
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatListNavLinkGroup() {
-  SimpleXTheme {
-    ChatListNavLinkLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Group.sampleData,
-        chatItems = listOf(
-          ChatItem.getSampleData(
-            1,
-            CIDirection.DirectSnd(),
-            Clock.System.now(),
-            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
-          )
-        ),
-        chatStats = Chat.ChatStats()
-      ),
-      click = {}
-    )
-  }
-}
-
-@Preview
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatListNavLinkContactRequest() {
-  SimpleXTheme {
-    ChatListNavLinkLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.ContactRequest.sampleData,
-        chatItems = listOf(),
-        chatStats = Chat.ChatStats()
-      ),
-      click = {}
-    )
-  }
-}

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

@@ -1,176 +0,0 @@
-package chat.simplex.app.views.chatlist
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.views.chat.ChatHelpView
-import chat.simplex.app.views.newchat.NewChatSheet
-import chat.simplex.app.views.usersettings.SettingsView
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-
-class ScaffoldController(val scope: CoroutineScope) {
-  lateinit var state: BottomSheetScaffoldState
-  val expanded = mutableStateOf(false)
-
-  fun expand() {
-    expanded.value = true
-    scope.launch { state.bottomSheetState.expand() }
-  }
-
-  fun collapse() {
-    expanded.value = false
-    scope.launch { state.bottomSheetState.collapse() }
-  }
-
-  fun toggleSheet() {
-    if (state.bottomSheetState.isExpanded) collapse() else expand()
-  }
-
-  fun toggleDrawer() = scope.launch {
-    state.drawerState.apply { if (isClosed) open() else close() }
-  }
-}
-
-@Composable
-fun scaffoldController(): ScaffoldController {
-  val ctrl = ScaffoldController(scope = rememberCoroutineScope())
-  val bottomSheetState = rememberBottomSheetState(
-    BottomSheetValue.Collapsed,
-    confirmStateChange = {
-      ctrl.expanded.value = it == BottomSheetValue.Expanded
-      true
-    }
-  )
-  ctrl.state = rememberBottomSheetScaffoldState(bottomSheetState = bottomSheetState)
-  return ctrl
-}
-
-@Composable
-fun ChatListView(chatModel: ChatModel) {
-  val scaffoldCtrl = scaffoldController()
-  BottomSheetScaffold(
-    scaffoldState = scaffoldCtrl.state,
-    drawerContent = { SettingsView(chatModel) },
-    sheetPeekHeight = 0.dp,
-    sheetContent = { NewChatSheet(chatModel, scaffoldCtrl) },
-    sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp),
-  ) {
-    Box {
-      Column(
-        modifier = Modifier
-          .fillMaxSize()
-          .background(MaterialTheme.colors.background)
-      ) {
-        ChatListToolbar(scaffoldCtrl)
-        if (chatModel.chats.isNotEmpty()) {
-          ChatList(chatModel)
-        } else {
-          val user = chatModel.currentUser.value
-          Help(scaffoldCtrl, displayName = user?.profile?.displayName)
-        }
-      }
-      if (scaffoldCtrl.expanded.value) {
-        Surface(
-          Modifier
-            .fillMaxSize()
-            .clickable { scaffoldCtrl.collapse() },
-          color = Color.Black.copy(alpha = 0.12F)
-        ) {}
-      }
-    }
-  }
-}
-
-@Composable
-fun Help(scaffoldCtrl: ScaffoldController, displayName: String?) {
-  Column(
-    Modifier
-      .fillMaxWidth()
-      .padding(8.dp)
-  ) {
-    Text(
-      text = if (displayName != null) "Welcome ${displayName}!" else "Welcome!",
-      Modifier.padding(bottom = 24.dp),
-      style = MaterialTheme.typography.h1,
-      color = MaterialTheme.colors.onBackground
-    )
-    ChatHelpView({ scaffoldCtrl.toggleSheet() })
-    Row(
-      Modifier.padding(top = 30.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
-      Text(
-        "This text is available in settings",
-        color = MaterialTheme.colors.onBackground
-      )
-      Icon(
-        Icons.Outlined.Settings,
-        "Settings",
-        tint = MaterialTheme.colors.onBackground,
-        modifier = Modifier.clickable(onClick = { scaffoldCtrl.toggleDrawer() })
-      )
-    }
-  }
-}
-
-@Composable
-fun ChatListToolbar(scaffoldCtrl: ScaffoldController) {
-  Row(
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically,
-    modifier = Modifier
-      .fillMaxWidth()
-      .padding(horizontal = 8.dp)
-      .height(60.dp)
-  ) {
-    IconButton(onClick = { scaffoldCtrl.toggleDrawer() }) {
-      Icon(
-        Icons.Outlined.Menu,
-        "Settings",
-        tint = MaterialTheme.colors.primary,
-        modifier = Modifier.padding(10.dp)
-      )
-    }
-    Text(
-      "Your chats",
-      color = MaterialTheme.colors.onBackground,
-      fontWeight = FontWeight.Bold,
-      modifier = Modifier.padding(5.dp)
-    )
-    IconButton(onClick = { scaffoldCtrl.toggleSheet() }) {
-      Icon(
-        Icons.Outlined.PersonAdd,
-        "Add Contact",
-        tint = MaterialTheme.colors.primary,
-        modifier = Modifier.padding(10.dp)
-      )
-    }
-  }
-}
-
-@Composable
-fun ChatList(chatModel: ChatModel) {
-  Divider(Modifier.padding(horizontal = 8.dp))
-  LazyColumn(
-    modifier = Modifier.fillMaxWidth()
-  ) {
-    items(chatModel.chats) { chat ->
-      ChatListNavLinkView(chat, chatModel)
-    }
-  }
-}

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

@@ -1,92 +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.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-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.model.Chat
-import chat.simplex.app.model.getTimestampText
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.item.MarkdownText
-import chat.simplex.app.views.helpers.ChatInfoImage
-import chat.simplex.app.views.helpers.badgeLayout
-
-@Composable
-fun ChatPreviewView(chat: Chat) {
-  Row {
-    ChatInfoImage(chat, size = 72.dp)
-    Column(
-      modifier = Modifier
-        .padding(horizontal = 8.dp)
-        .weight(1F)
-    ) {
-      Text(
-        chat.chatInfo.chatViewName,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-        style = MaterialTheme.typography.h3,
-        fontWeight = FontWeight.Bold
-      )
-
-      val ci = chat.chatItems.lastOrNull()
-      if (ci != null) {
-        MarkdownText(
-          ci.content,  ci.formattedText, ci.memberDisplayName,
-          metaText = ci.timestampText,
-          maxLines = 2,
-          overflow = TextOverflow.Ellipsis
-        )
-      }
-    }
-    val ts = chat.chatItems.lastOrNull()?.timestampText ?: getTimestampText(chat.chatInfo.createdAt)
-    Column(
-      Modifier.fillMaxHeight(),
-      verticalArrangement = Arrangement.Top
-    ) {
-      Text(
-        ts,
-        color = HighOrLowlight,
-        style = MaterialTheme.typography.body2,
-        modifier = Modifier.padding(bottom = 5.dp)
-      )
-      val n = chat.chatStats.unreadCount
-      if (n > 0) {
-        Text(
-          if (n < 1000) "$n" else "${n / 1000}k",
-          color = MaterialTheme.colors.onPrimary,
-          fontSize = 14.sp,
-          modifier = Modifier
-            .background(MaterialTheme.colors.primary, shape = CircleShape)
-            .align(Alignment.End)
-            .badgeLayout()
-            .padding(horizontal = 3.dp)
-            .padding(vertical = 1.dp)
-        )
-      }
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewChatPreviewView() {
-  SimpleXTheme {
-    ChatPreviewView(Chat.sampleData)
-  }
-}

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

@@ -1,52 +0,0 @@
-package chat.simplex.app.views.chatlist
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.Chat
-import chat.simplex.app.model.getTimestampText
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.views.helpers.ChatInfoImage
-
-@Composable
-fun ContactRequestView(chat: Chat) {
-  Row {
-    ChatInfoImage(chat, size = 72.dp)
-    Column(
-      modifier = Modifier
-        .padding(horizontal = 8.dp)
-        .weight(1F)
-    ) {
-      Text(
-        chat.chatInfo.chatViewName,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-        style = MaterialTheme.typography.h3,
-        fontWeight = FontWeight.Bold,
-        color = MaterialTheme.colors.primary
-      )
-      Text(
-        "wants to connect to you!",
-        maxLines = 2,
-        overflow = TextOverflow.Ellipsis
-      )
-    }
-    val ts = getTimestampText(chat.chatInfo.createdAt)
-    Column(
-      Modifier.fillMaxHeight(),
-      verticalArrangement = Arrangement.Top
-    ) {
-      Text(
-        ts,
-        color = HighOrLowlight,
-        style = MaterialTheme.typography.body2,
-        modifier = Modifier.padding(bottom = 5.dp)
-      )
-    }
-  }
-}

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

@@ -1,82 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.util.Log
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import chat.simplex.app.TAG
-
-class AlertManager {
-  var alertView = mutableStateOf<(@Composable () -> Unit)?>(null)
-  var presentAlert = mutableStateOf<Boolean>(false)
-
-  fun showAlert(alert: @Composable () -> Unit) {
-    Log.d(TAG, "AlertManager.showAlert")
-    alertView.value = alert
-    presentAlert.value = true
-  }
-
-  fun hideAlert() {
-    presentAlert.value = false
-    alertView.value = null
-  }
-
-  fun showAlertDialog(
-    title: String,
-    text: String? = null,
-    confirmText: String = "Ok",
-    onConfirm: (() -> Unit)? = null,
-    dismissText: String = "Cancel",
-    onDismiss: (() -> Unit)? = null
-  ) {
-    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
-    showAlert {
-      AlertDialog(
-        onDismissRequest = this::hideAlert,
-        title = { Text(title) },
-        text = alertText,
-        confirmButton = {
-          Button(onClick = {
-            onConfirm?.invoke()
-            hideAlert()
-          }) { Text(confirmText) }
-        },
-        dismissButton = {
-          Button(onClick = {
-            onDismiss?.invoke()
-            hideAlert()
-          }) { Text(dismissText) }
-        }
-      )
-    }
-  }
-
-  fun showAlertMsg(
-    title: String, text: String? = null,
-    confirmText: String = "Ok", onConfirm: (() -> Unit)? = null
-  ) {
-    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
-    showAlert {
-      AlertDialog(
-        onDismissRequest = this::hideAlert,
-        title = { Text(title) },
-        text = alertText,
-        confirmButton = {
-          Button(onClick = {
-            onConfirm?.invoke()
-            hideAlert()
-          }) { Text(confirmText) }
-        }
-      )
-    }
-  }
-
-  @Composable
-  fun showInView() {
-    if (presentAlert.value) alertView.value?.invoke()
-  }
-
-  companion object {
-    val shared = AlertManager()
-  }
-}

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

@@ -1,67 +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.material.icons.Icons
-import androidx.compose.material.icons.filled.AccountCircle
-import androidx.compose.material.icons.filled.SupervisedUserCircle
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.Chat
-import chat.simplex.app.model.ChatInfo
-import chat.simplex.app.ui.theme.SimpleXTheme
-
-@Composable
-fun ChatInfoImage(chat: Chat, size: Dp) {
-  val icon =
-    if (chat.chatInfo is ChatInfo.Group) Icons.Filled.SupervisedUserCircle
-                                    else Icons.Filled.AccountCircle
-  ProfileImage(size, chat.chatInfo.image, icon)
-}
-
-@Composable
-fun ProfileImage(
-  size: Dp,
-  image: String? = null,
-  icon: ImageVector = Icons.Filled.AccountCircle
-) {
-  Box(Modifier.size(size)) {
-    if (image == null) {
-      Icon(
-        icon,
-        contentDescription = "profile image placeholder",
-        tint = MaterialTheme.colors.secondary,
-        modifier = Modifier.fillMaxSize()
-      )
-    } else {
-      val imageBitmap = base64ToBitmap(image).asImageBitmap()
-      Image(
-        imageBitmap,
-        "profile image",
-        contentScale = ContentScale.Crop,
-        modifier = Modifier.size(size).padding(size / 12).clip(CircleShape)
-      )
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewChatInfoImage() {
-  SimpleXTheme {
-    ChatInfoImage(
-      chat = Chat(chatInfo = ChatInfo.Direct.sampleData, chatItems = arrayListOf()),
-      size = 55.dp
-    )
-  }
-}

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

@@ -1,46 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Close
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.ui.theme.SimpleXTheme
-
-@Composable
-fun CloseSheetBar(close: () -> Unit) {
-  Row (
-    Modifier
-      .fillMaxWidth()
-      .height(60.dp),
-    horizontalArrangement = Arrangement.End,
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    IconButton(onClick = close) {
-      Icon(
-        Icons.Outlined.Close,
-        "Close button",
-        tint = MaterialTheme.colors.primary,
-        modifier = Modifier.padding(10.dp)
-      )
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewCloseSheetBar() {
-  SimpleXTheme {
-    CloseSheetBar(close = {})
-  }
-}

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

@@ -1,187 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.Manifest
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.graphics.*
-import android.net.Uri
-import android.provider.MediaStore
-import android.util.Base64
-import android.util.Log
-import android.widget.Toast
-import androidx.activity.compose.ManagedActivityResultLauncher
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.CallSuper
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Collections
-import androidx.compose.material.icons.outlined.PhotoCamera
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import chat.simplex.app.BuildConfig
-import chat.simplex.app.TAG
-import chat.simplex.app.views.newchat.ActionButton
-import java.io.ByteArrayOutputStream
-import java.io.File
-
-// Inspired by https://github.com/MakeItEasyDev/Jetpack-Compose-Capture-Image-Or-Choose-from-Gallery
-
-fun bitmapToBase64(bitmap: Bitmap, squareCrop: Boolean = true): String {
-  val size = 104
-  var height = size
-  var width = size
-  var xOffset = 0
-  var yOffset = 0
-  if (bitmap.height < bitmap.width) {
-    width = height * bitmap.width / bitmap.height
-    xOffset = (width - height) / 2
-  } else {
-    height = width * bitmap.height / bitmap.width
-    yOffset = (height - width) / 2
-  }
-  var image = bitmap
-  while (image.width / 2 > width) {
-    image = Bitmap.createScaledBitmap(image, image.width / 2, image.height / 2, true)
-  }
-  image = Bitmap.createScaledBitmap(image, width, height, true)
-  if (squareCrop) {
-    image = Bitmap.createBitmap(image, xOffset, yOffset, size, size)
-  }
-  val stream = ByteArrayOutputStream()
-  image.compress(Bitmap.CompressFormat.JPEG, 85, stream)
-  return "data:image/jpg;base64," + Base64.encodeToString(stream.toByteArray(), Base64.NO_WRAP)
-}
-
-fun base64ToBitmap(base64ImageString: String) : Bitmap {
-  val imageString = base64ImageString
-    .removePrefix("data:image/png;base64,")
-    .removePrefix("data:image/jpg;base64,")
-  val imageBytes = Base64.decode(imageString, Base64.NO_WRAP)
-  return BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
-}
-
-class CustomTakePicturePreview : ActivityResultContract<Void?, Bitmap?>() {
-  private var uri: Uri? = null
-  private var tmpFile: File? = null
-  lateinit var externalContext: Context
-
-  @CallSuper
-  override fun createIntent(context: Context, input: Void?): Intent {
-    externalContext = context
-    tmpFile = File.createTempFile("image", ".bmp", context.filesDir)
-    uri = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", tmpFile!!)
-    return Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-      .putExtra(MediaStore.EXTRA_OUTPUT, uri)
-  }
-
-  override fun getSynchronousResult(
-    context: Context,
-    input: Void?
-  ): SynchronousResult<Bitmap?>? = null
-
-  override fun parseResult(resultCode: Int, intent: Intent?): Bitmap? {
-    return if (resultCode == Activity.RESULT_OK && uri != null) {
-      val source = ImageDecoder.createSource(externalContext.contentResolver, uri!!)
-      val bitmap = ImageDecoder.decodeBitmap(source)
-      tmpFile?.delete()
-      bitmap
-    } else {
-      Log.e( TAG, "Getting image from camera cancelled or failed.")
-      tmpFile?.delete()
-      null
-    }
-  }
-}
-
-@Composable
-fun rememberGalleryLauncher(cb: (Uri?) -> Unit): ManagedActivityResultLauncher<String, Uri?> =
-  rememberLauncherForActivityResult(contract = ActivityResultContracts.GetContent(), cb)
-
-@Composable
-fun rememberCameraLauncher(cb: (Bitmap?) -> Unit): ManagedActivityResultLauncher<Void?, Bitmap?> =
-  rememberLauncherForActivityResult(contract = CustomTakePicturePreview(), cb)
-
-@Composable
-fun rememberPermissionLauncher(cb: (Boolean) -> Unit): ManagedActivityResultLauncher<String, Boolean> =
-  rememberLauncherForActivityResult(contract = ActivityResultContracts.RequestPermission(), cb)
-
-@Composable
-fun GetImageBottomSheet(
-  profileImageStr: MutableState<String?>,
-  hideBottomSheet: () -> Unit
-) {
-  val context = LocalContext.current
-  val isCameraSelected = remember { mutableStateOf (false) }
-
-  val galleryLauncher = rememberGalleryLauncher { uri: Uri? ->
-    if (uri != null) {
-      val source = ImageDecoder.createSource(context.contentResolver, uri)
-      val bitmap = ImageDecoder.decodeBitmap(source)
-      profileImageStr.value = bitmapToBase64(bitmap)
-    }
-  }
-
-  val cameraLauncher = rememberCameraLauncher { bitmap: Bitmap? ->
-    if (bitmap != null) profileImageStr.value = bitmapToBase64(bitmap)
-  }
-
-  val permissionLauncher = rememberPermissionLauncher { isGranted: Boolean ->
-    if (isGranted) {
-      if (isCameraSelected.value) cameraLauncher.launch(null)
-      else galleryLauncher.launch("image/*")
-      hideBottomSheet()
-    } else {
-      Toast.makeText(context, "Permission Denied!", Toast.LENGTH_SHORT).show()
-    }
-  }
-
-  Box(
-    modifier = Modifier
-      .fillMaxWidth()
-      .wrapContentHeight()
-      .onFocusChanged { focusState ->
-        if (!focusState.hasFocus) hideBottomSheet()
-      }
-  ) {
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(horizontal = 8.dp, vertical = 30.dp),
-      horizontalArrangement = Arrangement.SpaceEvenly
-    ) {
-      ActionButton(null, "Use Camera", icon = Icons.Outlined.PhotoCamera) {
-        when (PackageManager.PERMISSION_GRANTED) {
-          ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) -> {
-            cameraLauncher.launch(null)
-            hideBottomSheet()
-          }
-          else -> {
-            isCameraSelected.value = true
-            permissionLauncher.launch(Manifest.permission.CAMERA)
-          }
-        }
-      }
-      ActionButton(null, "From Gallery", icon = Icons.Outlined.Collections) {
-        when (PackageManager.PERMISSION_GRANTED) {
-          ContextCompat.checkSelfPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE) -> {
-            galleryLauncher.launch("image/*")
-            hideBottomSheet()
-          }
-          else -> {
-            isCameraSelected.value = false
-            permissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
-          }
-        }
-      }
-    }
-  }
-}

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

@@ -1,60 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.util.Log
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.TAG
-import chat.simplex.app.views.helpers.CloseSheetBar
-
-@Composable
-fun ModalView(close: () -> Unit, content: @Composable () -> Unit) {
-  BackHandler(onBack = close)
-  Surface(
-    Modifier
-      .background(MaterialTheme.colors.background)
-      .fillMaxSize()
-  ) {
-    Column {
-      CloseSheetBar(close)
-      Box(Modifier.padding(horizontal = 16.dp)) { content() }
-    }
-  }
-}
-
-class ModalManager {
-  private val modalViews = arrayListOf<(@Composable (close: () -> Unit) -> Unit)?>()
-  private val modalCount = mutableStateOf(0)
-
-  fun showModal(content: @Composable () -> Unit) {
-    showCustomModal { close -> ModalView(close, content) }
-  }
-
-  fun showCustomModal(modal: @Composable (close: () -> Unit) -> Unit) {
-    Log.d(TAG, "ModalManager.showModal")
-    modalViews.add(modal)
-    modalCount.value = modalViews.count()
-  }
-
-  fun closeModal() {
-    if (!modalViews.isEmpty()) {
-      modalViews.removeAt(modalViews.count() - 1)
-    }
-    modalCount.value = modalViews.count()
-  }
-
-  @Composable
-  fun showInView() {
-    if (modalCount.value > 0) modalViews.lastOrNull()?.invoke(::closeModal)
-  }
-
-  companion object {
-    val shared = ModalManager()
-  }
-}

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

@@ -1,17 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.layout
-
-fun Modifier.badgeLayout() =
-  layout { measurable, constraints ->
-    val placeable = measurable.measure(constraints)
-
-    // based on the expectation of only one line of text
-    val minPadding = placeable.height / 4
-
-    val width = maxOf(placeable.width + minPadding, placeable.height)
-    layout(width, placeable.height) {
-      placeable.place((width - placeable.width) / 2, 0)
-    }
-  }

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

@@ -1,19 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.content.*
-import androidx.core.content.ContextCompat
-
-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 copyText(cxt: Context, text: String) {
-  val clipboard = ContextCompat.getSystemService(cxt, ClipboardManager::class.java)
-  clipboard?.setPrimaryClip(ClipData.newPlainText("text", text))
-}

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

@@ -1,38 +0,0 @@
-package chat.simplex.app.ui.theme
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Share
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun SimpleButton(text: String, icon: ImageVector,
-                 color: Color = MaterialTheme.colors.primary,
-                 click: () -> Unit) {
-  Row(
-    verticalAlignment = Alignment.CenterVertically,
-    modifier = Modifier.clickable { click() }
-  ) {
-    Icon(icon, text, tint = color,
-      modifier = Modifier.padding(horizontal = 10.dp)
-    )
-    Text(text, style = MaterialTheme.typography.caption,  color = color)
-  }
-}
-
-@Preview
-@Composable
-fun PreviewCloseSheetBar() {
-  SimpleXTheme {
-    SimpleButton(text = "Share", icon = Icons.Outlined.Share, click = {})
-  }
-}

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

@@ -1,40 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import android.graphics.Rect
-import android.view.ViewTreeObserver
-import androidx.compose.runtime.*
-import androidx.compose.ui.platform.LocalView
-import kotlinx.coroutines.*
-
-fun withApi(action: suspend CoroutineScope.() -> Unit): Job =
-  GlobalScope.launch { withContext(Dispatchers.Main, 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
-}

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

@@ -1,93 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Share
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.*
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.SimpleButton
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.shareText
-
-@Composable
-fun AddContactView(chatModel: ChatModel) {
-  val connReq = chatModel.connReqInvitation
-  if (connReq != null) {
-    val cxt = LocalContext.current
-    AddContactLayout(
-      connReq = connReq,
-      share = { shareText(cxt, connReq) }
-    )
-  }
-}
-
-@Composable
-fun AddContactLayout(connReq: String, share: () -> Unit) {
-  BoxWithConstraints {
-    val screenHeight = maxHeight
-    Column(
-      horizontalAlignment = Alignment.CenterHorizontally,
-      verticalArrangement = Arrangement.SpaceBetween,
-    ) {
-      Text(
-        "Add contact",
-        style = MaterialTheme.typography.h1,
-      )
-      Text(
-        "Show QR code to your contact\nto scan from the app",
-        style = MaterialTheme.typography.h2.copy(fontSize = if(screenHeight > 600.dp) 26.sp else 20.sp),
-        textAlign = TextAlign.Center,
-      )
-      QRCode(
-        connReq, Modifier
-          .weight(1f, fill = false)
-          .aspectRatio(1f)
-          .padding(vertical = 3.dp)
-      )
-      Text(
-        buildAnnotatedString {
-          append("If you cannot meet in person, you can ")
-          withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-            append("scan QR code in the video call")
-          }
-          append(", or you can share the invitation link via any other channel.")
-        },
-        textAlign = TextAlign.Center,
-        style = MaterialTheme.typography.caption.copy(fontSize=if(screenHeight > 600.dp) 20.sp else 16.sp),
-        modifier = Modifier
-          .padding(horizontal = 16.dp)
-          .padding(bottom = if(screenHeight > 600.dp) 16.dp else 8.dp)
-      )
-      SimpleButton("Share invitation link", icon = Icons.Outlined.Share, click = share)
-      Spacer(Modifier.height(10.dp))
-    }
-  }
-}
-
-@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",
-      share = {}
-    )
-  }
-}

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

@@ -1,124 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.content.res.Configuration
-import android.net.Uri
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.*
-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.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.AlertManager
-import chat.simplex.app.views.helpers.withApi
-
-@Composable
-fun ConnectContactView(chatModel: ChatModel, close: () -> Unit) {
-  BackHandler(onBack = close)
-  ConnectContactLayout(
-    qrCodeScanner = {
-      QRCodeScanner { connReqUri ->
-        try {
-          val uri = Uri.parse(connReqUri)
-          withUriAction(uri) { action ->
-            connectViaUri(chatModel, action, uri)
-          }
-        } catch (e: RuntimeException) {
-          AlertManager.shared.showAlertMsg(
-            title = "Invalid QR code",
-            text = "This QR code is not a link!"
-          )
-        }
-        close()
-      }
-    },
-    close = close
-  )
-}
-
-fun withUriAction(uri: Uri, run: suspend (String) -> Unit) {
-  val action = uri.path?.drop(1)
-  if (action == "contact" || action == "invitation") {
-    withApi { run(action) }
-  } else {
-    AlertManager.shared.showAlertMsg(
-      title = "Invalid link!",
-      text = "This link is not a valid connection link!"
-    )
-  }
-}
-
-suspend fun connectViaUri(chatModel: ChatModel, action: String, uri: Uri) {
-  val r = chatModel.controller.apiConnect(uri.toString())
-  if (r) {
-    val whenConnected =
-      if (action == "contact") "your connection request is accepted"
-      else "your contact's device is online"
-    AlertManager.shared.showAlertMsg(
-      title = "Connection request sent!",
-      text = "You will be connected when $whenConnected, please wait or check later!"
-    )
-  }
-}
-
-@Composable
-fun ConnectContactLayout(qrCodeScanner: @Composable () -> Unit, close: () -> Unit) {
-  ModalView(close) {
-    Column(
-      horizontalAlignment = Alignment.CenterHorizontally,
-      verticalArrangement = Arrangement.spacedBy(12.dp)
-    ) {
-      Text(
-        "Scan QR code",
-        style = MaterialTheme.typography.h1,
-      )
-      Text(
-        "Your chat profile will be sent\nto your contact",
-        style = MaterialTheme.typography.h2,
-        textAlign = TextAlign.Center,
-        modifier = Modifier.padding(bottom = 4.dp)
-      )
-      Box(
-        Modifier
-          .fillMaxWidth()
-          .aspectRatio(ratio = 1F)
-      ) { qrCodeScanner() }
-      Text(
-        buildAnnotatedString {
-          append("If you cannot meet in person, you can ")
-          withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
-            append("scan QR code in the video call")
-          }
-          append(", or you can create the invitation link.")
-        },
-        textAlign = TextAlign.Center,
-        style = MaterialTheme.typography.caption,
-        modifier = Modifier
-          .padding(horizontal = 16.dp)
-          .padding(top = 4.dp)
-      )
-    }
-  }
-}
-
-@Preview
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewConnectContactLayout() {
-  SimpleXTheme {
-    ConnectContactLayout(
-      qrCodeScanner = { Surface {} },
-      close = {},
-    )
-  }
-}

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

@@ -1,128 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.Manifest
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chatlist.ScaffoldController
-import chat.simplex.app.views.helpers.withApi
-import com.google.accompanist.permissions.rememberPermissionState
-
-@Composable
-fun NewChatSheet(chatModel: ChatModel, newChatCtrl: ScaffoldController) {
-  val cameraPermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
-  NewChatSheetLayout(
-    addContact = {
-      withApi {
-        //        show spinner
-        chatModel.connReqInvitation = chatModel.controller.apiAddContact()
-        //        hide spinner
-        if (chatModel.connReqInvitation != null) {
-          newChatCtrl.collapse()
-          ModalManager.shared.showModal { AddContactView(chatModel) }
-        }
-      }
-    },
-    scanCode = {
-      newChatCtrl.collapse()
-      ModalManager.shared.showCustomModal { close -> ConnectContactView(chatModel, close) }
-      cameraPermissionState.launchPermissionRequest()
-    }
-  )
-}
-
-@Composable
-fun NewChatSheetLayout(addContact: () -> Unit, scanCode: () -> Unit) {
-  Row(
-    Modifier
-      .fillMaxWidth()
-      .padding(horizontal = 8.dp, vertical = 48.dp),
-    horizontalArrangement = Arrangement.SpaceEvenly
-  ) {
-    Box(
-      Modifier
-        .weight(1F)
-        .fillMaxWidth()) {
-      ActionButton(
-        "Add contact", "(create QR code\nor link)",
-        Icons.Outlined.PersonAdd, click = addContact
-      )
-    }
-    Box(
-      Modifier
-        .weight(1F)
-        .fillMaxWidth()) {
-      ActionButton(
-        "Scan QR code", "(in person or in video call)",
-        Icons.Outlined.QrCode, click = scanCode
-      )
-    }
-    Box(
-      Modifier
-        .weight(1F)
-        .fillMaxWidth()) {
-      ActionButton(
-        "Create Group", "(coming soon!)",
-        Icons.Outlined.GroupAdd, disabled = true
-      )
-    }
-  }
-}
-
-@Composable
-fun ActionButton(text: String?, comment: String?, icon: ImageVector, disabled: Boolean = false,
-                 click: () -> Unit = {}) {
-  Column(
-    Modifier
-      .clickable(onClick = click)
-      .padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
-    val tint = if (disabled) HighOrLowlight else MaterialTheme.colors.primary
-    Icon(icon, text,
-      tint = tint,
-      modifier = Modifier
-        .size(40.dp)
-        .padding(bottom = 8.dp))
-    if (text != null) {
-      Text(
-        text,
-        textAlign = TextAlign.Center,
-        fontWeight = FontWeight.Bold,
-        color = tint,
-        modifier = Modifier.padding(bottom = 4.dp)
-      )
-    }
-    if (comment != null) {
-      Text(
-        comment,
-        textAlign = TextAlign.Center,
-        style = MaterialTheme.typography.body2
-      )
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewNewChatSheet() {
-  SimpleXTheme {
-    NewChatSheetLayout(
-      addContact = {},
-      scanCode = {}
-    )
-  }
-}

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

@@ -1,42 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.graphics.Bitmap
-import android.graphics.Color
-import androidx.compose.foundation.Image
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.tooling.preview.Preview
-import chat.simplex.app.ui.theme.SimpleXTheme
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.EncodeHintType
-import com.google.zxing.qrcode.QRCodeWriter
-
-@Composable
-fun QRCode(connReq: String, modifier: Modifier = Modifier) {
-  Image(
-    bitmap = qrCodeBitmap(connReq, 1024).asImageBitmap(),
-    contentDescription = "QR Code",
-    modifier = modifier
-  )
-}
-
-fun qrCodeBitmap(content: String, size: Int): Bitmap {
-  val hints = hashMapOf<EncodeHintType, Int>().also { it[EncodeHintType.MARGIN] = 1 }
-  val bits = QRCodeWriter().encode(content, BarcodeFormat.QR_CODE, size, size, hints)
-  return Bitmap.createBitmap(size, size, Bitmap.Config.RGB_565).also {
-    for (x in 0 until size) {
-      for (y in 0 until size) {
-        it.setPixel(x, y, if (bits[x, y]) Color.BLACK else Color.WHITE)
-      }
-    }
-  }
-}
-
-@Preview
-@Composable
-fun PreviewQRCode() {
-  SimpleXTheme {
-    QRCode(connReq = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D")
-  }
-}

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

@@ -1,109 +0,0 @@
-package chat.simplex.app.views.newchat
-
-import android.util.Log
-import android.view.ViewGroup
-import androidx.camera.core.*
-import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.camera.view.PreviewView
-import androidx.compose.runtime.*
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.content.ContextCompat
-import chat.simplex.app.TAG
-import com.google.common.util.concurrent.ListenableFuture
-import com.google.mlkit.vision.barcode.BarcodeScannerOptions
-import com.google.mlkit.vision.barcode.BarcodeScanning
-import com.google.mlkit.vision.barcode.common.Barcode
-import com.google.mlkit.vision.common.InputImage
-import java.util.concurrent.*
-
-// Bar code scanner adapted from https://github.com/MakeItEasyDev/Jetpack-Compose-BarCode-Scanner
-
-@Composable
-fun QRCodeScanner(onBarcode: (String) -> Unit) {
-  val context = LocalContext.current
-  val lifecycleOwner = LocalLifecycleOwner.current
-  var preview by remember { mutableStateOf<Preview?>(null) }
-
-  AndroidView(
-    factory = { AndroidViewContext ->
-      PreviewView(AndroidViewContext).apply {
-        this.scaleType = PreviewView.ScaleType.FILL_CENTER
-        layoutParams = ViewGroup.LayoutParams(
-          ViewGroup.LayoutParams.MATCH_PARENT,
-          ViewGroup.LayoutParams.MATCH_PARENT,
-        )
-        implementationMode = PreviewView.ImplementationMode.COMPATIBLE
-      }
-    },
-//    modifier = Modifier.fillMaxSize(),
-    update = { previewView ->
-      val cameraSelector: CameraSelector = CameraSelector.Builder()
-        .requireLensFacing(CameraSelector.LENS_FACING_BACK)
-        .build()
-      val cameraExecutor: ExecutorService = Executors.newSingleThreadExecutor()
-      val cameraProviderFuture: ListenableFuture<ProcessCameraProvider> =
-        ProcessCameraProvider.getInstance(context)
-
-      cameraProviderFuture.addListener({
-        preview = Preview.Builder().build().also {
-          it.setSurfaceProvider(previewView.surfaceProvider)
-        }
-        val cameraProvider: ProcessCameraProvider = cameraProviderFuture.get()
-        val barcodeAnalyser = BarCodeAnalyser { barcodes ->
-          barcodes.firstOrNull()?.rawValue?.let(onBarcode)
-        }
-        val imageAnalysis: ImageAnalysis = ImageAnalysis.Builder()
-          .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
-          .build()
-          .also { it.setAnalyzer(cameraExecutor, barcodeAnalyser) }
-
-        try {
-          cameraProvider.unbindAll()
-          cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector, preview, imageAnalysis)
-        } catch (e: Exception) {
-          Log.d(TAG, "CameraPreview: ${e.localizedMessage}")
-        }
-      }, ContextCompat.getMainExecutor(context))
-    }
-  )
-}
-
-class BarCodeAnalyser(
-  private val onBarcodeDetected: (barcodes: List<Barcode>) -> Unit,
-): ImageAnalysis.Analyzer {
-  private var lastAnalyzedTimeStamp = 0L
-
-  @ExperimentalGetImage
-  override fun analyze(image: ImageProxy) {
-    val currentTimestamp = System.currentTimeMillis()
-    if (currentTimestamp - lastAnalyzedTimeStamp >= TimeUnit.SECONDS.toMillis(1)) {
-      image.image?.let { imageToAnalyze ->
-        val options = BarcodeScannerOptions.Builder()
-          .setBarcodeFormats(Barcode.FORMAT_ALL_FORMATS)
-          .build()
-        val barcodeScanner = BarcodeScanning.getClient(options)
-        val imageToProcess = InputImage.fromMediaImage(imageToAnalyze, image.imageInfo.rotationDegrees)
-
-        barcodeScanner.process(imageToProcess)
-          .addOnSuccessListener { barcodes ->
-            if (barcodes.isNotEmpty()) {
-              onBarcodeDetected(barcodes)
-            } else {
-              Log.d(TAG, "BarcodeAnalyser: No barcode Scanned")
-            }
-          }
-          .addOnFailureListener { exception ->
-            Log.e(TAG, "BarcodeAnalyser: Something went wrong $exception")
-          }
-          .addOnCompleteListener {
-            image.close()
-          }
-      }
-      lastAnalyzedTimeStamp = currentTimestamp
-    } else {
-      image.close()
-    }
-  }
-}

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

@@ -1,48 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.ChatHelpView
-
-@Composable
-fun HelpView(chatModel: ChatModel) {
-  val user = chatModel.currentUser.value
-  if (user != null) {
-    HelpLayout(displayName = user.profile.displayName)
-  }
-}
-
-@Composable
-fun HelpLayout(displayName: String) {
-  Column(horizontalAlignment = Alignment.Start) {
-    Text(
-      "Welcome $displayName!",
-      Modifier.padding(bottom = 24.dp),
-      style = MaterialTheme.typography.h1,
-    )
-    ChatHelpView()
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewHelpView() {
-  SimpleXTheme {
-    HelpLayout(displayName = "Alice")
-  }
-}

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

@@ -1,91 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.*
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.Format
-import chat.simplex.app.model.FormatColor
-import chat.simplex.app.ui.theme.SimpleXTheme
-
-@Composable
-fun MarkdownHelpView() {
-  Column {
-    Text(
-      "How to use markdown",
-      style = MaterialTheme.typography.h1,
-    )
-    Text(
-      "You can use markdown to format messages:",
-      Modifier.padding(vertical = 16.dp)
-    )
-    MdFormat("*bold*", "bold", Format.Bold())
-    MdFormat("_italic_", "italic", Format.Italic())
-    MdFormat("~strike~", "strike", Format.StrikeThrough())
-    MdFormat("`a + b`", "a + b", Format.Snippet())
-    Row {
-      MdSyntax("!1 colored!")
-      Text(buildAnnotatedString {
-        withStyle(Format.Colored(FormatColor.red).style) { append("colored") }
-        append(" (")
-        appendColor(this, "1", FormatColor.red, ", ")
-        appendColor(this, "2", FormatColor.green, ", ")
-        appendColor(this, "3", FormatColor.blue, ", ")
-        appendColor(this, "4", FormatColor.yellow, ", ")
-        appendColor(this, "5", FormatColor.cyan, ", ")
-        appendColor(this, "6", FormatColor.magenta, ")")
-      })
-    }
-    Row {
-      MdSyntax("#secret#")
-      SelectionContainer {
-        Text(buildAnnotatedString {
-          withStyle(Format.Secret().style) { append("secret") }
-        })
-      }
-    }
-  }
-}
-
-@Composable
-fun MdSyntax(markdown: String) {
-  Text(markdown, Modifier
-    .width(100.dp)
-    .padding(bottom = 4.dp))
-}
-
-@Composable
-fun MdFormat(markdown: String, example: String, format: Format) {
-  Row {
-    MdSyntax(markdown)
-    Text(buildAnnotatedString {
-      withStyle(format.style) { append(example) }
-    })
-  }
-}
-
-@Composable
-fun appendColor(b: AnnotatedString.Builder, s: String, c: FormatColor, after: String) {
-  b.withStyle(Format.Colored(c).style) { append(s)}
-  b.append(after)
-}
-
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewMarkdownHelpView() {
-  SimpleXTheme {
-    MarkdownHelpView()
-  }
-}

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

@@ -1,301 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-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.foundation.text.selection.SelectionContainer
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.OpenInNew
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.AlertManager
-import chat.simplex.app.views.helpers.withApi
-
-@Composable
-fun SMPServersView(chatModel: ChatModel) {
-  val userSMPServers = chatModel.userSMPServers.value
-  if (userSMPServers != null) {
-    var isUserSMPServers by remember { mutableStateOf(userSMPServers.isNotEmpty()) }
-    var editSMPServers by remember { mutableStateOf(!isUserSMPServers) }
-    var userSMPServersStr by remember { mutableStateOf(if (isUserSMPServers) userSMPServers.joinToString(separator = "\n") else "") }
-    fun saveSMPServers(smpServers: List<String>) {
-      withApi {
-        val r = chatModel.controller.setUserSMPServers(smpServers = smpServers)
-        if (r) {
-          chatModel.userSMPServers.value = smpServers
-          if (smpServers.isEmpty()) {
-            isUserSMPServers = false
-            editSMPServers = true
-          } else {
-            editSMPServers = false
-          }
-        }
-      }
-    }
-
-    SMPServersLayout(
-      isUserSMPServers = isUserSMPServers,
-      editSMPServers = editSMPServers,
-      userSMPServersStr = userSMPServersStr,
-      isUserSMPServersOnOff = { switch ->
-        if (switch) {
-          isUserSMPServers = true
-        } else {
-          val userSMPServers = chatModel.userSMPServers.value
-          if (userSMPServers != null) {
-            if (userSMPServers.isNotEmpty()) {
-              AlertManager.shared.showAlertMsg(
-                title = "Use SimpleX Chat servers?",
-                text = "Saved SMP servers will be removed",
-                confirmText = "Confirm",
-                onConfirm = {
-                  saveSMPServers(listOf())
-                  isUserSMPServers = false
-                  userSMPServersStr = ""
-                }
-              )
-            } else {
-              isUserSMPServers = false
-              userSMPServersStr = ""
-            }
-          }
-        }
-      },
-      editUserSMPServersStr = { userSMPServersStr = it },
-      cancelEdit = {
-        val userSMPServers = chatModel.userSMPServers.value
-        if (userSMPServers != null) {
-          isUserSMPServers = userSMPServers.isNotEmpty()
-          editSMPServers = !isUserSMPServers
-          userSMPServersStr = if (isUserSMPServers) userSMPServers.joinToString(separator = "\n") else ""
-        }
-      },
-      saveSMPServers = { saveSMPServers(it) },
-      editOn = { editSMPServers = true },
-    )
-  }
-}
-
-@Composable
-fun SMPServersLayout(
-  isUserSMPServers: Boolean,
-  editSMPServers: Boolean,
-  userSMPServersStr: String,
-  isUserSMPServersOnOff: (Boolean) -> Unit,
-  editUserSMPServersStr: (String) -> Unit,
-  cancelEdit: () -> Unit,
-  saveSMPServers: (List<String>) -> Unit,
-  editOn: () -> Unit,
-) {
-  Column(
-    Modifier.fillMaxWidth(),
-    horizontalAlignment = Alignment.Start,
-    verticalArrangement = Arrangement.spacedBy(8.dp)
-  ) {
-    Text(
-      "Your SMP servers",
-      Modifier.padding(bottom = 24.dp),
-      style = MaterialTheme.typography.h1
-    )
-    Row(
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      Text("Configure SMP servers", Modifier.padding(end = 24.dp))
-      Switch(
-        checked = isUserSMPServers,
-        onCheckedChange = isUserSMPServersOnOff,
-        colors = SwitchDefaults.colors(
-          checkedThumbColor = MaterialTheme.colors.primary,
-          uncheckedThumbColor = HighOrLowlight
-        ),
-      )
-    }
-
-    if (!isUserSMPServers) {
-      Text("Using SimpleX Chat servers.")
-    } else {
-      Text("Enter one SMP server per line:")
-      if (editSMPServers) {
-        BasicTextField(
-          value = userSMPServersStr,
-          onValueChange = editUserSMPServersStr,
-          textStyle = TextStyle(
-            fontFamily = FontFamily.Monospace, fontSize = 14.sp,
-            color = MaterialTheme.colors.onBackground
-          ),
-          keyboardOptions = KeyboardOptions.Default.copy(
-            capitalization = KeyboardCapitalization.None,
-            autoCorrect = false
-          ),
-          modifier = Modifier.height(160.dp),
-          cursorBrush = SolidColor(HighOrLowlight),
-          decorationBox = { innerTextField ->
-            Surface(
-              shape = RoundedCornerShape(10.dp),
-              border = BorderStroke(1.dp, MaterialTheme.colors.secondary)
-            ) {
-              Row(
-                Modifier.background(MaterialTheme.colors.background),
-                verticalAlignment = Alignment.Top
-              ) {
-                Box(
-                  Modifier
-                    .weight(1f)
-                    .padding(vertical = 5.dp, horizontal = 7.dp)
-                ) {
-                  innerTextField()
-                }
-              }
-            }
-          }
-        )
-
-        Row(
-          Modifier.fillMaxWidth(),
-          horizontalArrangement = Arrangement.SpaceBetween,
-          verticalAlignment = Alignment.CenterVertically
-        ) {
-          Column(horizontalAlignment = Alignment.Start) {
-            Row {
-              Text(
-                "Cancel",
-                color = MaterialTheme.colors.primary,
-                modifier = Modifier
-                  .clickable(onClick = cancelEdit)
-              )
-              Spacer(Modifier.padding(horizontal = 8.dp))
-              Text(
-                "Save",
-                color = MaterialTheme.colors.primary,
-                modifier = Modifier.clickable(onClick = {
-                  val servers = userSMPServersStr.split("\n")
-                  saveSMPServers(servers)
-                })
-              )
-            }
-          }
-          Column(horizontalAlignment = Alignment.End) {
-            howToButton()
-          }
-        }
-      } else {
-        Surface(
-          modifier = Modifier
-            .height(160.dp)
-            .fillMaxWidth(),
-          shape = RoundedCornerShape(10.dp),
-          border = BorderStroke(1.dp, MaterialTheme.colors.secondary)
-        ) {
-          SelectionContainer(
-            Modifier.verticalScroll(rememberScrollState())
-          ) {
-            Text(
-              userSMPServersStr,
-              Modifier
-                .padding(vertical = 5.dp, horizontal = 7.dp),
-              style = TextStyle(fontFamily = FontFamily.Monospace, fontSize = 14.sp),
-            )
-          }
-        }
-        Row(
-          Modifier.fillMaxWidth(),
-          horizontalArrangement = Arrangement.SpaceBetween,
-          verticalAlignment = Alignment.CenterVertically
-        ) {
-          Column(horizontalAlignment = Alignment.Start) {
-            Text(
-              "Edit",
-              color = MaterialTheme.colors.primary,
-              modifier = Modifier
-                .clickable(onClick = editOn)
-            )
-          }
-          Column(horizontalAlignment = Alignment.End) {
-            howToButton()
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-fun howToButton() {
-  val uriHandler = LocalUriHandler.current
-  Row(
-    verticalAlignment = Alignment.CenterVertically,
-    modifier = Modifier.clickable { uriHandler.openUri("https://github.com/simplex-chat/simplexmq#using-smp-server-and-smp-agent") }
-  ) {
-    Text("How to", color = MaterialTheme.colors.primary)
-    Icon(
-      Icons.Outlined.OpenInNew, "How to", tint = MaterialTheme.colors.primary,
-      modifier = Modifier.padding(horizontal = 5.dp)
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewSMPServersLayoutDefaultServers() {
-  SimpleXTheme {
-    SMPServersLayout(
-      isUserSMPServers = false,
-      editSMPServers = true,
-      userSMPServersStr = "",
-      isUserSMPServersOnOff = {},
-      editUserSMPServersStr = {},
-      cancelEdit = {},
-      saveSMPServers = {},
-      editOn = {},
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewSMPServersLayoutUserServersEditOn() {
-  SimpleXTheme {
-    SMPServersLayout(
-      isUserSMPServers = true,
-      editSMPServers = true,
-      userSMPServersStr = "smp://u2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU=@smp4.simplex.im\nsmp://hpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg=@smp5.simplex.im",
-      isUserSMPServersOnOff = {},
-      editUserSMPServersStr = {},
-      cancelEdit = {},
-      saveSMPServers = {},
-      editOn = {},
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewSMPServersLayoutUserServersEditOff() {
-  SimpleXTheme {
-    SMPServersLayout(
-      isUserSMPServers = true,
-      editSMPServers = false,
-      userSMPServersStr = "smp://u2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU=@smp4.simplex.im\nsmp://hpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg=@smp5.simplex.im",
-      isUserSMPServersOnOff = {},
-      editUserSMPServersStr = {},
-      cancelEdit = {},
-      saveSMPServers = {},
-      editOn = {},
-    )
-  }
-}

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

@@ -1,209 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.content.res.Configuration
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
-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.dp
-import chat.simplex.app.BuildConfig
-import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.Profile
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.TerminalView
-import chat.simplex.app.views.helpers.ProfileImage
-import chat.simplex.app.views.newchat.ModalManager
-
-@Composable
-fun SettingsView(chatModel: ChatModel) {
-  val user = chatModel.currentUser.value
-  if (user != null) {
-    SettingsLayout(
-      profile = user.profile,
-      showModal = { modalView -> { ModalManager.shared.showModal { modalView(chatModel) } } },
-      showCustomModal = { modalView -> { ModalManager.shared.showCustomModal { close -> modalView(chatModel, close) } } },
-      showTerminal = { ModalManager.shared.showCustomModal { close -> TerminalView(chatModel, close) } }
-    )
-  }
-}
-
-val simplexTeamUri =
-  "simplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"
-
-@Composable
-fun SettingsLayout(
-  profile: Profile,
-  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
-  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
-  showTerminal: () -> Unit
-) {
-  val uriHandler = LocalUriHandler.current
-  Surface(
-    Modifier
-      .background(MaterialTheme.colors.background)
-      .fillMaxSize()
-  ) {
-    Column(
-      Modifier
-        .fillMaxSize()
-        .background(MaterialTheme.colors.background)
-        .padding(8.dp)
-        .padding(top = 16.dp)
-    ) {
-      Text(
-        "Your Settings",
-        style = MaterialTheme.typography.h1,
-        modifier = Modifier.padding(start = 8.dp)
-      )
-      Spacer(Modifier.height(30.dp))
-
-      SettingsSectionView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp) {
-        ProfileImage(size = 60.dp, profile.image)
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Column {
-          Text(
-            profile.displayName,
-            style = MaterialTheme.typography.caption,
-            fontWeight = FontWeight.Bold,
-          )
-          Text(profile.fullName)
-        }
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView(showModal { UserAddressView(it) }) {
-        Icon(
-          Icons.Outlined.QrCode,
-          contentDescription = "Address",
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text("Your SimpleX contact address")
-      }
-      Spacer(Modifier.height(24.dp))
-
-      SettingsSectionView(showModal { HelpView(it) }) {
-        Icon(
-          Icons.Outlined.HelpOutline,
-          contentDescription = "Chat help",
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text("How to use SimpleX Chat")
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView(showModal { MarkdownHelpView() }) {
-        Icon(
-          Icons.Outlined.TextFormat,
-          contentDescription = "Markdown help",
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text("Markdown in messages")
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView({ uriHandler.openUri(simplexTeamUri) }) {
-        Icon(
-          Icons.Outlined.Tag,
-          contentDescription = "SimpleX Team",
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(
-          "Chat with the founder",
-          color = MaterialTheme.colors.primary
-        )
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView({ uriHandler.openUri("mailto:chat@simplex.chat") }) {
-        Icon(
-          Icons.Outlined.Email,
-          contentDescription = "Email",
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(
-          "Send us email",
-          color = MaterialTheme.colors.primary
-        )
-      }
-      Spacer(Modifier.height(24.dp))
-
-      SettingsSectionView(showModal { SMPServersView(it) }) {
-        Icon(
-          Icons.Outlined.Dns,
-          contentDescription = "SMP servers",
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text("SMP servers")
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView(showTerminal) {
-        Icon(
-          painter = painterResource(id = R.drawable.ic_outline_terminal),
-          contentDescription = "Chat console",
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text("Chat console")
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat") }) {
-        Icon(
-          painter = painterResource(id = R.drawable.ic_github),
-          contentDescription = "GitHub",
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(
-          buildAnnotatedString {
-            append("Install ")
-            withStyle(SpanStyle(color = MaterialTheme.colors.primary)) {
-              append("SimpleX Chat for terminal")
-            }
-          }
-        )
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView(click = {}) {
-        Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
-      }
-    }
-  }
-}
-
-@Composable
-fun SettingsSectionView(click: () -> Unit, height: Dp = 48.dp, content: (@Composable () -> Unit)) {
-  Row(
-    Modifier
-      .padding(start = 8.dp)
-      .fillMaxWidth()
-      .clickable(onClick = click)
-      .height(height),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    content()
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewSettingsLayout() {
-  SimpleXTheme {
-    SettingsLayout(
-      profile = Profile.sampleData,
-      showModal = {{}},
-      showCustomModal = {{}},
-      showTerminal = {}
-    )
-  }
-}

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

@@ -1,134 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.content.res.Configuration
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
-import androidx.compose.runtime.Composable
-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.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.SimpleButton
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
-
-@Composable
-fun UserAddressView(chatModel: ChatModel) {
-  val cxt = LocalContext.current
-  UserAddressLayout(
-    userAddress = chatModel.userAddress.value,
-    createAddress = {
-      withApi {
-        chatModel.userAddress.value = chatModel.controller.apiCreateUserAddress()
-      }
-    },
-    share = { userAddress: String -> shareText(cxt, userAddress) },
-    deleteAddress = {
-      AlertManager.shared.showAlertMsg(
-        title = "Delete address?",
-        text = "All your contacts will remain connected",
-        confirmText = "Delete",
-        onConfirm = {
-          withApi {
-            chatModel.controller.apiDeleteUserAddress()
-            chatModel.userAddress.value = null
-          }
-        }
-      )
-    }
-  )
-}
-
-@Composable
-fun UserAddressLayout(
-  userAddress: String?,
-  createAddress: () -> Unit,
-  share: (String) -> Unit,
-  deleteAddress: () -> Unit
-) {
-  Column(
-    horizontalAlignment = Alignment.Start,
-    verticalArrangement = Arrangement.Top
-  ) {
-    Text(
-      "Your chat address",
-      Modifier.padding(bottom = 16.dp),
-      style = MaterialTheme.typography.h1,
-    )
-    Text(
-      "You can share your address as a link or as a QR code - anybody will be able to connect to you, " +
-          "and if you later delete it - you won't lose your contacts.",
-      Modifier.padding(bottom = 12.dp),
-    )
-    Column(
-      Modifier.fillMaxWidth(),
-      horizontalAlignment = Alignment.CenterHorizontally,
-      verticalArrangement = Arrangement.SpaceEvenly
-    ) {
-      if (userAddress == null) {
-        SimpleButton("Create address", icon = Icons.Outlined.QrCode, click = createAddress)
-      } else {
-        QRCode(userAddress, Modifier.weight(1f, fill = false).aspectRatio(1f))
-        Row(
-          horizontalArrangement = Arrangement.spacedBy(10.dp),
-          verticalAlignment = Alignment.CenterVertically,
-          modifier = Modifier.padding(vertical = 10.dp)
-        ) {
-          SimpleButton(
-            "Share link",
-            icon = Icons.Outlined.Share,
-            click = { share(userAddress) })
-          SimpleButton(
-            "Delete address",
-            icon = Icons.Outlined.Delete,
-            color = Color.Red,
-            click = deleteAddress
-          )
-        }
-      }
-    }
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewUserAddressLayoutNoAddress() {
-  SimpleXTheme {
-    UserAddressLayout(
-      userAddress = null,
-      createAddress = {},
-      share = { _ -> },
-      deleteAddress = {},
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewUserAddressLayoutAddressCreated() {
-  SimpleXTheme {
-    UserAddressLayout(
-      userAddress = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D",
-      createAddress = {},
-      share = { _ -> },
-      deleteAddress = {},
-    )
-  }
-}

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

@@ -1,283 +0,0 @@
-package chat.simplex.app.views.usersettings
-
-import android.content.res.Configuration
-import android.widget.ScrollView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.gestures.scrollable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.CircleShape
-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.icons.Icons
-import androidx.compose.material.icons.outlined.Close
-import androidx.compose.material.icons.outlined.PhotoCamera
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.Profile
-import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.CIListState
-import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.ModalView
-import com.google.accompanist.insets.ProvideWindowInsets
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.launch
-
-@Composable
-fun UserProfileView(chatModel: ChatModel, close: () -> Unit) {
-  val user = chatModel.currentUser.value
-  if (user != null) {
-    var editProfile = remember { mutableStateOf(false) }
-    var profile by remember { mutableStateOf(user.profile) }
-    UserProfileLayout(
-      close = close,
-      editProfile = editProfile,
-      profile = profile,
-      saveProfile = { displayName, fullName, image ->
-        withApi {
-          val p = Profile(displayName, fullName, image)
-          val newProfile = chatModel.controller.apiUpdateProfile(p)
-          if (newProfile != null) {
-            chatModel.updateUserProfile(newProfile)
-            profile = newProfile
-          }
-          editProfile.value = false
-        }
-      }
-    )
-  }
-}
-
-@Composable
-fun UserProfileLayout(
-  close: () -> Unit,
-  editProfile: MutableState<Boolean>,
-  profile: Profile,
-  saveProfile: (String, String, String?) -> Unit,
-) {
-  val bottomSheetModalState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
-  val displayName = remember { mutableStateOf(profile.displayName) }
-  val fullName = remember { mutableStateOf(profile.fullName) }
-  val profileImage = remember { mutableStateOf(profile.image) }
-  val scope = rememberCoroutineScope()
-  val scrollState = rememberScrollState()
-  val keyboardState by getKeyboardState()
-  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
-
-  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
-    ModalBottomSheetLayout(
-      scrimColor = Color.Black.copy(alpha = 0.12F),
-      modifier = Modifier.navigationBarsWithImePadding(),
-      sheetContent = {
-        GetImageBottomSheet(profileImage, hideBottomSheet = {
-          scope.launch { bottomSheetModalState.hide() }
-        })
-      },
-      sheetState = bottomSheetModalState,
-      sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
-    ) {
-      ModalView(close = close) {
-        Column(
-          Modifier
-            .verticalScroll(scrollState)
-            .padding(bottom = 16.dp),
-          horizontalAlignment = Alignment.Start
-        ) {
-          Text(
-            "Your chat profile",
-            Modifier.padding(bottom = 24.dp),
-            style = MaterialTheme.typography.h1,
-            color = MaterialTheme.colors.onBackground
-          )
-          Text(
-            "Your profile is stored on your device and shared only with your contacts.\n\n" +
-                "SimpleX servers cannot see your profile.",
-            Modifier.padding(bottom = 24.dp),
-            color = MaterialTheme.colors.onBackground
-          )
-          if (editProfile.value) {
-            Column(
-              Modifier.fillMaxWidth(),
-              horizontalAlignment = Alignment.Start
-            ) {
-              Box(
-                Modifier
-                  .fillMaxWidth()
-                  .padding(bottom = 24.dp),
-                contentAlignment = Alignment.Center
-              ) {
-                Box(contentAlignment = Alignment.TopEnd) {
-                  Box(contentAlignment = Alignment.Center) {
-                    ProfileImage(192.dp, profileImage.value)
-                    EditImageButton { scope.launch { bottomSheetModalState.show() } }
-                  }
-                  if (profileImage.value != null) {
-                    DeleteImageButton { profileImage.value = null }
-                  }
-                }
-              }
-              ProfileNameTextField(displayName)
-              ProfileNameTextField(fullName)
-              Row {
-                TextButton("Cancel") {
-                  displayName.value = profile.displayName
-                  fullName.value = profile.fullName
-                  profileImage.value = profile.image
-                  editProfile.value = false
-                }
-                Spacer(Modifier.padding(horizontal = 8.dp))
-                TextButton("Save (and notify contacts)") {
-                  saveProfile(displayName.value, fullName.value, profileImage.value)
-                }
-              }
-            }
-          } else {
-            Column(
-              modifier = Modifier.fillMaxWidth(),
-              horizontalAlignment = Alignment.Start
-            ) {
-              Box(
-                Modifier
-                  .fillMaxWidth()
-                  .padding(bottom = 24.dp), contentAlignment = Alignment.Center
-              ) {
-                ProfileImage(192.dp, profile.image)
-                if (profile.image == null) {
-                  EditImageButton {
-                    editProfile.value = true
-                    scope.launch { bottomSheetModalState.show() }
-                  }
-                }
-              }
-              ProfileNameRow("Display name:", profile.displayName)
-              ProfileNameRow("Full name:", profile.fullName)
-              TextButton("Edit") { editProfile.value = true }
-            }
-          }
-          if (savedKeyboardState != keyboardState) {
-            LaunchedEffect(keyboardState) {
-              scope.launch {
-                savedKeyboardState = keyboardState
-                scrollState.animateScrollTo(scrollState.maxValue)
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-private fun ProfileNameTextField(name: MutableState<String>) {
-  BasicTextField(
-    value = name.value,
-    onValueChange = { name.value = it },
-    modifier = Modifier
-      .padding(bottom = 24.dp)
-      .fillMaxWidth(),
-    textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
-    keyboardOptions = KeyboardOptions(
-      capitalization = KeyboardCapitalization.None,
-      autoCorrect = false
-    ),
-    singleLine = true
-  )
-}
-
-@Composable
-private fun ProfileNameRow(label: String, text: String) {
-  Row(Modifier.padding(bottom = 24.dp)) {
-    Text(
-      label,
-      color = MaterialTheme.colors.onBackground
-    )
-    Spacer(Modifier.padding(horizontal = 4.dp))
-    Text(
-      text,
-      fontWeight = FontWeight.Bold,
-      color = MaterialTheme.colors.onBackground
-    )
-  }
-}
-
-@Composable
-private fun TextButton(text: String, click: () -> Unit) {
-  Text(
-    text,
-    color = MaterialTheme.colors.primary,
-    modifier = Modifier.clickable(onClick = click),
-  )
-}
-
-@Composable
-fun EditImageButton(click: () -> Unit) {
-  IconButton(
-    onClick = click,
-    modifier = Modifier.background(Color(1f, 1f, 1f, 0.2f), shape = CircleShape)
-  ) {
-    Icon(
-      Icons.Outlined.PhotoCamera,
-      contentDescription = "Edit image",
-      tint = MaterialTheme.colors.primary,
-      modifier = Modifier.size(36.dp)
-    )
-  }
-}
-
-@Composable
-fun DeleteImageButton(click: () -> Unit) {
-  IconButton(onClick = click) {
-    Icon(
-      Icons.Outlined.Close,
-      contentDescription = "Delete image",
-      tint = MaterialTheme.colors.primary,
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewUserProfileLayoutEditOff() {
-  SimpleXTheme {
-    UserProfileLayout(
-      close = {},
-      profile = Profile.sampleData,
-      editProfile = remember { mutableStateOf(false) },
-      saveProfile = { _, _, _ -> }
-    )
-  }
-}
-
-@Preview(showBackground = true)
-@Preview(
-  uiMode = Configuration.UI_MODE_NIGHT_YES,
-  showBackground = true,
-  name = "Dark Mode"
-)
-@Composable
-fun PreviewUserProfileLayoutEditOn() {
-  SimpleXTheme {
-    UserProfileLayout(
-      close = {},
-      profile = Profile.sampleData,
-      editProfile = remember { mutableStateOf(true) },
-      saveProfile = {_, _, _ ->}
-    )
-  }
-}

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Android drawable generated by fa5ad-free project:
-    https://github.com/diwanoczko/fa5ad-free
-
-    Resource generated base on Font Awesome 5 Free icons set:
-    https://fontawesome.com/
-
-    All brand icons are trademarks of their respective owners.
-    Please do not use brand logos for any purpose except to represent the
-    company, product, or service to which they refer.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="23.25dp"
-    android:height="24dp"
-    android:viewportWidth="496"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"
-    />
-</vector>

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

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.11,4 20,4zM20,18H4V8h16V18zM18,17h-6v-2h6V17zM7.5,17l-1.41,-1.41L8.67,13l-2.59,-2.59L7.5,9l4,4L7.5,17z"/>
-</vector>

apps/android/app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  tools:context=".MainActivity">
+
+  <EditText
+    android:id="@+id/cmdInput"
+    android:layout_width="0dp"
+    android:layout_height="48dp"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="16dp"
+    android:autofillHints=""
+    android:ems="10"
+    android:imeOptions="actionSend"
+    android:inputType="textPersonName"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    tools:ignore="SpeakableTextPresentCheck" />
+
+  <ScrollView
+    android:id="@+id/scroller"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:layout_marginStart="16dp"
+    android:layout_marginTop="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="16dp"
+    app:layout_constraintBottom_toTopOf="@+id/cmdInput"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
+
+      <TextView
+        android:id="@+id/chatlog"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+    </LinearLayout>
+  </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
-    <foreground android:drawable="@mipmap/icon_foreground"/>
-</adaptive-icon>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
-    <foreground android:drawable="@color/white"/>
-</adaptive-icon>