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

Updated color + added ZRTP SAS validation in landscape

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-22 14:46:35 +02:00
parent 2896da7f9d
commit f345db49cd
4 changed files with 190 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/drawable/shape_squircle_gray_3_background.xml → app/src/main/res/drawable/shape_squircle_main2_200_background.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="90dp" />
<solid android:color="@color/gray_main2_100"/>
<solid android:color="@color/gray_main2_200"/>
</shape>

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

@ -0,0 +1,182 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<import type="android.graphics.Typeface" />
<variable
name="viewModel"
type="org.linphone.ui.voip.model.ZrtpSasConfirmationDialogModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:onClick="@{() -> viewModel.dismiss()}"
android:layout_width="match_parent"
android:layout_height="match_parent">
<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"
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"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_zrtp_validate_trust_title"
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" />
<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="@{viewModel.message, default=@string/dialog_zrtp_validate_trust_message}"
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="32dp"
android:layout_marginEnd="32dp"
android:text="@{viewModel.letters1, default=`RV`}"
android:textSize="32sp"
android:gravity="center"
android:background="@drawable/shape_circle_white_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/skip"
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="32dp"
android:text="@{viewModel.letters2, default=`PT`}"
android:textSize="32sp"
android:gravity="center"
android:background="@drawable/shape_circle_white_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="32dp"
android:text="@{viewModel.letters3, default=`BB`}"
android:textSize="32sp"
android:gravity="center"
android:background="@drawable/shape_circle_white_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
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:gravity="center"
android:background="@drawable/shape_circle_white_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
android:onClick="@{() -> viewModel.dismiss()}"
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="13dp"
android:paddingBottom="13dp"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:text="@string/in_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.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.dismiss()}"
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/dialog_zrtp_validate_trust_letters_do_not_match"
android:textSize="18sp"
android:textColor="@color/red_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"/>
<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.constraintlayout.widget.ConstraintLayout>
</layout>

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

@ -82,7 +82,7 @@
android:paddingEnd="8dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:background="@drawable/shape_squircle_gray_3_background"
android:background="@drawable/shape_squircle_main2_200_background"
android:gravity="center"
android:text="@{model.registrationState, default=@string/drawer_menu_account_connection_status_connected}"
android:textColor="@{model.isConnected ? @color/green_success_500 : model.inError ? @color/red_danger_500 : model.isDisabled ? @color/orange_warning_600 : @color/gray_main2_500, default=@color/green_success_500}"

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

@ -136,7 +136,11 @@
android:id="@+id/skip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="45dp"
android:layout_marginTop="32dp"
android:paddingTop="13dp"
android:paddingBottom="13dp"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:text="@string/in_call_zrtp_sas_validation_skip"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="parent"
@ -150,7 +154,7 @@
android:id="@+id/nothing_matches"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="45dp"
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"