mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reworked zrtp sas validation dialog layout

Browse source
This commit is contained in:
Sylvain Berfini 2024-06-20 12:19:58 +02:00
parent 4bd6dc4e0f
commit ec6316f6e5
11 changed files with 512 additions and 333 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
View file

@ -234,6 +234,7 @@ class ActiveCallFragment : GenericCallFragment() {
model.skipEvent.observe(viewLifecycleOwner) { event ->
event.consume {
callViewModel.skipZrtpSas()
callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
dialog.dismiss()
}
}
@ -241,6 +242,7 @@ class ActiveCallFragment : GenericCallFragment() {
model.authTokenClickedEvent.observe(viewLifecycleOwner) { event ->
event.consume { authToken ->
callViewModel.updateZrtpSas(authToken)
callMediaEncryptionStatsBottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
dialog.dismiss()
}
}

20
app/src/main/java/org/linphone/ui/call/model/ZrtpSasConfirmationDialogModel.kt
View file

@ -19,16 +19,10 @@
*/
package org.linphone.ui.call.model
import android.graphics.Typeface
import android.text.SpannableStringBuilder
import android.text.Spanned
import android.text.style.StyleSpan
import androidx.annotation.UiThread
import androidx.lifecycle.MutableLiveData
import org.linphone.R
import org.linphone.core.tools.Log
import org.linphone.ui.GenericViewModel
import org.linphone.utils.AppUtils
import org.linphone.utils.Event
class ZrtpSasConfirmationDialogModel @UiThread constructor(
@ -39,7 +33,7 @@ class ZrtpSasConfirmationDialogModel @UiThread constructor(
private const val TAG = "[ZRTP SAS Confirmation Dialog]"
}
val message = MutableLiveData<Spanned>()
val localToken = MutableLiveData<String>()
val letters1 = MutableLiveData<String>()
val letters2 = MutableLiveData<String>()
val letters3 = MutableLiveData<String>()
@ -50,17 +44,7 @@ class ZrtpSasConfirmationDialogModel @UiThread constructor(
val skipEvent = MutableLiveData<Event<Boolean>>()
init {
val text = AppUtils.getString(R.string.call_dialog_zrtp_validate_trust_subtitle)
val boldIndex = text.indexOf("%s")
val formattedText = text.replace("%s", authTokenToRead)
val builder = SpannableStringBuilder(formattedText)
builder.setSpan(
StyleSpan(Typeface.BOLD),
boldIndex,
boldIndex + authTokenToRead.length,
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
)
message.value = builder
localToken.value = authTokenToRead
letters1.value = authTokensToListen[0]
letters2.value = authTokensToListen[1]
letters3.value = authTokensToListen[2]

18
app/src/main/res/drawable/shape_zrtp_dialog_background.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
<solid
android:color="@color/blue_info_500"/>
</shape>
</item>
<item android:bottom="2dp">
<shape android:shape="rectangle">
<corners android:radius="15dp" />
<solid
android:color="@color/white" />
</shape>
</item>
</layer-list>

10
app/src/main/res/drawable/shape_zrtp_dialog_header_background.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:topLeftRadius="15dp" android:topRightRadius="15dp" />
<solid android:color="@color/blue_info_500"/>
</shape>
</item>
</layer-list>

10
app/src/main/res/drawable/shape_zrtp_tokens_dialog_background.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="15dp" />
<stroke android:width="1dp" android:color="@color/gray_main2_200"/>
</shape>
</item>
</layer-list>

385
app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml
View file

@ -13,173 +13,252 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp">
<ImageView
android:id="@+id/dialog_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:contentDescription="@null"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
android:id="@+id/title"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/header"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/call_dialog_zrtp_validate_trust_title"
android:background="@drawable/shape_zrtp_dialog_header_background"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/body"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/message"
<ImageView
android:id="@+id/header_icon"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginTop="10dp"
android:src="@drawable/lock_key"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:tint="@color/white" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@id/header_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:paddingBottom="10dp"
android:text="@string/call_dialog_zrtp_validate_trust_title"
android:textSize="14sp"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/header_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_600"
android:id="@+id/skip"
android:onClick="@{() -> viewModel.skip()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="13dp"
android:paddingBottom="13dp"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:text="@string/call_zrtp_sas_validation_skip"
android:textSize="13sp"
android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="10dp"
android:text="@{viewModel.message, default=@string/call_dialog_zrtp_validate_trust_subtitle}"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@id/letters_1"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters1)}"
style="@style/default_text_style"
android:id="@+id/letters_1"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:text="@{viewModel.letters1, default=`RV`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp"
android:background="@drawable/shape_zrtp_dialog_background"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintTop_toBottomOf="@id/header"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/letters_2"
app:layout_constraintTop_toBottomOf="@id/message"
app:layout_constraintBottom_toTopOf="@id/skip"
app:layout_constraintHorizontal_chainStyle="packed"/>
app:layout_constraintEnd_toEndOf="parent">
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters2)}"
style="@style/default_text_style"
android:id="@+id/letters_2"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginEnd="32dp"
android:text="@{viewModel.letters2, default=`PT`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_1"
app:layout_constraintEnd_toStartOf="@id/letters_3"
app:layout_constraintTop_toTopOf="@id/letters_1"
app:layout_constraintBottom_toBottomOf="@id/letters_1"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="10dp"
android:text="@string/call_dialog_zrtp_validate_trust_message"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
app:layout_constraintWidth_max="@dimen/toast_max_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/local_code_label"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters3)}"
style="@style/default_text_style"
android:id="@+id/letters_3"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginEnd="32dp"
android:text="@{viewModel.letters3, default=`BB`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_2"
app:layout_constraintEnd_toStartOf="@id/letters_4"
app:layout_constraintTop_toTopOf="@id/letters_2"
app:layout_constraintBottom_toBottomOf="@id/letters_2"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/local_code_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="30dp"
android:text="@string/call_dialog_zrtp_validate_trust_local_code_label"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
app:layout_constraintStart_toEndOf="@id/message"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/message"
app:layout_constraintBottom_toTopOf="@id/local_code_value"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters4)}"
style="@style/default_text_style"
android:id="@+id/letters_4"
android:layout_width="70dp"
android:layout_height="70dp"
android:text="@{viewModel.letters4, default=`NM`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/letters_1"
app:layout_constraintBottom_toBottomOf="@id/letters_1"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@+id/local_code_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.localToken, default=`ZZ`}"
android:textSize="18sp"
android:textColor="@color/gray_main2_600"
app:layout_constraintStart_toStartOf="@id/local_code_label"
app:layout_constraintEnd_toEndOf="@id/local_code_label"
app:layout_constraintTop_toBottomOf="@id/local_code_label"
app:layout_constraintBottom_toBottomOf="@id/message"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.skip()}"
style="@style/default_text_style_600"
android:id="@+id/skip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:text="@string/call_zrtp_sas_validation_skip"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/letters_1"
app:layout_constraintBottom_toTopOf="@id/nothing_matches"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/remote_tokens"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="30dp"
android:paddingEnd="30dp"
android:paddingBottom="10dp"
android:background="@drawable/shape_zrtp_tokens_dialog_background"
app:layout_constraintTop_toBottomOf="@id/message"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.notFound()}"
style="@style/default_text_style_600"
android:id="@+id/nothing_matches"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/shape_red_outlined_button_background"
android:text="@string/call_dialog_zrtp_validate_trust_letters_do_not_match"
android:textSize="18sp"
android:textColor="?attr/color_danger_500"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/skip"
app:layout_constraintBottom_toTopOf="@id/anchor"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/remote_code_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/call_dialog_zrtp_validate_trust_remote_code_label"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<View
android:id="@+id/anchor"
android:layout_width="wrap_content"
android:layout_height="@dimen/dialog_top_bottom_margin"
app:layout_constraintTop_toBottomOf="@id/nothing_matches"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters1)}"
style="@style/default_text_style"
android:id="@+id/letters_1"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="30dp"
android:layout_marginStart="10dp"
android:layout_marginBottom="10dp"
android:text="@{viewModel.letters1, default=`RV`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/circle_white_button_background"
android:elevation="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/letters_2"
app:layout_constraintTop_toBottomOf="@id/remote_code_label"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters2)}"
style="@style/default_text_style"
android:id="@+id/letters_2"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginEnd="10dp"
android:text="@{viewModel.letters2, default=`PT`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/circle_white_button_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_1"
app:layout_constraintEnd_toStartOf="@id/letters_3"
app:layout_constraintTop_toTopOf="@id/letters_1"
app:layout_constraintBottom_toBottomOf="@id/letters_1"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters3)}"
style="@style/default_text_style"
android:id="@+id/letters_3"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginEnd="30dp"
android:layout_marginStart="10dp"
android:text="@{viewModel.letters3, default=`BB`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/circle_white_button_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_2"
app:layout_constraintEnd_toStartOf="@id/letters_4"
app:layout_constraintTop_toTopOf="@id/letters_1"
app:layout_constraintBottom_toBottomOf="@id/letters_1"
app:layout_constraintHorizontal_chainStyle="packed"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters4)}"
style="@style/default_text_style"
android:id="@+id/letters_4"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginEnd="10dp"
android:text="@{viewModel.letters4, default=`NM`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/circle_white_button_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/letters_1"
app:layout_constraintBottom_toBottomOf="@id/letters_1"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.notFound()}"
style="@style/default_text_style_600"
android:id="@+id/nothing_matches"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/shape_red_outlined_button_background"
android:text="@string/call_dialog_zrtp_validate_trust_letters_do_not_match"
android:textSize="18sp"
android:textColor="?attr/color_danger_500"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/remote_tokens"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/call_ended_fragment.xml
View file

