Merge pull request #4436 from nextcloud/bugfix/noid/fixCallEmojiListB…

…yScrolling fix to provide all call emojis
nextcloud · Nov 14, 2024 · f94a0cf · f94a0cf
2 parents 89964c0 + cd5ee2f
commit f94a0cf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt
@@ -22,6 +22,7 @@ import com.nextcloud.talk.databinding.DialogMoreCallActionsBinding
 import com.nextcloud.talk.raisehand.viewmodel.RaiseHandViewModel
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import com.nextcloud.talk.utils.CapabilitiesUtil
+import com.nextcloud.talk.utils.DisplayUtils
 import com.nextcloud.talk.viewmodels.CallRecordingViewModel
 import com.vanniktech.emoji.EmojiTextView
 import javax.inject.Inject
@@ -96,9 +97,8 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee
                 capabilities?.spreedCapability?.config!!["call"]!!["supported-reactions"] as ArrayList<*>
 
             val param = LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                1.0f
+                DisplayUtils.convertDpToPixel(EMOJI_WIDTH.toFloat(), callActivity).toInt(),
+                LinearLayout.LayoutParams.MATCH_PARENT
             )
 
             availableReactions.forEach {
@@ -185,5 +185,6 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee
     companion object {
         private const val TAG = "MoreCallActionsDialog"
         private const val TEXT_SIZE = 20f
+        private const val EMOJI_WIDTH = 40
     }
 }
diff --git a/app/src/main/res/layout/dialog_more_call_actions.xml b/app/src/main/res/layout/dialog_more_call_actions.xml
@@ -18,18 +18,26 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <LinearLayout
-        android:id="@+id/call_emoji_bar"
+    <HorizontalScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:fadingEdgeLength="30dp"
         android:layout_marginStart="@dimen/standard_margin"
-        android:layout_marginTop="@dimen/standard_half_margin"
         android:layout_marginEnd="@dimen/standard_margin"
-        android:layout_marginBottom="@dimen/standard_half_margin"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:weightSum="10">
-    </LinearLayout>
+        android:requiresFadingEdge="horizontal"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:id="@+id/call_emoji_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/standard_half_margin"
+            android:layout_marginBottom="@dimen/standard_half_margin"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+        </LinearLayout>
+
+    </HorizontalScrollView>
 
     <TextView
         android:id="@+id/advanced_call_options_title"