Merge pull request #3970 from element-hq/feature/fga/knock_reason_fie…

…ld_update change : knock message supporting text display number of characters
element-hq · Nov 29, 2024 · 8612da9 · 8612da9
2 parents 31678c9 + 1dfabe4
commit 8612da9
Show file tree

Hide file tree

Showing 22 changed files with 69 additions and 46 deletions.
diff --git a/...nroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt b/...nroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
@@ -48,8 +48,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import java.util.Optional
 
-private const val MAX_KNOCK_MESSAGE_LENGTH = 500
-
 class JoinRoomPresenter @AssistedInject constructor(
     @Assisted private val roomId: RoomId,
     @Assisted private val roomIdOrAlias: RoomIdOrAlias,

diff --git a/.../joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt b/.../joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
@@ -18,6 +18,8 @@ import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import io.element.android.libraries.matrix.api.room.RoomType
 import io.element.android.libraries.matrix.ui.model.InviteSender
 
+internal const val MAX_KNOCK_MESSAGE_LENGTH = 500
+
 @Immutable
 data class JoinRoomState(
     val contentState: ContentState,

diff --git a/...m/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt b/...m/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
@@ -40,17 +40,6 @@ open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.CanJoin)
             ),
-            aJoinRoomState(
-                contentState = aLoadedContentState(
-                    joinAuthorisationStatus = JoinAuthorisationStatus.CanKnock,
-                    topic = "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",
-                    numberOfMembers = 888,
-                )
-            ),
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null))
             ),
@@ -81,6 +70,29 @@ open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
                     isDm = true,
                 )
             ),
+            aJoinRoomState(
+                contentState = aLoadedContentState(
+                    joinAuthorisationStatus = JoinAuthorisationStatus.CanKnock,
+                    topic = "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",
+                    numberOfMembers = 888,
+                )
+            ),
+            aJoinRoomState(
+                knockMessage = "Let me in please!",
+                contentState = aLoadedContentState(
+                    joinAuthorisationStatus = JoinAuthorisationStatus.CanKnock,
+                    topic = "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",
+                    numberOfMembers = 888,
+                )
+            ),
             aJoinRoomState(
                 contentState = aLoadedContentState(
                     name = "A knocked Room",

diff --git a/...s/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt b/...s/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
@@ -390,13 +390,18 @@ private fun DefaultLoadedContent(
                     )
                 } else if (contentState.joinAuthorisationStatus is JoinAuthorisationStatus.CanKnock) {
                     Spacer(modifier = Modifier.height(24.dp))
+                    val supportingText = if (knockMessage.isNotEmpty()) {
+                        "${knockMessage.length}/$MAX_KNOCK_MESSAGE_LENGTH"
+                    } else {
+                        stringResource(R.string.screen_join_room_knock_message_description)
+                    }
                     TextField(
                         value = knockMessage,
                         onValueChange = onKnockMessageUpdate,
                         maxLines = 3,
                         minLines = 3,
                         modifier = Modifier.fillMaxWidth(),
-                        supportingText = stringResource(R.string.screen_join_room_knock_message_description)
+                        supportingText = supportingText
                     )
                 }
             }

diff --git a/...sts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_10_en.png b/...sts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_10_en.png
diff --git a/...sts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_11_en.png b/...sts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_11_en.png
diff --git a/...sts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_12_en.png b/...sts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_12_en.png
diff --git a/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_4_en.png b/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_4_en.png
diff --git a/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_5_en.png b/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_5_en.png
diff --git a/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_6_en.png b/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_6_en.png
diff --git a/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_7_en.png b/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_7_en.png
diff --git a/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_8_en.png b/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_8_en.png
diff --git a/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png b/...ests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png
diff --git a/...s/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_10_en.png b/...s/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_10_en.png
diff --git a/...s/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_11_en.png b/...s/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_11_en.png
diff --git a/...s/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_12_en.png b/...s/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_12_en.png
diff --git a/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_4_en.png b/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_4_en.png
diff --git a/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_5_en.png b/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_5_en.png
diff --git a/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_6_en.png b/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_6_en.png
diff --git a/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_7_en.png b/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_7_en.png
diff --git a/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_8_en.png b/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_8_en.png
diff --git a/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png b/...ts/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png