@ -66,7 +66,7 @@
android:layout_height="wrap_content"
layout="@layout/call_media_encryption_info"
bind:viewModel="@{viewModel}"
app:layout_constraintTop_toBottomOf="@id/name"
app:layout_constraintTop_toBottomOf="@id/call_direction_label"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintEnd_toEndOf="parent"/>

382
app/src/main/res/layout/dialog_confirm_zrtp_sas.xml
View file

@ -13,174 +13,244 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp">
<ImageView
android:id="@+id/dialog_background"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="2dp"
android:src="@drawable/shape_dialog_background"
android:contentDescription="@null"
app:layout_constraintBottom_toBottomOf="@id/anchor"
app:layout_constraintWidth_max="@dimen/dialog_max_width"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/call_dialog_zrtp_validate_trust_title"
android:background="@drawable/shape_zrtp_dialog_header_background"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/body">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/message"
android:layout_width="0dp"
<ImageView
android:id="@+id/header_icon"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginTop="10dp"
android:src="@drawable/lock_key"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:tint="@color/white" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@id/header_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:paddingBottom="10dp"
android:text="@string/call_dialog_zrtp_validate_trust_title"
android:textSize="14sp"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@id/header_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_600"
android:id="@+id/skip"
android:onClick="@{() -> viewModel.skip()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="13dp"
android:paddingBottom="13dp"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:text="@string/call_zrtp_sas_validation_skip"
android:textSize="13sp"
android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="10dp"
android:text="@{viewModel.message, default=@string/call_dialog_zrtp_validate_trust_subtitle}"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@id/letters_1"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/title" />
android:background="@drawable/shape_zrtp_dialog_background"
app:layout_constraintTop_toBottomOf="@id/header"
app:layout_constraintBottom_toBottomOf="parent">
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters1)}"
style="@style/default_text_style"
android:id="@+id/letters_1"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="32dp"
android:text="@{viewModel.letters1, default=`RV`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/letters_2"
app:layout_constraintTop_toBottomOf="@id/message"
app:layout_constraintBottom_toTopOf="@id/letters_3"
app:layout_constraintHorizontal_chainStyle="packed"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="10dp"
android:text="@string/call_dialog_zrtp_validate_trust_message"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters2)}"
style="@style/default_text_style"
android:id="@+id/letters_2"
android:layout_width="70dp"
android:layout_height="70dp"
android:text="@{viewModel.letters2, default=`PT`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/letters_1"
app:layout_constraintBottom_toBottomOf="@id/letters_1"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/local_code_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/call_dialog_zrtp_validate_trust_local_code_label"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/message" />
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters3)}"
style="@style/default_text_style"
android:id="@+id/letters_3"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="32dp"
android:text="@{viewModel.letters3, default=`BB`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/letters_4"
app:layout_constraintTop_toBottomOf="@id/letters_1"
app:layout_constraintBottom_toTopOf="@id/skip"
app:layout_constraintHorizontal_chainStyle="packed"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
android:id="@+id/local_code_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{viewModel.localToken, default=`ZZ`}"
android:textSize="18sp"
android:textColor="@color/gray_main2_600"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/local_code_label" />
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters4)}"
style="@style/default_text_style"
android:id="@+id/letters_4"
android:layout_width="70dp"
android:layout_height="70dp"
android:text="@{viewModel.letters4, default=`NM`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/letters_3"
app:layout_constraintBottom_toBottomOf="@id/letters_3"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/remote_tokens"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:paddingStart="30dp"
android:paddingEnd="30dp"
android:paddingBottom="10dp"
android:background="@drawable/shape_zrtp_tokens_dialog_background"
app:layout_constraintTop_toBottomOf="@id/local_code_value"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.skip()}"
style="@style/default_text_style_600"
android:id="@+id/skip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:paddingTop="13dp"
android:paddingBottom="13dp"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:text="@string/call_zrtp_sas_validation_skip"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/letters_3"
app:layout_constraintBottom_toTopOf="@id/nothing_matches"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
android:id="@+id/remote_code_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/call_dialog_zrtp_validate_trust_remote_code_label"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.notFound()}"
style="@style/default_text_style_600"
android:id="@+id/nothing_matches"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/shape_red_outlined_button_background"
android:text="@string/call_dialog_zrtp_validate_trust_letters_do_not_match"
android:textSize="18sp"
android:textColor="?attr/color_danger_500"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/skip"
app:layout_constraintBottom_toTopOf="@id/anchor"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters1)}"
style="@style/default_text_style"
android:id="@+id/letters_1"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="30dp"
android:layout_marginStart="10dp"
android:text="@{viewModel.letters1, default=`RV`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/circle_white_button_background"
android:elevation="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/letters_2"
app:layout_constraintTop_toBottomOf="@id/remote_code_label"
app:layout_constraintBottom_toTopOf="@id/letters_3"
app:layout_constraintHorizontal_chainStyle="packed"/>
<View
android:id="@+id/anchor"
android:layout_width="wrap_content"
android:layout_height="@dimen/dialog_top_bottom_margin"
app:layout_constraintTop_toBottomOf="@id/nothing_matches"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters2)}"
style="@style/default_text_style"
android:id="@+id/letters_2"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginEnd="10dp"
android:text="@{viewModel.letters2, default=`PT`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/circle_white_button_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/letters_1"
app:layout_constraintBottom_toBottomOf="@id/letters_1"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters3)}"
style="@style/default_text_style"
android:id="@+id/letters_3"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginTop="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="10dp"
android:layout_marginStart="10dp"
android:text="@{viewModel.letters3, default=`BB`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/circle_white_button_background"
android:elevation="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/letters_4"
app:layout_constraintTop_toBottomOf="@id/letters_1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.lettersClicked(viewModel.letters4)}"
style="@style/default_text_style"
android:id="@+id/letters_4"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginEnd="10dp"
android:text="@{viewModel.letters4, default=`NM`}"
android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center"
android:background="@drawable/circle_white_button_background"
android:elevation="5dp"
app:layout_constraintStart_toEndOf="@id/letters_3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/letters_3"
app:layout_constraintBottom_toBottomOf="@id/letters_3"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.notFound()}"
style="@style/default_text_style_600"
android:id="@+id/nothing_matches"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/shape_red_outlined_button_background"
android:text="@string/call_dialog_zrtp_validate_trust_letters_do_not_match"
android:textSize="18sp"
android:textColor="?attr/color_danger_500"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/remote_tokens"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/values-fr/strings.xml
View file

