Improve transitions btw Screens and minor UI fixes

MOB 3002
salemove · Jan 24, 2024 · 9ec984e · 9ec984e
1 parent 8709e88
commit 9ec984e
Show file tree

Hide file tree

Showing 130 changed files with 393 additions and 316 deletions.
diff --git a/app/src/main/res/raw/global_colors_unified_config.json b/app/src/main/res/raw/global_colors_unified_config.json
@@ -2,11 +2,11 @@
   "globalColors": {
     "primary": "#6c5ce7",
     "secondary": "#a29bfe",
-    "baseNormal": "#dfe6e9",
+    "baseNormal": "#a8afb2",
     "baseLight": "#dfe6e9",
     "baseDark": "#ffffff",
     "baseShade": "#fdcb6e",
     "baseNeutral": "#938cb3",
     "systemNegative": "#d63031"
   }
-}
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/base/FadeTransitionActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/base/FadeTransitionActivity.kt
@@ -0,0 +1,34 @@
+package com.glia.widgets.base
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+open class FadeTransitionActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+    }
+
+    override fun finish() {
+        super.finish()
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+    }
+
+    override fun finishAndRemoveTask() {
+        super.finishAndRemoveTask()
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+    }
+
+    override fun startActivity(intent: Intent?) {
+        super.startActivity(intent)
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+    }
+
+    override fun startActivity(intent: Intent?, options: Bundle?) {
+        super.startActivity(intent, options)
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+    }
+
+}
diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallActivity.java b/widgetssdk/src/main/java/com/glia/widgets/call/CallActivity.java
@@ -7,10 +7,10 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import androidx.appcompat.app.AppCompatActivity;
 
 import com.glia.widgets.GliaWidgets;
 import com.glia.widgets.R;
+import com.glia.widgets.base.FadeTransitionActivity;
 import com.glia.widgets.chat.ChatActivity;
 import com.glia.widgets.core.configuration.GliaSdkConfiguration;
 import com.glia.widgets.helper.Logger;
@@ -19,7 +19,7 @@
 
 import java.util.Objects;
 
