Merge pull request #1844 from simplex-chat/av/multiuser-ui

android: multiusers-profilemanager

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

@@ -393,7 +393,7 @@ fun MainPage(
         }
       }
       onboarding == OnboardingStage.Step1_SimpleXInfo -> SimpleXInfo(chatModel, onboarding = true)
-      onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel)
+      onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel) {}
       onboarding == OnboardingStage.Step3_SetNotificationsMode -> SetNotificationsMode(chatModel)
     }
     ModalManager.shared.showInView()

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

@@ -293,16 +293,20 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
 
   suspend fun changeActiveUser(toUserId: Long) {
     try {
-      chatModel.currentUser.value = apiSetActiveUser(toUserId)
-      val users = listUsers()
-      chatModel.users.clear()
-      chatModel.users.addAll(users)
-      getUserChatData()
+      changeActiveUser_(toUserId)
     } catch (e: Exception) {
       Log.e(TAG, "Unable to set active user: ${e.stackTraceToString()}")
     }
   }
 
+  suspend fun changeActiveUser_(toUserId: Long) {
+    chatModel.currentUser.value = apiSetActiveUser(toUserId)
+    val users = listUsers()
+    chatModel.users.clear()
+    chatModel.users.addAll(users)
+    getUserChatData()
+  }
+
   suspend fun getUserChatData() {
     chatModel.userAddress.value = apiGetUserAddress()
     val smpServers = getUserSMPServers()
@@ -396,8 +400,8 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
     throw Exception("failed to set the user as active ${r.responseType} ${r.details}")
   }
 
