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

Fixed crash due to dialog layout

Browse source
This commit is contained in:
Sylvain Berfini 2019-03-05 13:42:20 +01:00
parent 1e82730cf7
commit 5cce0fdce4
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/res/layout/dialog.xml
View file

@ -138,24 +138,22 @@
<Button <Button
android:id="@+id/dialog_cancel_button" android:id="@+id/dialog_cancel_button"
style="@style/font8" style="@style/dialog_cancel_button_font"
android:layout_width="137dp" android:layout_width="137dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/resizable_assistant_button"
android:textColor="@drawable/assistant_button_text_color"
android:ellipsize="end" android:ellipsize="end"
android:padding="10dp" android:padding="10dp"
android:text="@string/cancel" /> android:text="@string/cancel" />
<Button <Button
android:id="@+id/dialog_delete_button" android:id="@+id/dialog_delete_button"
style="@style/font15" style="@style/dialog_action_button_font"
android:layout_width="137dp" android:layout_width="137dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/resizable_assistant_button"
android:textColor="@drawable/assistant_button_text_color"
android:backgroundTint="@color/colorI" android:backgroundTint="@color/colorI"
android:ellipsize="end" android:ellipsize="end"
android:padding="10dp" android:padding="10dp"
@ -163,12 +161,11 @@
<Button <Button
android:id="@+id/dialog_ok_button" android:id="@+id/dialog_ok_button"
style="@style/font15" style="@style/dialog_action_button_font"
android:layout_width="137dp" android:layout_width="137dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:background="@drawable/resizable_assistant_button" android:background="@drawable/resizable_assistant_button"
android:textColor="@drawable/assistant_button_text_color"
android:backgroundTint="@color/colorL" android:backgroundTint="@color/colorL"
android:ellipsize="end" android:ellipsize="end"
android:padding="10dp" android:padding="10dp"

14
app/src/main/res/values/styles.xml
View file

@ -330,10 +330,22 @@
</style> </style>
<style name="dialog_message_font" parent="@android:style/TextAppearance.Small"> <style name="dialog_message_font" parent="@android:style/TextAppearance.Small">
<item name="android:textColor">?attr/subtitleTextColor</item> <item name="android:textColor">@color/colorH</item>
<item name="android:textSize">21sp</item> <item name="android:textSize">21sp</item>
</style> </style>
<style name="dialog_cancel_button_font" parent="@android:style/TextAppearance.Medium">
<item name="android:textColor">@color/colorC</item>
<item name="android:textAllCaps">true</item>
<item name="android:textSize">16sp</item>
</style>
<style name="dialog_action_button_font" parent="@android:style/TextAppearance.Medium">
<item name="android:textColor">@color/colorH</item>
<item name="android:textAllCaps">true</item>
<item name="android:textSize">16sp</item>
</style>
<style name="dialog_zrtp_colored_font" parent="@android:style/TextAppearance.Medium"> <style name="dialog_zrtp_colored_font" parent="@android:style/TextAppearance.Medium">
<item name="android:textColor">@color/colorL</item> <item name="android:textColor">@color/colorL</item>
<item name="android:textSize">20sp</item> <item name="android:textSize">20sp</item>