Merge pull request #756 from salemove/release/2.1.1

Release 2.1.1

Author: andrews-moc

build.gradle

@@ -75,6 +75,7 @@ ext {
   mockitoVersion = '5.1.1'
   mockitoKotlinVersion = '4.1.0'
   mockitoAndroidTestVersion = '4.3.1'
+  mockkVersion = '1.13.7'
   archCoreVersion = '2.1.0'
   testRulesVersion = '1.5.0'
   robolectricVersion = '4.9.2'

version.properties

@@ -1,4 +1,4 @@
-#Mon Sep 04 15:11:36 UTC 2023
-dependency.coreSdk.version=1.1.0
-widgets.versionCode=68
-widgets.versionName=2.1.0
+#Wed Sep 06 16:08:35 UTC 2023
+dependency.coreSdk.version=1.1.1
+widgets.versionCode=69
+widgets.versionName=2.1.1

widgetssdk/build.gradle

@@ -97,6 +97,8 @@ dependencies {
   testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
   testImplementation "androidx.arch.core:core-testing:$archCoreVersion"
   testImplementation "org.robolectric:robolectric:$robolectricVersion"
+  testImplementation "io.mockk:mockk-android:${mockkVersion}"
+  testImplementation "io.mockk:mockk-agent:${mockkVersion}"
   androidTestImplementation "org.mockito:mockito-android:$mockitoAndroidTestVersion"
   androidTestImplementation "androidx.test.ext:junit:$androidXTestVersion"
   androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"

widgetssdk/src/main/java/com/glia/widgets/chat/ChatView.kt

@@ -20,6 +20,7 @@ import android.view.View
 import android.view.accessibility.AccessibilityEvent
 import android.widget.Toast
 import androidx.annotation.StringRes
+import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.app.ActivityOptionsCompat
@@ -101,6 +102,7 @@ import com.google.android.material.shape.MarkerEdgeTreatment
 import com.google.android.material.theme.overlay.MaterialThemeOverlay
 import java.io.File
 import java.io.IOException
+import java.util.concurrent.Executor
 import kotlin.properties.Delegates
 
 class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) :
@@ -1302,6 +1304,14 @@ class ChatView(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defSty
             chatRecyclerView.updatePadding(bottom = dialogHeight)
             chatRecyclerView.scrollBy(0, dialogHeight)
             groupChatControls.isGone = true
+            operatorTypingAnimationView.isGone = true
         }
     }
+
+    @VisibleForTesting
+    internal var executor: Executor? = null
+
+    override fun post(action: Runnable?): Boolean {
+        return executor?.execute(action)?.let { true } ?: super.post(action)
+    }
 }

widgetssdk/src/main/java/com/glia/widgets/di/Dependencies.java

@@ -136,6 +136,11 @@ public static void setControllerFactory(ControllerFactory controllerFactory) {
         Dependencies.controllerFactory = controllerFactory;
     }
 
+    @VisibleForTesting
+    public static void setUseCaseFactory(UseCaseFactory useCaseFactory) {
+        Dependencies.useCaseFactory = useCaseFactory;
+    }
+
     public static GliaCore glia() {
         return gliaCore;
     }

widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/UnifiedThemeManager.kt

@@ -1,15 +1,15 @@
 package com.glia.widgets.view.unifiedui.theme
 
+import androidx.annotation.VisibleForTesting
 import com.glia.widgets.view.unifiedui.parse.RemoteConfigurationParser
 
 internal class UnifiedThemeManager {
     private val parser: RemoteConfigurationParser by lazy { RemoteConfigurationParser() }
 
-    private var _theme: UnifiedTheme? = null
-    val theme: UnifiedTheme?
-        get() = _theme
+    @VisibleForTesting
+    internal var theme: UnifiedTheme? = null
 
     fun applyJsonConfig(jsonConfig: String?) {
-        _theme = jsonConfig?.let(parser::parseRemoteConfiguration)?.toUnifiedTheme()
+        theme = jsonConfig?.let(parser::parseRemoteConfiguration)?.toUnifiedTheme()
     }
 }

widgetssdk/src/main/res/layout/chat_view.xml

@@ -163,6 +163,6 @@
         android:id="@+id/group_chat_controls"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:constraint_referenced_ids="operator_typing_animation_view, divider_view, add_attachment_queue, chat_message_layout" />
+        app:constraint_referenced_ids="divider_view, add_attachment_queue, chat_message_layout" />
 
 </merge>

widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewQuickReplySnapshotTest_defaultTheme.png

@@ -0,0 +1,78 @@
+package com.glia.widgets.chat
+
+import com.glia.widgets.SnapshotTest
+import com.glia.widgets.chat.model.ChatState
+import com.glia.widgets.chat.model.GvaButton
+import com.glia.widgets.snapshotutils.SnapshotChatView
+import com.glia.widgets.snapshotutils.SnapshotGva
+import org.junit.Test
+
+internal class ChatViewQuickReplySnapshotTest : SnapshotTest(), SnapshotChatView, SnapshotGva {
+
+    override val chatViewMock = SnapshotChatView.Mock(this)
+
+    override fun setUp() {
+        super.setUp()
+        chatViewMock.setUp()
+    }
+
+    override fun tearDown() {
+        chatViewMock.tearDown()
+        super.tearDown()
+    }
+
+    private fun gvaButtons() = shortLengthTexts().map { GvaButton(it) }
+
+    private fun chatState() = ChatState()
+        .changeVisibility(true)
+        .copy(gvaQuickReplies = gvaButtons())
+
+    @Test
+    fun defaultTheme() {
+        snapshot(
+            setupView(
+                chatState = chatState()
+            ).root
+        )
+    }
+
+    @Test
+    fun withUiTheme() {
+        snapshot(
+            setupView(
+                chatState = chatState(),
+                uiTheme = uiTheme()
+            ).root
+        )
+    }
+
+    @Test
+    fun withGlobalColors() {
+        snapshot(
+            setupView(
+                chatState = chatState(),
+                unifiedTheme = unifiedThemeWithGlobalColors()
+            ).root
+        )
+    }
+
+    @Test
+    fun withWithUnifiedTheme() {
+        snapshot(
+            setupView(
+                chatState = chatState(),
+                unifiedTheme = unifiedTheme()
+            ).root
+        )
+    }
+
+    @Test
+    fun withWithUnifiedThemeWithoutGva() {
+        snapshot(
+            setupView(
+                chatState = chatState(),
+                unifiedTheme = unifiedThemeWithoutGva()
+            ).root
+        )
+    }
+}

widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewQuickReplySnapshotTest_withGlobalColors.png

@@ -0,0 +1,25 @@
+package com.glia.widgets.chat
+
+import com.glia.widgets.SnapshotTest
+import com.glia.widgets.chat.model.ChatState
+import com.glia.widgets.snapshotutils.SnapshotChatView
+import org.junit.Test
+
+internal class ChatViewSnapshotTest : SnapshotTest(), SnapshotChatView {
+
+    override val chatViewMock = SnapshotChatView.Mock(this)
+
+    override fun setUp() {
+        super.setUp()
+        chatViewMock.setUp()
+    }
+
+    @Test
+    fun initialState() {
+        snapshot(
+            setupView(
+                chatState = ChatState()
+            ).root
+        )
+    }
+}

widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewQuickReplySnapshotTest_withUiTheme.png