-public class CallActivity extends AppCompatActivity {
+public class CallActivity extends FadeTransitionActivity {
     private static final String TAG = CallActivity.class.getSimpleName();
 
     private Configuration configuration;

diff --git a/widgetssdk/src/main/java/com/glia/widgets/call/CallView.kt b/widgetssdk/src/main/java/com/glia/widgets/call/CallView.kt
@@ -556,7 +556,7 @@ internal class CallView(
 
     private fun initConfigurations() {
         visibility = INVISIBLE
-        setBackgroundColor(getColorCompat(R.color.glia_transparent_black_bg))
+        setBackgroundColor(getColorCompat(R.color.glia_call_view_background_color))
         // needed to overlap existing app bar in existing view with this view's app bar.
         elevation = Constants.WIDGETS_SDK_LAYER_ELEVATION
     }
@@ -620,7 +620,7 @@ internal class CallView(
         val activity = context.requireActivity()
         if (defaultStatusBarColor == null) {
             defaultStatusBarColor = activity.window.statusBarColor
-            changeStatusBarColor(getColorCompat(R.color.glia_transparent_black_bg))
+            changeStatusBarColor(getColorCompat(R.color.glia_call_view_background_color))
         }
     }
 
@@ -875,7 +875,7 @@ internal class CallView(
                 callState.isVideoCall
             ) {
                 appBar.backgroundTintList =
-                    getColorStateListCompat(R.color.glia_transparent_black_bg)
+                    getColorStateListCompat(R.color.glia_call_view_background_color)
             } else {
                 appBar.backgroundTintList = getColorStateListCompat(android.R.color.transparent)
             }

diff --git a/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/EndScreenSharingActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/callvisualizer/EndScreenSharingActivity.kt
@@ -1,13 +1,13 @@
 package com.glia.widgets.callvisualizer
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import com.glia.widgets.base.FadeTransitionActivity
 import com.glia.widgets.databinding.EndScreenSharingActivityBinding
 import com.glia.widgets.di.Dependencies
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.TAG
 
-class EndScreenSharingActivity : AppCompatActivity(), EndScreenSharingView.OnFinishListener {
+class EndScreenSharingActivity : FadeTransitionActivity(), EndScreenSharingView.OnFinishListener {
 
     private lateinit var binding: EndScreenSharingActivityBinding
 

diff --git a/widgetssdk/src/main/java/com/glia/widgets/chat/ChatActivity.java b/widgetssdk/src/main/java/com/glia/widgets/chat/ChatActivity.java
@@ -7,11 +7,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 
 import com.glia.widgets.GliaWidgets;
 import com.glia.widgets.R;
 import com.glia.widgets.UiTheme;
+import com.glia.widgets.base.FadeTransitionActivity;
 import com.glia.widgets.call.CallActivity;
 import com.glia.widgets.call.Configuration;
 import com.glia.widgets.core.configuration.GliaSdkConfiguration;
@@ -20,7 +20,7 @@
 
 import java.util.Objects;
 
-public class ChatActivity extends AppCompatActivity {
+public class ChatActivity extends FadeTransitionActivity {
     private static final String TAG = ChatActivity.class.getSimpleName();
     private ChatView chatView;
 

diff --git a/...c/main/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcher.kt b/...c/main/java/com/glia/widgets/engagement/completion/EngagementCompletionActivityWatcher.kt
@@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.collection.ArrayMap
 import com.glia.androidsdk.engagement.Survey
 import com.glia.widgets.GliaWidgets
+import com.glia.widgets.R
 import com.glia.widgets.UiTheme
 import com.glia.widgets.base.SimpleActivityLifecycleCallbacks
 import com.glia.widgets.engagement.completion.EngagementCompletionContract.State
@@ -51,7 +52,8 @@ internal class EngagementCompletionActivityWatcher @JvmOverloads constructor(
             val newIntent: Intent = Intent(this, SurveyActivity::class.java)
                 .putExtra(GliaWidgets.UI_THEME, theme)
                 .putExtra(GliaWidgets.SURVEY, survey as Parcelable)
-                .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+
+            overridePendingTransition(R.anim.slide_up, 0)
             startActivity(newIntent)
         }
     }

diff --git a/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/messagecenter/MessageCenterActivity.kt
@@ -10,10 +10,10 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts.GetContent
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.activity.result.contract.ActivityResultContracts.TakePicture
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import com.glia.widgets.GliaWidgets.CHAT_TYPE
+import com.glia.widgets.base.FadeTransitionActivity
 import com.glia.widgets.chat.ChatActivity
 import com.glia.widgets.chat.ChatType
 import com.glia.widgets.core.configuration.GliaSdkConfiguration
@@ -28,7 +28,7 @@ import com.glia.widgets.helper.mapUriToFileAttachment
 import java.io.IOException
 
 class MessageCenterActivity :
-    AppCompatActivity(),
+    FadeTransitionActivity(),
     MessageCenterView.OnFinishListener,
     MessageCenterView.OnNavigateToMessagingListener,
     MessageCenterView.OnAttachFileListener {
@@ -144,7 +144,7 @@ class MessageCenterActivity :
         finish()
     }
 
-    private fun createConfiguration(intent: Intent): GliaSdkConfiguration? {
+    private fun createConfiguration(intent: Intent): GliaSdkConfiguration {
         return GliaSdkConfiguration.Builder()
             .intent(intent)
             .build()

diff --git a/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyActivity.java b/widgetssdk/src/main/java/com/glia/widgets/survey/SurveyActivity.java
@@ -56,9 +56,8 @@ public void onFinish() {
 
     @Override
     public void finishAndRemoveTask() {
+        overridePendingTransition(0, R.anim.slide_down);
         super.finishAndRemoveTask();
-
-        overridePendingTransition(0, 0);
     }
 
     private void hideSoftKeyboard() {

diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/dialog/holder/DialogHolderActivity.kt b/widgetssdk/src/main/java/com/glia/widgets/view/dialog/holder/DialogHolderActivity.kt
@@ -7,13 +7,14 @@ import androidx.appcompat.app.AppCompatActivity
 internal class DialogHolderActivity : AppCompatActivity() {
 
     override fun finish() {
-        super.finish()
         overridePendingTransition(0, 0)
+        super.finish()
     }
 
     companion object {
         fun start(activity: Activity) {
-            activity.startActivity(Intent(activity, DialogHolderActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION))
+            activity.startActivity(Intent(activity, DialogHolderActivity::class.java))
+            activity.overridePendingTransition(0, android.R.anim.fade_out)
         }
     }
 

diff --git a/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Attachments.kt b/widgetssdk/src/main/java/com/glia/widgets/view/unifiedui/theme/defaulttheme/Attachments.kt
@@ -6,23 +6,32 @@ import com.glia.widgets.view.unifiedui.composeIfAtLeastOneNotNull
 import com.glia.widgets.view.unifiedui.theme.ColorPallet
 import com.glia.widgets.view.unifiedui.theme.chat.AttachmentItemTheme
 import com.glia.widgets.view.unifiedui.theme.chat.AttachmentsPopupTheme
+import com.glia.widgets.view.unifiedui.theme.chat.UploadFileTheme
 
 /**
  * Default theme for Attachments popup
  */
-internal fun DefaultAttachmentsPopupTheme(pallet: ColorPallet): AttachmentsPopupTheme? =
-    pallet.run {
-        composeIfAtLeastOneNotNull(baseDarkColorTheme, baseShadeColorTheme, baseNeutralColorTheme) {
-            val attachmentItem = AttachmentItemTheme(
-                text = BaseDarkColorTextTheme(this),
-                iconColor = baseDarkColorTheme
-            )
-            AttachmentsPopupTheme(
-                photoLibrary = attachmentItem,
-                takePhoto = attachmentItem,
-                browse = attachmentItem,
-                dividerColor = baseShadeColorTheme,
-                background = baseNeutralColorTheme
-            )
-        }
+internal fun DefaultAttachmentsPopupTheme(pallet: ColorPallet): AttachmentsPopupTheme? = pallet.run {
+    composeIfAtLeastOneNotNull(baseDarkColorTheme, baseShadeColorTheme, baseNeutralColorTheme) {
+        val attachmentItem = AttachmentItemTheme(
+            text = BaseDarkColorTextTheme(this),
+            iconColor = baseDarkColorTheme
+        )
+        AttachmentsPopupTheme(
+            photoLibrary = attachmentItem,
+            takePhoto = attachmentItem,
+            browse = attachmentItem,
+            dividerColor = baseShadeColorTheme,
+            background = baseNeutralColorTheme
+        )
     }
+}
+
+/**
+ * Default theme for File upload bar item
+ */
+internal fun DefaultUploadFileTheme(pallet: ColorPallet): UploadFileTheme? = pallet.run {
+    composeIfAtLeastOneNotNull(baseNormalColorTheme, baseDarkColorTheme) {
+        UploadFileTheme(text = BaseNormalColorTextTheme(pallet), info = BaseDarkColorTextTheme(pallet))
+    }
+}