@ -586,9 +586,11 @@
<string name="calls_list_dialog_merge_into_conference_title">Fusionner les appels en une conférence ?</string>
<string name="calls_list_dialog_merge_into_conference_label">Créer une conférence</string>
<string name="call_dialog_zrtp_validate_trust_title">Valider l\'appareil</string>
<string name="call_dialog_zrtp_validate_trust_subtitle">Dites %s puis cliquez sur les lettres données par votre correspondant :</string>
<string name="call_dialog_zrtp_validate_trust_letters_do_not_match">Je ne trouve pas</string>
<string name="call_dialog_zrtp_validate_trust_title">Vérification de sécurité</string>
<string name="call_dialog_zrtp_validate_trust_message">Pour votre sécurité, nous avons besoin de vérifier l\'appareil de votre correspondant.\nVeuillez échanger vos codes :</string>
<string name="call_dialog_zrtp_validate_trust_local_code_label">Votre code :</string>
<string name="call_dialog_zrtp_validate_trust_remote_code_label">Code correspondant : </string>
<string name="call_dialog_zrtp_validate_trust_letters_do_not_match">Aucune correspondance</string>
<string name="call_audio_device_type_earpiece">Oreilette</string>
<string name="call_audio_device_type_speaker">Haut parleur</string>

2
app/src/main/res/values-land/dimen.xml
View file

