mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-21 20:45:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4436 from nextcloud/bugfix/noid/fixCallEmojiListByScrolling

Browse source 
fix to provide all call emojis
This commit is contained in:
Marcel Hibbe 2024-11-14 16:02:18 +01:00 committed by GitHub
commit f94a0cf95c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt
View file

@ -22,6 +22,7 @@ import com.nextcloud.talk.databinding.DialogMoreCallActionsBinding
import com.nextcloud.talk.raisehand.viewmodel.RaiseHandViewModel import com.nextcloud.talk.raisehand.viewmodel.RaiseHandViewModel
import com.nextcloud.talk.ui.theme.ViewThemeUtils import com.nextcloud.talk.ui.theme.ViewThemeUtils
import com.nextcloud.talk.utils.CapabilitiesUtil import com.nextcloud.talk.utils.CapabilitiesUtil
import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.viewmodels.CallRecordingViewModel import com.nextcloud.talk.viewmodels.CallRecordingViewModel
import com.vanniktech.emoji.EmojiTextView import com.vanniktech.emoji.EmojiTextView
import javax.inject.Inject import javax.inject.Inject
@ -96,9 +97,8 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee
capabilities?.spreedCapability?.config!!["call"]!!["supported-reactions"] as ArrayList<*> capabilities?.spreedCapability?.config!!["call"]!!["supported-reactions"] as ArrayList<*>
val param = LinearLayout.LayoutParams( val param = LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT, DisplayUtils.convertDpToPixel(EMOJI_WIDTH.toFloat(), callActivity).toInt(),
LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT
1.0f
) )
availableReactions.forEach { availableReactions.forEach {
@ -185,5 +185,6 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee
companion object { companion object {
private const val TAG = "MoreCallActionsDialog" private const val TAG = "MoreCallActionsDialog"
private const val TEXT_SIZE = 20f private const val TEXT_SIZE = 20f
private const val EMOJI_WIDTH = 40
} }
} }

26
app/src/main/res/layout/dialog_more_call_actions.xml
View file

@ -18,18 +18,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<LinearLayout <HorizontalScrollView
android:id="@+id/call_emoji_bar"
android:layout_width="match_parent" 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_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin" android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin" android:requiresFadingEdge="horizontal"
android:gravity="center_vertical" android:scrollbars="none">
android:orientation="horizontal"
android:weightSum="10"> <LinearLayout
</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 <TextView
android:id="@+id/advanced_call_options_title" android:id="@+id/advanced_call_options_title"