Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Yet another improvements for zrtp dialog

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-14 17:53:14 +01:00
parent 1bdfd80286
commit ccba6d4779
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
res/layout/dialog.xml
View file

@ -8,8 +8,9 @@
<ImageView <ImageView
android:id="@+id/dialog_icon" android:id="@+id/dialog_icon"
android:visibility="gone" android:visibility="gone"
android:layout_width="wrap_content" android:layout_width="60dp"
android:layout_height="wrap_content" android:layout_height="60dp"
android:adjustViewBounds="true"
android:src="@drawable/security_alert_indicator" android:src="@drawable/security_alert_indicator"
android:layout_margin="15dp"/> android:layout_margin="15dp"/>
@ -140,8 +141,9 @@
android:text="@string/cancel" android:text="@string/cancel"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/resizable_assistant_button"
style="@style/font8" style="@style/font8"
android:layout_width="wrap_content" android:ellipsize="end"
android:layout_height="wrap_content" android:layout_width="137dp"
android:layout_height="40dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:padding="10dp"/> android:padding="10dp"/>
@ -151,8 +153,9 @@
android:background="@drawable/resizable_assistant_button" android:background="@drawable/resizable_assistant_button"
android:backgroundTint="@color/colorI" android:backgroundTint="@color/colorI"
style="@style/font15" style="@style/font15"
android:layout_width="wrap_content" android:ellipsize="end"
android:layout_height="wrap_content" android:layout_width="137dp"
android:layout_height="40dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:padding="10dp"/> android:padding="10dp"/>
@ -163,8 +166,9 @@
android:background="@drawable/resizable_assistant_button" android:background="@drawable/resizable_assistant_button"
android:backgroundTint="@color/colorL" android:backgroundTint="@color/colorL"
style="@style/font15" style="@style/font15"
android:layout_width="wrap_content" android:ellipsize="end"
android:layout_height="wrap_content" android:layout_width="137dp"
android:layout_height="40dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:padding="10dp"/> android:padding="10dp"/>

5
src/android/org/linphone/fragments/StatusFragment.java
View file

@ -436,15 +436,16 @@ public class StatusFragment extends Fragment {
} }
TextView localSas = ZRTPdialog.findViewById(R.id.zrtp_sas_local); TextView localSas = ZRTPdialog.findViewById(R.id.zrtp_sas_local);
localSas.setText(zrtpToRead); localSas.setText(zrtpToRead.toUpperCase());
TextView remoteSas = ZRTPdialog.findViewById(R.id.zrtp_sas_remote); TextView remoteSas = ZRTPdialog.findViewById(R.id.zrtp_sas_remote);
remoteSas.setText(zrtpToListen); remoteSas.setText(zrtpToListen.toUpperCase());
TextView message = ZRTPdialog.findViewById(R.id.dialog_message); TextView message = ZRTPdialog.findViewById(R.id.dialog_message);
message.setVisibility(View.GONE); message.setVisibility(View.GONE);
ZRTPdialog.findViewById(R.id.dialog_zrtp_layout).setVisibility(View.VISIBLE); ZRTPdialog.findViewById(R.id.dialog_zrtp_layout).setVisibility(View.VISIBLE);
TextView title = ZRTPdialog.findViewById(R.id.dialog_title); TextView title = ZRTPdialog.findViewById(R.id.dialog_title);
title.setText(getString(R.string.zrtp_dialog_title)); title.setText(getString(R.string.zrtp_dialog_title));
title.setVisibility(View.VISIBLE);
Button delete = ZRTPdialog.findViewById(R.id.dialog_delete_button); Button delete = ZRTPdialog.findViewById(R.id.dialog_delete_button);
delete.setText(R.string.deny); delete.setText(R.string.deny);