desktop: do not show scan QR code screen (#2686)

* desktop: do not show scan QR code screen * expect/actual and different button text --------- Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
2026-03-30 22:55:48 +00:00 · 2023-07-19 11:36:42 +03:00
parent d61ff0f2a7
commit 2389e870b3
6 changed files with 101 additions and 77 deletions
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/newchat/ConnectViaLinkView.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/newchat/ConnectViaLinkView.android.kt
@@ -0,0 +1,66 @@
+package chat.simplex.common.views.newchat
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import dev.icerock.moko.resources.compose.painterResource
+import dev.icerock.moko.resources.compose.stringResource
+import androidx.compose.ui.unit.sp
+import chat.simplex.common.model.ChatModel
+import chat.simplex.res.MR
+
+@Composable
+actual fun ConnectViaLinkView(m: ChatModel, close: () -> Unit) {
+  val selection = remember {
+    mutableStateOf(
+      runCatching { ConnectViaLinkTab.valueOf(m.controller.appPrefs.connectViaLinkTab.get()!!) }.getOrDefault(ConnectViaLinkTab.SCAN)
+    )
+  }
+  val tabTitles = ConnectViaLinkTab.values().map {
+    when (it) {
+      ConnectViaLinkTab.SCAN -> stringResource(MR.strings.scan_QR_code)
+      ConnectViaLinkTab.PASTE -> stringResource(MR.strings.paste_the_link_you_received)
+    }
+  }
+  Column(
+    Modifier.fillMaxHeight(),
+    verticalArrangement = Arrangement.SpaceBetween
+  ) {
+    Column(Modifier.weight(1f)) {
+      when (selection.value) {
+        ConnectViaLinkTab.SCAN -> {
+          ScanToConnectView(m, close)
+        }
+        ConnectViaLinkTab.PASTE -> {
+          PasteToConnectView(m, close)
+        }
+      }
+    }
+    TabRow(
+      selectedTabIndex = selection.value.ordinal,
+      backgroundColor = Color.Transparent,
+      contentColor = MaterialTheme.colors.primary,
+    ) {
+      tabTitles.forEachIndexed { index, it ->
+        Tab(
+          selected = selection.value.ordinal == index,
+          onClick = {
+            selection.value = ConnectViaLinkTab.values()[index]
+            m.controller.appPrefs.connectViaLinkTab.set(selection.value .name)
+          },
+          text = { Text(it, fontSize = 13.sp) },
+          icon = {
+            Icon(
+              if (ConnectViaLinkTab.SCAN.ordinal == index) painterResource(MR.images.ic_qr_code) else painterResource(MR.images.ic_article),
+              it
+            )
+          },
+          selectedContentColor = MaterialTheme.colors.primary,
+          unselectedContentColor = MaterialTheme.colors.secondary,
+        )
+      }
+    }
+  }
+}
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/VerifyCodeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/VerifyCodeView.kt
@@ -16,6 +16,7 @@ import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import chat.simplex.common.platform.appPlatform
 import chat.simplex.common.platform.shareText
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -110,9 +111,11 @@ private fun VerifyCodeLayout(
          verifyCode(null) {}
        }
      } else {
-        SimpleButton(generalGetString(MR.strings.scan_code), painterResource(MR.images.ic_qr_code)) {
-          ModalManager.shared.showModal {
-            ScanCodeView(verifyCode) { }
+        if (appPlatform.isAndroid) {
+          SimpleButton(generalGetString(MR.strings.scan_code), painterResource(MR.images.ic_qr_code)) {
+            ModalManager.shared.showModal {
+              ScanCodeView(verifyCode) { }
+            }
          }
        }
        SimpleButton(generalGetString(MR.strings.mark_code_verified), painterResource(MR.images.ic_verified_user)) {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectViaLinkView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectViaLinkView.kt
@@ -1,71 +1,11 @@
 package chat.simplex.common.views.newchat

-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import dev.icerock.moko.resources.compose.painterResource
-import dev.icerock.moko.resources.compose.stringResource
-import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.ChatModel
-import chat.simplex.common.views.newchat.ScanToConnectView
-import chat.simplex.res.MR

 enum class ConnectViaLinkTab {
  SCAN, PASTE
 }

@Composable
-fun ConnectViaLinkView(m: ChatModel, close: () -> Unit) {
-  val selection = remember {
-    mutableStateOf(
-      runCatching { ConnectViaLinkTab.valueOf(m.controller.appPrefs.connectViaLinkTab.get()!!) }.getOrDefault(ConnectViaLinkTab.SCAN)
-    )
-  }
-  val tabTitles = ConnectViaLinkTab.values().map {
-    when (it) {
-      ConnectViaLinkTab.SCAN -> stringResource(MR.strings.scan_QR_code)
-      ConnectViaLinkTab.PASTE -> stringResource(MR.strings.paste_the_link_you_received)
-    }
-  }
-  Column(
-    Modifier.fillMaxHeight(),
-    verticalArrangement = Arrangement.SpaceBetween
-  ) {
-    Column(Modifier.weight(1f)) {
-      when (selection.value) {
-        ConnectViaLinkTab.SCAN -> {
-          ScanToConnectView(m, close)
-        }
-        ConnectViaLinkTab.PASTE -> {
-          PasteToConnectView(m, close)
-        }
-      }
-    }
-    TabRow(
-      selectedTabIndex = selection.value.ordinal,
-      backgroundColor = Color.Transparent,
-      contentColor = MaterialTheme.colors.primary,
-    ) {
-      tabTitles.forEachIndexed { index, it ->
-        Tab(
-          selected = selection.value.ordinal == index,
-          onClick = {
-            selection.value = ConnectViaLinkTab.values()[index]
-            m.controller.appPrefs.connectViaLinkTab.set(selection.value .name)
-          },
-          text = { Text(it, fontSize = 13.sp) },
-          icon = {
-            Icon(
-              if (ConnectViaLinkTab.SCAN.ordinal == index) painterResource(MR.images.ic_qr_code) else painterResource(MR.images.ic_article),
-              it
-            )
-          },
-          selectedContentColor = MaterialTheme.colors.primary,
-          unselectedContentColor = MaterialTheme.colors.secondary,
-        )
-      }
-    }
-  }
-}
+expect fun ConnectViaLinkView(m: ChatModel, close: () -> Unit)
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatSheet.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatSheet.kt
@@ -1,6 +1,5 @@
 package chat.simplex.common.views.newchat

-import chat.simplex.common.platform.BackHandler
 import androidx.compose.animation.*
 import androidx.compose.animation.core.*
 import androidx.compose.desktop.ui.tooling.preview.Preview
@@ -24,7 +23,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ChatModel
-import chat.simplex.common.platform.screenWidth
+import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
@@ -55,7 +54,11 @@ fun NewChatSheet(chatModel: ChatModel, newChatSheetState: StateFlow<AnimatedView
  )
 }

-private val titles = listOf(MR.strings.share_one_time_link, MR.strings.connect_via_link_or_qr, MR.strings.create_group)
+private val titles = listOf(
+  MR.strings.share_one_time_link,
+  if (appPlatform.isAndroid) MR.strings.connect_via_link_or_qr else MR.strings.connect_via_link,
+  MR.strings.create_group
+)
 private val icons = listOf(MR.images.ic_add_link, MR.images.ic_qr_code, MR.images.ic_group)

@Composable
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/ProtocolServersView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/ProtocolServersView.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ServerAddress.Companion.parseServerAddress
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.*
+import chat.simplex.common.platform.appPlatform
 import chat.simplex.common.views.usersettings.ScanProtocolServer
 import chat.simplex.res.MR
 import kotlinx.coroutines.launch
@@ -113,18 +114,20 @@ fun ProtocolServersView(m: ChatModel, serverProtocol: ServerProtocol, close: ()
              }) {
                Text(stringResource(MR.strings.smp_servers_enter_manually), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
              }
-              SectionItemView({
-                AlertManager.shared.hideAlert()
-                ModalManager.shared.showModalCloseable { close ->
-                  ScanProtocolServer {
-                    close()
-                    servers = servers + it
-                    m.userSMPServersUnsaved.value = servers
+              if (appPlatform.isAndroid) {
+                SectionItemView({
+                  AlertManager.shared.hideAlert()
+                  ModalManager.shared.showModalCloseable { close ->
+                    ScanProtocolServer {
+                      close()
+                      servers = servers + it
+                      m.userSMPServersUnsaved.value = servers
+                    }
                  }
                }
-              }
-              ) {
-                Text(stringResource(MR.strings.smp_servers_scan_qr), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+                ) {
+                  Text(stringResource(MR.strings.smp_servers_scan_qr), Modifier.fillMaxWidth(), textAlign = TextAlign.Center, color = MaterialTheme.colors.primary)
+                }
              }
              val hasAllPresets = hasAllPresets(presetServers, servers, m)
              if (!hasAllPresets) {
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/newchat/ConnectViaLinkView.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/newchat/ConnectViaLinkView.desktop.kt
@@ -0,0 +1,9 @@
+package chat.simplex.common.views.newchat
+
+import androidx.compose.runtime.*
+import chat.simplex.common.model.ChatModel
+
+@Composable
+actual fun ConnectViaLinkView(m: ChatModel, close: () -> Unit) {
+  PasteToConnectView(m, close)
+}