diff options
Diffstat (limited to 'app')
13 files changed, 32 insertions, 7 deletions
diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java index f0d3c6303..66cbd6c0a 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java @@ -57,6 +57,7 @@ import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.DisplayUtils; import com.nextcloud.talk.utils.DoNotDisturbUtils; import com.nextcloud.talk.utils.NotificationUtils; +import com.nextcloud.talk.utils.ParticipantPermissions; import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew; import com.nextcloud.talk.utils.preferences.AppPreferences; @@ -205,6 +206,14 @@ public class CallNotificationActivity extends CallBaseActivity { originalBundle.putString(BundleKeys.KEY_ROOM_TOKEN, currentConversation.getToken()); originalBundle.putString(BundleKeys.KEY_CONVERSATION_NAME, currentConversation.getDisplayName()); + ParticipantPermissions participantPermission = new ParticipantPermissions(userBeingCalled, currentConversation); + originalBundle.putBoolean( + BundleKeys.KEY_PARTICIPANT_PERMISSION_CAN_PUBLISH_AUDIO, + participantPermission.canPublishAudio()); + originalBundle.putBoolean( + BundleKeys.KEY_PARTICIPANT_PERMISSION_CAN_PUBLISH_VIDEO, + participantPermission.canPublishVideo()); + Intent intent = new Intent(this, CallActivity.class); intent.putExtras(originalBundle); startActivity(intent); diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt index 19ddb50eb..1884bc2e0 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt @@ -47,6 +47,7 @@ class Reaction { ) { binding.reactionsEmojiWrapper.removeAllViews() if (message.reactions != null && message.reactions!!.isNotEmpty()) { + binding.reactionsEmojiWrapper.visibility = View.VISIBLE var remainingEmojisToDisplay = MAX_EMOJIS_TO_DISPLAY val showInfoAboutMoreEmojis = message.reactions!!.size > MAX_EMOJIS_TO_DISPLAY diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt index 5226d188a..2ce3ccbf4 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt @@ -128,7 +128,7 @@ class PollVoteFragment : Fragment() { private fun themeDialog() { viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.pollVoteSubmitButton) - viewThemeUtils.material.colorMaterialButtonText(binding.pollVoteEndPollButton) + viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.pollVoteEndPollButton) viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.pollVoteEditDismiss) } diff --git a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt index da8977e56..32f0152d7 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt @@ -153,7 +153,7 @@ class PollMainViewModel @Inject constructor(private val repository: PollReposito } private fun showEndPollButton(poll: Poll): Boolean { - return poll.status == Poll.STATUS_OPEN && (isPollCreatedByCurrentUser(poll) || isOwnerOrModerator) + return !editVotes && poll.status == Poll.STATUS_OPEN && (isPollCreatedByCurrentUser(poll) || isOwnerOrModerator) } private fun showVotersAmount(poll: Poll): Boolean { diff --git a/app/src/main/res/layout/dialog_poll_results.xml b/app/src/main/res/layout/dialog_poll_results.xml index 43afda4ee..ec0542ba1 100644 --- a/app/src/main/res/layout/dialog_poll_results.xml +++ b/app/src/main/res/layout/dialog_poll_results.xml @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/standard_margin" android:orientation="vertical" - android:gravity="center"> + android:gravity="end"> <com.google.android.material.button.MaterialButton android:id="@+id/edit_vote_button" @@ -57,10 +57,11 @@ <com.google.android.material.button.MaterialButton android:id="@+id/poll_results_end_poll_button" - style="@style/Button.Borderless" + style="@style/OutlinedButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minHeight="@dimen/min_size_clickable_area" + android:minWidth="@dimen/poll_buttons_min_width" android:text="@string/polls_end_poll" app:cornerRadius="@dimen/button_corner_radius" /> </LinearLayout> diff --git a/app/src/main/res/layout/dialog_poll_vote.xml b/app/src/main/res/layout/dialog_poll_vote.xml index 966fb1409..38e756935 100644 --- a/app/src/main/res/layout/dialog_poll_vote.xml +++ b/app/src/main/res/layout/dialog_poll_vote.xml @@ -57,7 +57,7 @@ android:layout_marginTop="@dimen/standard_margin" android:layout_marginEnd="4dp" android:orientation="vertical" - android:gravity="center"> + android:gravity="end"> <com.google.android.material.button.MaterialButton android:id="@+id/poll_vote_submit_button" @@ -66,7 +66,6 @@ android:minHeight="@dimen/min_size_clickable_area" android:minWidth="@dimen/poll_buttons_min_width" android:text="@string/polls_submit_vote" - android:theme="@style/Button.Primary" app:cornerRadius="@dimen/button_corner_radius" /> <com.google.android.material.button.MaterialButton @@ -83,10 +82,11 @@ <com.google.android.material.button.MaterialButton android:id="@+id/poll_vote_end_poll_button" - style="@style/Button.Borderless" + style="@style/OutlinedButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minHeight="@dimen/min_size_clickable_area" + android:minWidth="@dimen/poll_buttons_min_width" android:text="@string/polls_end_poll" app:cornerRadius="@dimen/button_corner_radius" /> </LinearLayout> diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index bc96bd258..cdbb82bbb 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -196,6 +196,8 @@ <string name="nc_no">Ne</string> <string name="nc_no_messages_yet">Zatím žádné zprávy</string> <string name="nc_no_proxy">Bez proxy</string> + <string name="nc_not_allowed_to_activate_audio">Nemáte oprávnění aktivovat zvuk!</string> + <string name="nc_not_allowed_to_activate_video">Nemáte oprávnění aktivovat video!</string> <string name="nc_notification_channel">%1$s v %2$s kanálu upozornění</string> <string name="nc_notification_channel_calls">Volání</string> <string name="nc_notification_channel_calls_description">Oznámit příchozí volání</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ad394c97c..944d2ca7c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -196,6 +196,8 @@ <string name="nc_no">Nein</string> <string name="nc_no_messages_yet">Noch keine Nachrichten</string> <string name="nc_no_proxy">Kein Proxy</string> + <string name="nc_not_allowed_to_activate_audio">Sie dürfen Audio nicht aktivieren!</string> + <string name="nc_not_allowed_to_activate_video">Sie dürfen Video nicht aktivieren!</string> <string name="nc_notification_channel">%1$s auf %2$s Benachrichtigungskanal</string> <string name="nc_notification_channel_calls">Anrufe</string> <string name="nc_notification_channel_calls_description">Bei eingehenden Anrufen benachrichtigen</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 00dbdc726..d0a971507 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -196,6 +196,8 @@ <string name="nc_no">Ez</string> <string name="nc_no_messages_yet">Ez dago mezurik oraindik</string> <string name="nc_no_proxy">Proxyrik ez</string> + <string name="nc_not_allowed_to_activate_audio">Ez duzu baimenik audioa gaitzeko!</string> + <string name="nc_not_allowed_to_activate_video">Ez duzu baimenik bideoa gaitzeko!</string> <string name="nc_notification_channel">%1$s %2$s jakinarazpen kanalean</string> <string name="nc_notification_channel_calls">Deiak</string> <string name="nc_notification_channel_calls_description">Jakinarazi sarrera-deiei buruz</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 370cd4f47..d56130cd4 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -196,6 +196,8 @@ <string name="nc_no">Nie</string> <string name="nc_no_messages_yet">Nie ma nowych wiadomości</string> <string name="nc_no_proxy">Brak proxy</string> + <string name="nc_not_allowed_to_activate_audio">Nie możesz aktywować dźwięku!</string> + <string name="nc_not_allowed_to_activate_video">Nie możesz aktywować wideo!</string> <string name="nc_notification_channel">%1$s na %2$s kanale powiadomień</string> <string name="nc_notification_channel_calls">Połączenia</string> <string name="nc_notification_channel_calls_description">Powiadamiaj o połączeniach przychodzących</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3a59311fc..2544c6ad5 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -196,6 +196,8 @@ <string name="nc_no">Não</string> <string name="nc_no_messages_yet">Sem mensagens ainda</string> <string name="nc_no_proxy">Sem proxy</string> + <string name="nc_not_allowed_to_activate_audio">Você não tem permissão para ativar o áudio!</string> + <string name="nc_not_allowed_to_activate_video">Você não tem permissão para ativar o vídeo!</string> <string name="nc_notification_channel">%1$s no canal de notificação %2$s</string> <string name="nc_notification_channel_calls">Chamadas</string> <string name="nc_notification_channel_calls_description">Notifique sobre chamadas recebidas</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1cdb4f0a5..34ee0d18c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -196,6 +196,8 @@ <string name="nc_no">Hayır</string> <string name="nc_no_messages_yet">Henüz bir ileti yok</string> <string name="nc_no_proxy">Vekil sunucu yok</string> + <string name="nc_not_allowed_to_activate_audio">Sesi açma izniniz yok!</string> + <string name="nc_not_allowed_to_activate_video">Görüntüyü açma izniniz yok!</string> <string name="nc_notification_channel">%1$s %2$s bildiri kanalında</string> <string name="nc_notification_channel_calls">Çağrılar</string> <string name="nc_notification_channel_calls_description">Gelen çağrılar bildirilsin</string> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d3dc72d48..17472a251 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -196,6 +196,8 @@ <string name="nc_no">否</string> <string name="nc_no_messages_yet">目前無任何訊息</string> <string name="nc_no_proxy">無proxy代理</string> + <string name="nc_not_allowed_to_activate_audio">你無權啟動語音！</string> + <string name="nc_not_allowed_to_activate_video">你無權啟動視像！</string> <string name="nc_notification_channel">%1$s在%2$s的通知頻道</string> <string name="nc_notification_channel_calls">通話</string> <string name="nc_notification_channel_calls_description">來電通知</string> |