ui: updated conditions (#5700)

* ios: updated conditions ui

* view

* kotlin

* show Updated conditions via review button

* same for android

---------

Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt

@@ -145,7 +145,13 @@ fun ChatListView(chatModel: ChatModel, userPickerState: MutableStateFlow<Animate
             Log.d(TAG, "UsageConditionsView setConditionsNotified error: ${e.message}")
           }
         }
-        UsageConditionsView(userServers = mutableStateOf(emptyList()), currUserServers = mutableStateOf(emptyList()), close = close, rhId = rhId)
+        UsageConditionsView(
+          userServers = mutableStateOf(emptyList()),
+          currUserServers = mutableStateOf(emptyList()),
+          updated = true,
+          close = close,
+          rhId = rhId
+        )
       }
     }
   }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/ChooseServerOperators.kt

@@ -94,6 +94,7 @@ fun ModalData.ChooseServerOperators(
                   UsageConditionsView(
                     currUserServers = remember { mutableStateOf(emptyList()) },
                     userServers = remember { mutableStateOf(emptyList()) },
+                    updated = false,
                     close = close,
                     rhId = null,
                   )

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/WhatsNewView.kt

@@ -14,6 +14,7 @@ import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.desktop.ui.tooling.preview.Preview
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.ChatController.appPrefs
@@ -160,15 +161,29 @@ fun ModalData.WhatsNewView(updatedConditions: Boolean = false, viaSettings: Bool
       }
 
       if (updatedConditions) {
-        Text(
-          stringResource(MR.strings.view_updated_conditions),
-          color = MaterialTheme.colors.primary,
-          modifier = Modifier.clickable {
-            modalManager.showModalCloseable {
-              close -> UsageConditionsView(userServers = mutableStateOf(emptyList()), currUserServers = mutableStateOf(emptyList()), close = close, rhId = rhId)
+        Row(
+          modifier = Modifier
+            .clip(shape = CircleShape)
+            .clickable {
+              modalManager.showModalCloseable { close ->
+                UsageConditionsView(
+                  userServers = mutableStateOf(emptyList()),
+                  currUserServers = mutableStateOf(emptyList()),
+                  updated = true,
+                  close = close,
+                  rhId = rhId
+                )
+              }
             }
-          }
-        )
+            .padding(horizontal = 6.dp, vertical = 4.dp),
+          verticalAlignment = Alignment.CenterVertically,
+          horizontalArrangement = Arrangement.Center
+        ) {
+          Text(
+            stringResource(MR.strings.view_updated_conditions),
+            color = MaterialTheme.colors.primary
+          )
+        }
       }
 
       if (!viaSettings) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/networkAndServers/NetworkAndServers.kt

@@ -22,8 +22,12 @@ import androidx.compose.ui.text.*
 import androidx.compose.ui.text.input.*
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
@@ -180,7 +184,15 @@ fun ModalData.NetworkAndServersView(closeNetworkAndServers: () -> Unit) {
   @Composable
   fun ConditionsButton(conditionsAction: UsageConditionsAction, rhId: Long?) {
     SectionItemView(
-      click = { ModalManager.start.showModalCloseable(endButtons = { ConditionsLinkButton() }) { close -> UsageConditionsView(currUserServers, userServers, close, rhId) } },
+      click = { ModalManager.start.showModalCloseable(endButtons = { ConditionsLinkButton() }) { close ->
+        UsageConditionsView(
+          currUserServers,
+          userServers,
+          updated = conditionsAction is UsageConditionsAction.Review,
+          close,
+          rhId
+        )
+      } },
     ) {
       Text(
         stringResource(if (conditionsAction is UsageConditionsAction.Review) MR.strings.operator_review_conditions else MR.strings.operator_conditions_accepted),
@@ -700,6 +712,7 @@ private fun UnsavedChangesIndicator() {
 fun UsageConditionsView(
   currUserServers: MutableState<List<UserOperatorServers>>,
   userServers: MutableState<List<UserOperatorServers>>,
+  updated: Boolean,
   close: () -> Unit,
   rhId: Long?
 ) {
@@ -733,8 +746,35 @@ fun UsageConditionsView(
     }
   }
 
+  @Composable
+  fun ConditionsDiffButton() {
+    val uriHandler = LocalUriHandler.current
+    val commit = chatModel.conditions.value.currentConditions.conditionsCommit
+    Column (
+      modifier = Modifier.fillMaxWidth(),
+      horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+      Row(
+        modifier = Modifier
+          .clip(shape = CircleShape)
+          .clickable {
+            val commitUrl = "https://github.com/simplex-chat/simplex-chat/commit/$commit"
+            uriHandler.openUriCatching(commitUrl)
+          }
+          .padding(horizontal = 6.dp, vertical = 4.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center
+      ) {
+        Text(stringResource(MR.strings.operator_open_changes), color = MaterialTheme.colors.primary)
+        Spacer(Modifier.width(8.dp))
+        Icon(painterResource(MR.images.ic_outbound), contentDescription = null, tint = MaterialTheme.colors.primary)
+      }
+    }
+  }
+
   ColumnWithScrollBar(modifier = Modifier.fillMaxSize().padding(horizontal = DEFAULT_PADDING)) {
-    AppBarTitle(stringResource(MR.strings.operator_conditions_of_use), enableAlphaChanges = false, withPadding = false, bottomPadding = DEFAULT_PADDING)
+    val title = if (updated) MR.strings.operator_updated_conditions else MR.strings.operator_conditions_of_use
+    AppBarTitle(stringResource(title), enableAlphaChanges = false, withPadding = false, bottomPadding = DEFAULT_PADDING)
     when (val conditionsAction = chatModel.conditions.value.conditionsAction) {
       is UsageConditionsAction.Review -> {
         if (conditionsAction.operators.isNotEmpty()) {
@@ -743,7 +783,7 @@ fun UsageConditionsView(
         Column(modifier = Modifier.weight(1f).padding(bottom = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF)) {
           ConditionsTextView(rhId)
         }
-        AcceptConditionsButton(conditionsAction.operators.map { it.operatorId }, close, if (conditionsAction.deadline != null) DEFAULT_PADDING_HALF else DEFAULT_PADDING * 2)
+        AcceptConditionsButton(conditionsAction.operators.map { it.operatorId }, close, if (conditionsAction.deadline != null || updated) DEFAULT_PADDING_HALF else DEFAULT_PADDING * 2)
         if (conditionsAction.deadline != null) {
           SectionTextFooter(
             text = AnnotatedString(String.format(generalGetString(MR.strings.operator_conditions_accepted_for_enabled_operators_on), localDate(conditionsAction.deadline))),
@@ -751,6 +791,10 @@ fun UsageConditionsView(
           )
           Spacer(Modifier.fillMaxWidth().height(DEFAULT_PADDING))
         }
+        if (updated) {
+          ConditionsDiffButton()
+          Spacer(Modifier.fillMaxWidth().height(DEFAULT_PADDING))
+        }
       }
 
       is UsageConditionsAction.Accepted -> {

apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml

@@ -1859,6 +1859,7 @@
   <string name="view_conditions">View conditions</string>
   <string name="accept_conditions">Accept conditions</string>
   <string name="operator_conditions_of_use">Conditions of use</string>
+  <string name="operator_updated_conditions">Updated conditions</string>
   <string name="operator_in_order_to_use_accept_conditions"><![CDATA[To use the servers of <b>%s</b>, accept conditions of use.]]></string>
   <string name="operator_use_for_messages">Use for messages</string>
   <string name="operator_use_for_messages_receiving">To receive</string>