@ -4,4 +4,6 @@
<dimen name="call_main_actions_menu_height">110dp</dimen>
<dimen name="call_all_actions_menu_height">235dp</dimen> <!-- sum of above two -->
<dimen name="dialog_max_width">600dp</dimen>
</resources>

6
app/src/main/res/values/strings.xml
View file

@ -624,8 +624,10 @@
<string name="calls_list_dialog_merge_into_conference_label">Create conference</string>
<string name="call_dialog_zrtp_validate_trust_title">Validate the device</string>
<string name="call_dialog_zrtp_validate_trust_subtitle">Say %s and click on the letters given by your correspondent:</string>
<string name="call_dialog_zrtp_validate_trust_letters_do_not_match">Letters don\'t match!</string>
<string name="call_dialog_zrtp_validate_trust_message">For your safety, we need to validate your correspondent device.\nPlease exchange your codes:</string>
<string name="call_dialog_zrtp_validate_trust_local_code_label">Your code:</string>
<string name="call_dialog_zrtp_validate_trust_remote_code_label">Correspondent code:</string>
<string name="call_dialog_zrtp_validate_trust_letters_do_not_match">Nothing matches</string>
<string name="call_audio_device_type_earpiece">Earpiece</string>
<string name="call_audio_device_type_speaker">Speaker</string>