@@ -0,0 +1,112 @@
+package com.glia.widgets.snapshotutils
+
+import android.app.Activity
+import android.content.Context
+import android.view.View
+import android.view.Window
+import androidx.core.graphics.toColorInt
+import com.glia.widgets.UiTheme
+import com.glia.widgets.chat.ChatView
+import com.glia.widgets.chat.ChatViewCallback
+import com.glia.widgets.chat.controller.ChatController
+import com.glia.widgets.chat.model.ChatItem
+import com.glia.widgets.chat.model.ChatState
+import com.glia.widgets.core.fileupload.model.FileAttachment
+import com.glia.widgets.databinding.ChatActivityBinding
+import com.glia.widgets.di.ControllerFactory
+import com.glia.widgets.di.Dependencies
+import com.glia.widgets.di.UseCaseFactory
+import com.glia.widgets.filepreview.domain.usecase.GetImageFileFromCacheUseCase
+import com.glia.widgets.filepreview.domain.usecase.GetImageFileFromDownloadsUseCase
+import com.glia.widgets.filepreview.domain.usecase.GetImageFileFromNetworkUseCase
+import com.glia.widgets.helper.ResourceProvider
+import com.glia.widgets.helper.requireActivity
+import com.glia.widgets.view.unifiedui.theme.UnifiedTheme
+import io.mockk.every
+import io.mockk.mockkStatic
+import org.mockito.ArgumentCaptor
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+import java.util.concurrent.Executor
+
+internal interface SnapshotChatView : SnapshotContent {
+    val chatViewMock: Mock
+
+    class Mock(private val snapshotContent: SnapshotContent) {
+        lateinit var activityMock: Activity
+        lateinit var windowMock: Window
+
+        lateinit var controllerFactoryMock: ControllerFactory
+        lateinit var chatControllerMock: ChatController
+
+        lateinit var useCaseFactoryMock: UseCaseFactory
+        lateinit var getImageFileFromCacheUseCaseMock: GetImageFileFromCacheUseCase
+        lateinit var getImageFileFromDownloadsUseCaseMock: GetImageFileFromDownloadsUseCase
+        lateinit var getImageFileFromNetworkUseCaseMock: GetImageFileFromNetworkUseCase
+
+        lateinit var chatViewCallbackCaptor: ArgumentCaptor<ChatViewCallback>
+
+        fun setUp(statusBarColor: Int = "#123456".toColorInt()) {
+            activityMock = mock()
+            windowMock = mock()
+            whenever(activityMock.window).thenReturn(windowMock)
+            whenever(windowMock.statusBarColor).thenReturn(statusBarColor)
+            mockkStatic("com.glia.widgets.helper.ContextExtensionsKt")
+            every { any<Context>().requireActivity() } returns activityMock
+
+            chatViewCallbackCaptor = ArgumentCaptor.forClass(ChatViewCallback::class.java)
+            chatControllerMock = mock()
+            controllerFactoryMock = mock()
+            whenever(controllerFactoryMock.getChatController(chatViewCallbackCaptor.capture())).thenReturn(chatControllerMock)
+
+            getImageFileFromCacheUseCaseMock = mock()
+            getImageFileFromDownloadsUseCaseMock = mock()
+            getImageFileFromNetworkUseCaseMock = mock()
+            useCaseFactoryMock = mock()
+            whenever(useCaseFactoryMock.createGetImageFileFromCacheUseCase()).thenReturn(getImageFileFromCacheUseCaseMock)
+            whenever(useCaseFactoryMock.createGetImageFileFromDownloadsUseCase()).thenReturn(getImageFileFromDownloadsUseCaseMock)
+            whenever(useCaseFactoryMock.createGetImageFileFromNetworkUseCase()).thenReturn(getImageFileFromNetworkUseCaseMock)
+
+            Dependencies.setControllerFactory(controllerFactoryMock)
+            Dependencies.setUseCaseFactory(useCaseFactoryMock)
+            Dependencies.setResourceProvider(ResourceProvider(snapshotContent.context))
+        }
+
+        fun tearDown() {
+            Dependencies.getGliaThemeManager().theme = null
+        }
+    }
+
+    data class ViewData(
+        val root: View,
+        val chatView: ChatView
+    )
+
+    fun setupView(
+        chatState: ChatState? = null,
+        chatItems: List<ChatItem>? = null,
+        fileAttachments: List<FileAttachment>? = null,
+        executor: Executor? = Executor(Runnable::run),
+        unifiedTheme: UnifiedTheme? = null,
+        uiTheme: UiTheme? = null,
+        callback: ((ChatViewCallback) -> Unit)? = null
+    ): ViewData {
+        unifiedTheme?.let { Dependencies.getGliaThemeManager().theme = it }
+
+        val chatActivityBinding = ChatActivityBinding.inflate(layoutInflater)
+        val root = chatActivityBinding.root
+        val chatView = chatActivityBinding.chatView
+
+        chatView.setUiTheme(uiTheme)
+
+        chatView.executor = executor
+
+        val chatViewCallback = chatViewMock.chatViewCallbackCaptor.value
+        chatState?.let { chatViewCallback.emitState(it) }
+        chatItems?.let { chatViewCallback.emitItems(it) }
+        fileAttachments?.let { chatViewCallback.emitUploadAttachments(it) }
+        callback?.invoke(chatViewCallback)
+
+        return ViewData(root, chatView)
+    }
+}

widgetssdk/src/test/snapshots/images/com.glia.widgets.chat_ChatViewQuickReplySnapshotTest_withWithUnifiedTheme.png

@@ -9,4 +9,8 @@ interface SnapshotStrings {
         "In pulvinar id turpis ut interdum",
         "Sed quis ex nisl vestibulum risus"
     )
+
+    fun shortLengthTexts() = listOf(
+        "Maecenas dolor", "Dignissim", "Vestibulum risus", "Ut posuere", "Interdum", "Sed quis ex nisl"
+    )
 }