-  suspend fun apiDeleteUser(userId: Long) {
-    val r = sendCmd(CC.ApiDeleteUser(userId))
+  suspend fun apiDeleteUser(userId: Long, delSMPQueues: Boolean) {
+    val r = sendCmd(CC.ApiDeleteUser(userId, delSMPQueues))
     if (r is CR.CmdOk) return
     Log.d(TAG, "apiDeleteUser: ${r.responseType} ${r.details}")
     throw Exception("failed to delete the user ${r.responseType} ${r.details}")
@@ -1729,7 +1733,7 @@ sealed class CC {
   class CreateActiveUser(val profile: Profile): CC()
   class ListUsers: CC()
   class ApiSetActiveUser(val userId: Long): CC()
-  class ApiDeleteUser(val userId: Long): CC()
+  class ApiDeleteUser(val userId: Long, val delSMPQueues: Boolean): CC()
   class StartChat(val expire: Boolean): CC()
   class ApiStopChat: CC()
   class SetFilesFolder(val filesFolder: String): CC()
@@ -1804,7 +1808,7 @@ sealed class CC {
     is CreateActiveUser -> "/create user ${profile.displayName} ${profile.fullName}"
     is ListUsers -> "/users"
     is ApiSetActiveUser -> "/_user $userId"
-    is ApiDeleteUser -> "/_delete user $userId"
+    is ApiDeleteUser -> "/_delete user $userId del_smp=${onOff(delSMPQueues)}"
     is StartChat -> "/_start subscribe=on expire=${onOff(expire)}"
     is ApiStopChat -> "/_stop"
     is SetFilesFolder -> "/_files_folder $filesFolder"

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

@@ -38,7 +38,7 @@ fun isValidDisplayName(name: String) : Boolean {
 }
 
 @Composable
-fun CreateProfilePanel(chatModel: ChatModel) {
+fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
   val displayName = remember { mutableStateOf("") }
   val fullName = remember { mutableStateOf("") }
   val focusRequester = remember { FocusRequester() }
@@ -72,10 +72,12 @@ fun CreateProfilePanel(chatModel: ChatModel) {
       ProfileNameField(fullName)
       Spacer(Modifier.fillMaxHeight().weight(1f))
       Row {
-        SimpleButton(
-          text = stringResource(R.string.about_simplex),
-          icon = Icons.Outlined.ArrowBackIosNew
-        ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }
+        if (chatModel.users.isEmpty()) {
+          SimpleButton(
+            text = stringResource(R.string.about_simplex),
+            icon = Icons.Outlined.ArrowBackIosNew
+          ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }
+        }
 
         Spacer(Modifier.fillMaxWidth().weight(1f))
 
@@ -83,7 +85,7 @@ fun CreateProfilePanel(chatModel: ChatModel) {
         val createModifier: Modifier
         val createColor: Color
         if (enabled) {
-          createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value) }.padding(8.dp)
+          createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value, close) }.padding(8.dp)
           createColor = MaterialTheme.colors.primary
         } else {
           createModifier = Modifier.padding(8.dp)
@@ -105,13 +107,22 @@ fun CreateProfilePanel(chatModel: ChatModel) {
   }
 }
 
-fun createProfile(chatModel: ChatModel, displayName: String, fullName: String) {
+fun createProfile(chatModel: ChatModel, displayName: String, fullName: String, close: () -> Unit) {
   withApi {
     val user = chatModel.controller.apiCreateActiveUser(
       Profile(displayName, fullName, null)
     )
-    chatModel.controller.startChat(user)
-    chatModel.onboardingStage.value = OnboardingStage.Step3_SetNotificationsMode
+    chatModel.currentUser.value = user
+    if (chatModel.users.isEmpty()) {
+      chatModel.controller.startChat(user)
+      chatModel.onboardingStage.value = OnboardingStage.Step3_SetNotificationsMode
+    } else {
+      val users = chatModel.controller.listUsers()
+      chatModel.users.clear()
+      chatModel.users.addAll(users)
+      chatModel.controller.getUserChatData()
+      close()
+    }
   }
 }
 

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

@@ -23,8 +23,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.*
 import chat.simplex.app.R
 import chat.simplex.app.TAG
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.UserInfo
+import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.delay
@@ -107,7 +106,7 @@ fun UserPicker(chatModel: ChatModel, userPickerState: MutableStateFlow<AnimatedV
     ) {
       Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) {
         users.forEachIndexed { i, u ->
-          UserProfilePickerItem(u) {
+          UserProfilePickerItem(u.user, u.unreadCount) {
             userPickerState.value = AnimatedViewState.HIDING
             if (!u.user.activeUser) {
               chatModel.chats.clear()
@@ -137,8 +136,8 @@ fun UserPicker(chatModel: ChatModel, userPickerState: MutableStateFlow<AnimatedV
 }
 
 @Composable
-private fun UserProfilePickerItem(u: UserInfo, onClick: () -> Unit) {
-  SectionItemViewSpaceBetween(onClick, padding = PaddingValues(start = 8.dp, end = DEFAULT_PADDING)) {
+fun UserProfilePickerItem(u: User, unreadCount: Int = 0, onLongClick: () -> Unit = {}, onClick: () -> Unit) {
+  SectionItemViewSpaceBetween(onClick, onLongClick, padding = PaddingValues(start = 8.dp, end = DEFAULT_PADDING)) {
     Row(
       Modifier
         .widthIn(max = LocalConfiguration.current.screenWidthDp.dp * 0.7f)
@@ -146,20 +145,20 @@ private fun UserProfilePickerItem(u: UserInfo, onClick: () -> Unit) {
       verticalAlignment = Alignment.CenterVertically
     ) {
       ProfileImage(
-        image = u.user.image,
+        image = u.image,
         size = 54.dp
       )
       Text(
-        u.user.chatViewName,
+        u.chatViewName,
         modifier = Modifier
           .padding(start = 8.dp, end = 8.dp)
       )
     }
-    if (u.user.activeUser) {
+    if (u.activeUser) {
       Icon(Icons.Filled.Done, null, Modifier.size(20.dp), tint = MaterialTheme.colors.primary)
-    } else if (u.unreadCount > 0) {
+    } else if (unreadCount > 0) {
       Text(
-        unreadCountStr(u.unreadCount),
+        unreadCountStr(unreadCount),
         color = MaterialTheme.colors.onPrimary,
         fontSize = 11.sp,
         modifier = Modifier

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

@@ -8,11 +8,13 @@ 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.AnnotatedString
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.*
 import androidx.compose.ui.window.Dialog
 import chat.simplex.app.R
 import chat.simplex.app.TAG
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
+import chat.simplex.app.ui.theme.*
 
 class AlertManager {
   var alertViews = mutableStateListOf<(@Composable () -> Unit)>()
@@ -44,15 +46,25 @@ class AlertManager {
 
   fun showAlertDialogButtonsColumn(
     title: String,
-    text: String? = null,
+    text: AnnotatedString? = null,
     buttons: @Composable () -> Unit,
   ) {
     showAlert {
       Dialog(onDismissRequest = this::hideAlert) {
-        Column(Modifier.background(MaterialTheme.colors.background)) {
-          Text(title, Modifier.padding(DEFAULT_PADDING), fontSize = 18.sp)
+        Column(Modifier.background(MaterialTheme.colors.background, MaterialTheme.shapes.medium)) {
+          Text(title,
+            Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING, bottom = if (text == null) DEFAULT_PADDING else DEFAULT_PADDING_HALF),
+            fontSize = 15.sp,
+            fontWeight = FontWeight.SemiBold
+          )
           if (text != null) {
-            Text(text)
+            CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
+              Text(
+                text,
+                Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING),
+                fontSize = 14.sp,
+              )
+            }
           }
           CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
             buttons()

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

@@ -1,4 +1,5 @@
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.*
@@ -99,6 +100,7 @@ fun SectionItemView(
 @Composable
 fun SectionItemViewSpaceBetween(
   click: (() -> Unit)? = null,
+  onLongClick: (() -> Unit)? = null,
   minHeight: Dp = 46.dp,
   padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING),
   disabled: Boolean = false,
@@ -108,7 +110,7 @@ fun SectionItemViewSpaceBetween(
     .fillMaxWidth()
     .sizeIn(minHeight = minHeight)
   Row(
-    if (click == null || disabled) modifier.padding(padding) else modifier.clickable(onClick = click).padding(padding),
+    if (click == null || disabled) modifier.padding(padding) else modifier.combinedClickable(onClick = click, onLongClick = onLongClick).padding(padding),
     horizontalArrangement = Arrangement.SpaceBetween,
     verticalAlignment = Alignment.CenterVertically
   ) {

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

@@ -21,7 +21,7 @@ enum class OnboardingStage {
 }
 
 @Composable
-fun CreateProfile(chatModel: ChatModel) {
+fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
   val scope = rememberCoroutineScope()
   val scrollState = rememberScrollState()
   val keyboardState by getKeyboardState()
@@ -34,7 +34,7 @@ fun CreateProfile(chatModel: ChatModel) {
         .background(color = MaterialTheme.colors.background)
         .padding(20.dp)
     ) {
-      CreateProfilePanel(chatModel)
+      CreateProfilePanel(chatModel, close)
       LaunchedEffect(Unit) {
         setLastVersionDefault(chatModel)
       }

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

@@ -121,6 +121,8 @@ fun SettingsLayout(
           ProfilePreview(profile, stopped = stopped)
         }
         SectionDivider()
+        SettingsActionItem(Icons.Outlined.HowToReg, stringResource(R.string.your_chat_profiles), showSettingsModal { UserProfilesView(it) }, disabled = stopped)
+        SectionDivider()
         SettingsIncognitoActionItem(incognitoPref, incognito, stopped) { showModal { IncognitoView() }() }
         SectionDivider()
         SettingsActionItem(Icons.Outlined.QrCode, stringResource(R.string.your_simplex_contact_address), showModal { CreateLinkView(it, CreateLinkTab.LONG_TERM) }, disabled = stopped)

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

@@ -0,0 +1,141 @@
+package chat.simplex.app.views.usersettings
+
+import SectionDivider
+import SectionItemView
+import SectionTextFooter
+import SectionView
+import androidx.compose.foundation.*
+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.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.*
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.item.ItemAction
+import chat.simplex.app.views.chatlist.UserProfilePickerItem
+import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.onboarding.CreateProfile
+
+@Composable
+fun UserProfilesView(m: ChatModel) {
+  val users by remember { derivedStateOf { m.users.map { it.user } } }
+  UserProfilesView(
+    users = users,
+    addUser = {
+      ModalManager.shared.showModalCloseable { close ->
+        CreateProfile(m, close)
+      }
+    },
+    activateUser = { user ->
+      withBGApi {
+        m.controller.changeActiveUser(user.userId)
+      }
+    },
+    removeUser = { user ->
+      val text = buildAnnotatedString {
+        append(generalGetString(R.string.users_delete_all_chats_deleted) + "\n\n" + generalGetString(R.string.users_delete_profile_for) + " ")
+        withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {
+          append(user.chatViewName)
+        }
+        append(":")
+      }
+      AlertManager.shared.showAlertDialogButtonsColumn(
+        title = generalGetString(R.string.users_delete_question),
+        text = text,
+        buttons = {
+          Column {
+            SectionItemView({
+              AlertManager.shared.hideAlert()
+              removeUser(m, user, users, true)
+            }) {
+              Text(stringResource(R.string.users_delete_with_connections), color = Color.Red)
+            }
+            SectionItemView({
+              AlertManager.shared.hideAlert()
+              removeUser(m, user, users, false)
+            }
+            ) {
+              Text(stringResource(R.string.users_delete_data_only), color = Color.Red)
+            }
+          }
+        }
+      )
+    }
+  )
+}
+
+@Composable
+private fun UserProfilesView(
+  users: List<User>,
+  addUser: () -> Unit,
+  activateUser: (User) -> Unit,
+  removeUser: (User) -> Unit,
+) {
+  Column(
+    Modifier
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState())
+      .padding(bottom = DEFAULT_PADDING),
+  ) {
+    AppBarTitle(stringResource(R.string.your_chat_profiles))
+
+    SectionView {
+      for (user in users) {
+        UserView(user, users, activateUser, removeUser)
+        SectionDivider()
+      }
+      SectionItemView(addUser, minHeight = 68.dp) {
+        Icon(Icons.Outlined.Add, stringResource(R.string.users_add), tint = MaterialTheme.colors.primary)
+        Spacer(Modifier.padding(horizontal = 4.dp))
+        Text(stringResource(R.string.users_add), color = MaterialTheme.colors.primary)
+      }
+    }
+    SectionTextFooter(stringResource(R.string.your_chat_profiles_stored_locally))
+  }
+}
+
+@Composable
+private fun UserView(user: User, users: List<User>, activateUser: (User) -> Unit, removeUser: (User) -> Unit) {
+  var showDropdownMenu by remember { mutableStateOf(false) }
+  UserProfilePickerItem(user, onLongClick = { if (users.size > 1) showDropdownMenu = true }) {
+    activateUser(user)
+  }
+  Box(Modifier.padding(horizontal = 16.dp)) {
+    DropdownMenu(
+      expanded = showDropdownMenu,
+      onDismissRequest = { showDropdownMenu = false },
+      Modifier.width(220.dp)
+    ) {
+      ItemAction(stringResource(R.string.delete_verb), Icons.Outlined.Delete, color = Color.Red, onClick = {
+        removeUser(user)
+        showDropdownMenu = false
+      }
+      )
+    }
+  }
+}
+
+private fun removeUser(m: ChatModel, user: User, users: List<User>, delSMPQueues: Boolean) {
+  if (users.size < 2) return
+
+  withBGApi {
+    try {
+      if (user.activeUser) {
+        val newActive = users.first { !it.activeUser }
+        m.controller.changeActiveUser_(newActive.userId)
+      }
+      m.controller.apiDeleteUser(user.userId, delSMPQueues)
+      m.users.removeAll { it.user.userId == user.userId }
+    } catch (e: Exception) {
+      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_deleting_user), e.stackTraceToString())
+    }
+  }
+}

apps/android/app/src/main/res/values/strings.xml

@@ -96,6 +96,7 @@
   <string name="smp_server_test_secure_queue">Secure queue</string>
   <string name="smp_server_test_delete_queue">Delete queue</string>
   <string name="smp_server_test_disconnect">Disconnect</string>
+  <string name="error_deleting_user">Error deleting user profile</string>
 
   <!-- background service notice - SimpleXAPI.kt -->
   <string name="icon_descr_instant_notifications">Instant notifications</string>
@@ -414,6 +415,7 @@
   <!-- settings - SettingsView.kt -->
   <string name="your_settings">Your settings</string>
   <string name="your_simplex_contact_address">Your <xliff:g id="appName">SimpleX</xliff:g> contact address</string>
+  <string name="your_chat_profiles">Your chat profiles</string>
   <string name="database_passphrase_and_export">Database passphrase &amp; export</string>
   <string name="about_simplex_chat">About <xliff:g id="appNameFull">SimpleX Chat</xliff:g></string>
   <string name="how_to_use_simplex_chat">How to use it</string>
@@ -972,6 +974,15 @@
   <string name="updating_settings_will_reconnect_client_to_all_servers">Updating settings will re-connect the client to all servers.</string>
   <string name="update_network_settings_confirmation">Update</string>
 
+  <!-- UserProfilesView.kt -->
+  <string name="your_chat_profiles_stored_locally">Your chat profiles are stored locally, only on your device</string>
+  <string name="users_add">Add profile</string>
+  <string name="users_delete_question">Delete chat profile?</string>
+  <string name="users_delete_all_chats_deleted">All chats and messages will be deleted - this cannot be undone!</string>
+  <string name="users_delete_profile_for">Delete chat profile for</string>
+  <string name="users_delete_with_connections">Profile and server connections</string>
+  <string name="users_delete_data_only">Local profile data only</string>
+
   <!-- Incognito mode -->
   <string name="incognito">Incognito</string>
   <string name="incognito_random_profile">Your random profile</string>