From 70ea32b174e4b19a8f501f26168a37fd666370d2 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 26 Sep 2012 09:20:34 +0200 Subject: [PATCH] Mostly interface fixes --- .../button_background_default.9.png | Bin 0 -> 1603 bytes res/drawable-xhdpi/button_background_default.png | Bin 3673 -> 0 bytes res/drawable-xhdpi/button_background_over.9.png | Bin 0 -> 1603 bytes res/drawable-xhdpi/button_background_over.png | Bin 3584 -> 0 bytes res/layout/chatlist_cell.xml | 1 + res/layout/contact_control_row.xml | 1 + res/layout/contacts_list.xml | 12 +++++++++++- res/layout/setup_generic_login.xml | 2 +- res/layout/setup_linphone_login.xml | 2 +- res/layout/setup_wizard.xml | 2 +- src/org/linphone/LinphoneUtils.java | 4 ++-- 11 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 res/drawable-xhdpi/button_background_default.9.png delete mode 100644 res/drawable-xhdpi/button_background_default.png create mode 100644 res/drawable-xhdpi/button_background_over.9.png delete mode 100644 res/drawable-xhdpi/button_background_over.png diff --git a/res/drawable-xhdpi/button_background_default.9.png b/res/drawable-xhdpi/button_background_default.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c19f88e0b51146a2748016c43f535f698570da80 GIT binary patch literal 1603 zcmZWpX*iT?7=Fz#BioRYH6_Lx%HGf*4kArtNS4Sl_Of#<Iv+W_FxKrWImAK!E5(qQ;Eza9K^Y&!W;xfVM3LRRwAAl) zYIp>^QszVqy>@>Y@>tfAR$2YrE z9AvR?GPUj7?VWu;TUkG9=#0}=HT!hHGkk-lug9vXmU}@ag)@np|dq8)FfAy?tWnP}6 z9tZHEX9q_|$;oNHS_@+2GJ_i0D#k`b++{e(7yK42$`GEVW2*5#Gg3cb#|IQ$J_z!H z9v9M$=@A24{1j2jp{!6-H!2XpL4LZYvOn_uP;PssrxPbuOF-WSN8(NqWh%6VI=5K#7g9a$2h&NdVNHS>oV0ZP7n zDqH(g6B6P~B1>8@u$ceX0sv%%q!bnw55l%+j2R@HxYroVe!%5YGz_i4FCySdW<8EA zHoTzVA^B|_jXCl>#74PN?4O7>v zYH;Ga#V4X3ZMG@fEyUP4i-M0>;)9C3(9|I#QYNwIa|W%&rPj+ugEu|HpxN;;R!;JwuhqX+I~h3U zkyO6NQqA6JZE`M1`C{foOw~sB7ZE_dI2(pZ(k8_nuHSU{dstb%wIxnq;#Chs$s~=Vb&=cw+nosY<72Cx4nsR|_SNr+wV-JTPq)te)nsvIq zk4t&7=J{68jCgm38Uh5?G19RQp-pH^N*-WE{n*V~tIK#VQ5&0;=(;xm`YcSXO{$D9 G{qhfTg0wOK literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/button_background_default.png b/res/drawable-xhdpi/button_background_default.png deleted file mode 100644 index 31efad8aaec582024a47f09a70e10c2b14d02ae7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3673 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 diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml index 0848bbd95..a3dddc2be 100644 --- a/res/layout/chatlist_cell.xml +++ b/res/layout/chatlist_cell.xml @@ -47,6 +47,7 @@ + android:orientation="horizontal" + android:background="@drawable/toolsbar_background"> + + diff --git a/res/layout/setup_linphone_login.xml b/res/layout/setup_linphone_login.xml index 20697777f..cdf1efaa1 100644 --- a/res/layout/setup_linphone_login.xml +++ b/res/layout/setup_linphone_login.xml @@ -54,7 +54,7 @@ android:background="@drawable/setup_field_background" /> diff --git a/res/layout/setup_wizard.xml b/res/layout/setup_wizard.xml index 2b71e5803..535d5f573 100644 --- a/res/layout/setup_wizard.xml +++ b/res/layout/setup_wizard.xml @@ -128,7 +128,7 @@ diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java index f080c300a..8304fd699 100644 --- a/src/org/linphone/LinphoneUtils.java +++ b/src/org/linphone/LinphoneUtils.java @@ -65,11 +65,11 @@ public final class LinphoneUtils { private static boolean preventVolumeBarToDisplay = false; public static boolean isSipAddress(String numberOrAddress) { - return numberOrAddress != null && numberOrAddress.matches("^(sip:)?[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$"); + return numberOrAddress != null && numberOrAddress.matches("^(sip:)?(\\+)?[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$"); } public static boolean isStrictSipAddress(String numberOrAddress) { - return numberOrAddress != null && numberOrAddress.matches("^sip:[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$"); + return numberOrAddress != null && numberOrAddress.matches("^sip:(\\+)?[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$"); } public static String getUsernameFromAddress(String address) {