From 2affd3f5f7d7968d3e94dd109667603e3b6f4f45 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 13 Jan 2021 15:44:16 +0100 Subject: [PATCH] Use shapes to replace some png --- .../viewmodels/AccountSettingsViewModel.kt | 6 ++-- .../main/viewmodels/StatusViewModel.kt | 6 ++-- .../drawable-xhdpi/clean_field_default.png | Bin 1951 -> 0 bytes .../res/drawable-xhdpi/clean_field_over.png | Bin 1447 -> 0 bytes app/src/main/res/drawable-xhdpi/field_add.png | Bin 981 -> 0 bytes .../main/res/drawable-xhdpi/field_remove.png | Bin 736 -> 0 bytes .../main/res/drawable-xhdpi/led_connected.png | Bin 1046 -> 0 bytes .../res/drawable-xhdpi/led_disconnected.png | Bin 904 -> 0 bytes app/src/main/res/drawable-xhdpi/led_error.png | Bin 840 -> 0 bytes .../res/drawable-xhdpi/led_inprogress.png | Bin 952 -> 0 bytes app/src/main/res/drawable/field_add.xml | 10 ++++++ .../main/res/drawable/field_add_default.xml | 10 ++++++ .../main/res/drawable/field_add_disabled.xml | 10 ++++++ app/src/main/res/drawable/field_add_over.xml | 10 ++++++ app/src/main/res/drawable/field_add_shape.xml | 26 +++++++++++++++ .../{clean_field.xml => field_clean.xml} | 4 +-- .../main/res/drawable/field_clean_default.xml | 10 ++++++ .../main/res/drawable/field_clean_over.xml | 10 ++++++ .../main/res/drawable/field_clean_shape.xml | 31 ++++++++++++++++++ app/src/main/res/drawable/field_remove.xml | 10 ++++++ .../res/drawable/field_remove_default.xml | 10 ++++++ .../res/drawable/field_remove_disabled.xml | 10 ++++++ .../main/res/drawable/field_remove_over.xml | 10 ++++++ .../main/res/drawable/field_remove_shape.xml | 12 +++++++ app/src/main/res/drawable/led_background.xml | 5 +++ app/src/main/res/drawable/led_error.xml | 5 +++ .../main/res/drawable/led_not_registered.xml | 5 +++ app/src/main/res/drawable/led_registered.xml | 5 +++ .../drawable/led_registration_in_progress.xml | 5 +++ .../assistant_country_picker_fragment.xml | 2 +- .../main/res/layout/call_status_fragment.xml | 5 +-- .../layout/chat_message_attachment_cell.xml | 6 ++-- .../res/layout/contact_editor_fragment.xml | 8 ++--- .../contact_number_address_editor_cell.xml | 3 +- .../main/res/layout/settings_account_cell.xml | 4 ++- .../main/res/layout/settings_widget_text.xml | 2 +- app/src/main/res/layout/status_fragment.xml | 7 ++-- app/src/main/res/values/colors.xml | 5 +++ app/src/main/res/values/dimen.xml | 2 ++ 39 files changed, 228 insertions(+), 26 deletions(-) delete mode 100644 app/src/main/res/drawable-xhdpi/clean_field_default.png delete mode 100644 app/src/main/res/drawable-xhdpi/clean_field_over.png delete mode 100644 app/src/main/res/drawable-xhdpi/field_add.png delete mode 100644 app/src/main/res/drawable-xhdpi/field_remove.png delete mode 100644 app/src/main/res/drawable-xhdpi/led_connected.png delete mode 100644 app/src/main/res/drawable-xhdpi/led_disconnected.png delete mode 100644 app/src/main/res/drawable-xhdpi/led_error.png delete mode 100644 app/src/main/res/drawable-xhdpi/led_inprogress.png create mode 100644 app/src/main/res/drawable/field_add.xml create mode 100644 app/src/main/res/drawable/field_add_default.xml create mode 100644 app/src/main/res/drawable/field_add_disabled.xml create mode 100644 app/src/main/res/drawable/field_add_over.xml create mode 100644 app/src/main/res/drawable/field_add_shape.xml rename app/src/main/res/drawable/{clean_field.xml => field_clean.xml} (59%) create mode 100644 app/src/main/res/drawable/field_clean_default.xml create mode 100644 app/src/main/res/drawable/field_clean_over.xml create mode 100644 app/src/main/res/drawable/field_clean_shape.xml create mode 100644 app/src/main/res/drawable/field_remove.xml create mode 100644 app/src/main/res/drawable/field_remove_default.xml create mode 100644 app/src/main/res/drawable/field_remove_disabled.xml create mode 100644 app/src/main/res/drawable/field_remove_over.xml create mode 100644 app/src/main/res/drawable/field_remove_shape.xml create mode 100644 app/src/main/res/drawable/led_background.xml create mode 100644 app/src/main/res/drawable/led_error.xml create mode 100644 app/src/main/res/drawable/led_not_registered.xml create mode 100644 app/src/main/res/drawable/led_registered.xml create mode 100644 app/src/main/res/drawable/led_registration_in_progress.xml diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt index b2faeb657..67274d4ef 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt @@ -300,10 +300,10 @@ class AccountSettingsViewModel(val proxyConfig: ProxyConfig) : GenericSettingsVi } iconResource.value = when (proxyConfig.state) { - RegistrationState.Ok -> R.drawable.led_connected + RegistrationState.Ok -> R.drawable.led_registered RegistrationState.Failed -> R.drawable.led_error - RegistrationState.Progress -> R.drawable.led_inprogress - else -> R.drawable.led_disconnected + RegistrationState.Progress -> R.drawable.led_registration_in_progress + else -> R.drawable.led_not_registered } iconContentDescription.value = when (proxyConfig.state) { RegistrationState.Ok -> R.string.status_connected diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt index 55ab82a5b..9122b548b 100644 --- a/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt @@ -103,10 +103,10 @@ open class StatusViewModel : ViewModel() { private fun getStatusIconResource(state: RegistrationState): Int { return when (state) { - RegistrationState.Ok -> R.drawable.led_connected - RegistrationState.Progress -> R.drawable.led_inprogress + RegistrationState.Ok -> R.drawable.led_registered + RegistrationState.Progress -> R.drawable.led_registration_in_progress RegistrationState.Failed -> R.drawable.led_error - else -> R.drawable.led_disconnected + else -> R.drawable.led_not_registered } } } diff --git a/app/src/main/res/drawable-xhdpi/clean_field_default.png b/app/src/main/res/drawable-xhdpi/clean_field_default.png deleted file mode 100644 index 3fae16b48c8ae66af888b58ece0d3d8ae5b4e9db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1951 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 TJk>eC2xstg^>bP0l+XkKkCv@z diff --git a/app/src/main/res/drawable-xhdpi/field_remove.png b/app/src/main/res/drawable-xhdpi/field_remove.png deleted file mode 100644 index b4ec88f481350b491ad1296b1a556142e48ee37d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 736 zcmeAS@N?(olHy`uVBq!ia0vp^DImc}*5j~)%+dH@S4~lN>kccI6@Fqat}TvrHWwT8+1=>2U{3!^fupX$!qQ4}mq+J+Z!X;=8;f_xcUSlCE^i3XH$MAHg5BhPk*8P6c0eUD$uG48u}v|`%-o%Zhivo=cz2y~{;OuThO`pD(k+YVOF zw>Z?b$*acCChZbyr~J-!6@QNHe6Z<&v2vP~slSY(7?5A4U_a^T*m~%ON+D^Y>4o;mUP9YbK6^mMoa*kwN_1rjN(cc~Y^#{IsKM6V! z%A|apN$Y~b?z#{5KklxbI)BcGNrws-d_G!e=hm<;c0pkAocGDcGv_cIOn=~&|5Lj( z;o0ObQQqBhjC*e%I9lo*{H@`%?1KL%C-~l++GNsNBUfR+IR6w=?RJNZv#;0g?7z&e z;2W!&-_Y!wu*Ko#YrFUF^4`C_Z+!M&9fOT%(ZrVf6NG`$!j|Oi?!xdN1Q+aGJ{c&& zS>O>_42;3+Ak65bF}ngN$X?><>&pIwNt%nt(&?X(1W@R%r;B4q#jUs3Z1q|L1=t>x zdu-Vrt|{V`#2nGORO206j#o0{mMp=wG23^1G{4p$QxiXLxqbe#l%i)oOhE0Z;Llnq z$$NL%J^Lo@`P;mEpL*oq2Y<3B&0ZDdyXo@X+M9RfZS~LJt+m@Je(COV&vj{5p>dPm zgkSyJ@nNl_>-;knXWpw=N{ia9QtUVWUp;@B*(Nd1yvc9QZjdbZz;b6UL9=WLv;y|_d(l^QT^19q`XbZDj-QuS3j3^P6500006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy00Xv3L_t(o!?l=8Xk1ks#((E#nkF@g zCKHn~BymjChBh^jC|&fS&}f??A_`Jas!%P6-Bc=6QA82yLZt|bLKZ$2x@i?@OB=B% zSS4yHXkw*?JV`Vrahx`<$xLoO7tVzA=HxM*JKye}?|<(7-ShgNb09-W%9B)#4>D8V4~UP;Ceh#E=9mAQVBv@H{m z$0SY2Kg~&cOOlf=$Pr2IYQ8Y*#uQ6L<<7-d3-y_#yj2ZgNr!-UmjWG+4beSzir%qS zqSHOZ5)l9#6QFqA9fX5TRG03dv|!_M|NA-cgfT`-!bo}$I1S`1h8W~x|1qwNe2L_) z*t!+P+u0I6Oj%+5QXwxJV~$#3B!z%ZV9}bDh&SS5|1sjT z<9@E={Lu5J?dLX1s!O%ZcHriP?#yhI--o~OJ*|w4|H4qT-DW+Mg4yGB`Xg<)b8)hv z-m$aG!c=>mfk+$KQh(%ITk&Q|#sNZJ=jwES)?lv121&S+-r^#l#0oPNA0c}Z)5#R# z1#*Bj-cnZyvMGZ#amxV~&ENb$NmfzvbFJ^c<|Ma@*D1Js#?45#w z9bP9KY|0wUZNZ(k;?C66KIL_)O76GO`=aX7W?S*e6wG;GY@w5zQ$T&iv%Z5=7Vltv zQKQW|{{IHe7&k?>Q1unhkiW*ifox0;Tf&EJ)@5T%*TSs*1~9WQVr`&^=1nc+IJv&S zY^!;VTMO^DS+88Tg-9N@TD(!^MGf3{=TRIJ$Oxn^w2!*bKAY7Jd}Z6|l_h6ZnYYGZ z^m|$_KhMl;G%X0n1lU^hDs`c!Y<2?JVT@^CYD3-tdtLmCNydXpDJowTHL^l4g`0y(cNXK`5y~(twW;lalska^4O}YPo^i2d`Qs)%$fN zvRTpzNwG8lTuB!s?aJ0=Q6aD!co?WnUKRy`Kr*Ea16{xw;A>;da60e*4-Zw5pWuAp Q`~Uy|07*qoM6N<$g7ISUUjP6A diff --git a/app/src/main/res/drawable-xhdpi/led_disconnected.png b/app/src/main/res/drawable-xhdpi/led_disconnected.png deleted file mode 100644 index 20c81433372ad2cb93eabf57ad1c73bcf3180e19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 904 zcmV;319$w1P)500006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy00SsVL_t(o!_AmKh#Ykk$3Jgw?)DEi z`{&F>IIuB=K@EXxqgIlrhy>CEVj%&CC2vVOBk6&pp{CO#Nf#wq9uOxa-O=p&OVT^DfLxHY zqx=+0`c{%REyz_#(L^i6v7#ta9LJMF{UE70Q2c)rqO5|2?U_kYSC;q zT_z9sZhYH&Bd@##Ty}Y6b8~a%6w&E)*xK51nbv_%)1LV<9Vc-dv$3&}TjFfD+w}W= zm+9&rjHD&tyvx1GPRUCdUVc;3+lgo11*&PU?Ck91eyj`z1A4ul%k*&q^HJIohT)L| z_ArHEcp%K{6TUD{m{XF>1J+y#ZeAJ=hc2&IfE6c96h+Ka8S_^>V3GfaIvo^+8FO?9ZX6sh^sY0Q^%F4>jAVCli1cA%+5ctVeb{-$?tmEl7dc7Wv zM&n2&MZI3n0@(%LGqZXld_`SZchZYyu3`MQo;BAtVcdGv)hNYDwkcq zY#b_SRR)8>-Z|rW9*c{Md#%a=5CAvL?DI*RxGR$SnvZTs@~7=8*Cjp85uzjM;w=64 znxtDtxP3_LzNFK6U5T8MbXQVu3V=w`pOVha>#`^SJ^(%ePL3{%UIF~kk@5_90{jO2 eY-Z1500006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy00QVqL_t(o!?l=CNK{c2hkx(QSfXTR zV~NnBLJDdq1R*el2(w}gqKz9V2;8`8XNoH~LakJYAV~-U7bb*Ah}gn3Ou~h^3UzD| z<=-^LCeyElisrj-oN39i*-gz~xjx?f}bprwyPHu#*L; z0oD`x#Of-{&qFMhDAWreJyDPcahHll;n5=~E{0GDq)kgpgK!w?>R@DKKcJWUo+IFz z>mi+-gnRcO5ZD2TXQibuG!zf$VLXt0VBR>bqXRNC6NA`owhavpu(4rUbsf0k2J_Si z($oZ&l|0C9tE_Yb`smm$;GA)L+S^kH*|yqRx9zIj3)AKpGCd844|@Y5ZT_hKeiO{t zZjb}O566(|YVSa{t*FRtyUuUJTy=!z=HTE#?_nh9>odXBNRln-rsFhscT2IDd{Jko z$s5^*Ic0?LOI=+iZy2y_N%@Y@__%*C(Wtb%yw{s0DaQ=+^{am{AkEB}B3ZViG>3a_ zO}@%DCT?s=KOOE+$UhLvl5%rRktKVpRQy*LFZu^lP#|Sw?DZ~MmNjon8g)!4FZT~7 z5;1u{xnFvVi;$7w&!smo;Ckr^2mmvVaDBb^AZ2B4$+BQ~etPZ*FDyWAu6H1T01OYu zPn26QCxKs%VS|I-<*1exw}0ifskkzaZfk>JFg1|sYB!Mg##$IS27EV8>FtG_oa7;b zL1=Dv1NjYHidP300xQO;OH0t$2w7Q)K~z=2)Kt8J{B9zx%Kf-a#_TM#wn8KVd3iek z+1XH10*@cV#KeBB%9CW8xGErqKWYMk$##{6z!wi8R)C6B`t5w+*?+t~>{SnN!K){c zF!0KF7rAR4cn6gE^;mRB(sfC500006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy00US_L_t(o!?l=AXjE4ihM(^yF(GLD z3#ldzsG-ItMq#u{sBtBYEn*9CVO6L_kk*x52qJD2q2fYHH&t+)gfs^J|HcU zh83Ptl8#IAas@dkDLJD@jK`(;kd#c!6slEH$&3cDq;G(eSxHCw;MuRxa|Z@{AU-e= z_X?q`8mbzhx(VjjO!dC!ft_ZitT2*30<7&LqV^`E;sAq8wQvl}j$)4<+9gMVFw-+ut~_S167 zCTKk10=fsR^}EYUgVY0i0*ySql|Kl;lk0H*tjmc3yZk@?G&>L&C-DL3_%44CUk`qS z7hNvr;A#oiK_u$AJtfRCCrni8ZFfZ*B$)?P2CU)U=wOEXV0?6PvK=IrV$E^pecDtO1X4d`xUHd2y&nPl$Hf%fsUQswOYxco{e8P+F0#)NV67H{DTXkF(2OXMlt7_g&~|gO}Yf z*8gUV&09LLM!mZMW-pow_mr7^J<~(nUP*C9qwggZ=6b4(NqQP0#E7Kr`JA^aC7pST z+lR@zCTVq8S0W9Pev&kn13*$zo22HbE{o;>n}Mysiu7gCLZC3cr920^fnR`2X7)Un a_WuLz`(2z*w#ruk0000 + + + + + + diff --git a/app/src/main/res/drawable/field_add_default.xml b/app/src/main/res/drawable/field_add_default.xml new file mode 100644 index 000000000..29cf8f588 --- /dev/null +++ b/app/src/main/res/drawable/field_add_default.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/field_add_disabled.xml b/app/src/main/res/drawable/field_add_disabled.xml new file mode 100644 index 000000000..4421590c7 --- /dev/null +++ b/app/src/main/res/drawable/field_add_disabled.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/field_add_over.xml b/app/src/main/res/drawable/field_add_over.xml new file mode 100644 index 000000000..496327588 --- /dev/null +++ b/app/src/main/res/drawable/field_add_over.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/field_add_shape.xml b/app/src/main/res/drawable/field_add_shape.xml new file mode 100644 index 000000000..a335e3ba3 --- /dev/null +++ b/app/src/main/res/drawable/field_add_shape.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/clean_field.xml b/app/src/main/res/drawable/field_clean.xml similarity index 59% rename from app/src/main/res/drawable/clean_field.xml rename to app/src/main/res/drawable/field_clean.xml index dd9843324..0400c9278 100644 --- a/app/src/main/res/drawable/clean_field.xml +++ b/app/src/main/res/drawable/field_clean.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/field_clean_over" /> + android:drawable="@drawable/field_clean_default" /> diff --git a/app/src/main/res/drawable/field_clean_default.xml b/app/src/main/res/drawable/field_clean_default.xml new file mode 100644 index 000000000..b29f380c1 --- /dev/null +++ b/app/src/main/res/drawable/field_clean_default.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/field_clean_over.xml b/app/src/main/res/drawable/field_clean_over.xml new file mode 100644 index 000000000..a5c707556 --- /dev/null +++ b/app/src/main/res/drawable/field_clean_over.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/field_clean_shape.xml b/app/src/main/res/drawable/field_clean_shape.xml new file mode 100644 index 000000000..1c9e1349b --- /dev/null +++ b/app/src/main/res/drawable/field_clean_shape.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/field_remove.xml b/app/src/main/res/drawable/field_remove.xml new file mode 100644 index 000000000..3fc616dd3 --- /dev/null +++ b/app/src/main/res/drawable/field_remove.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/app/src/main/res/drawable/field_remove_default.xml b/app/src/main/res/drawable/field_remove_default.xml new file mode 100644 index 000000000..214b742f1 --- /dev/null +++ b/app/src/main/res/drawable/field_remove_default.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/field_remove_disabled.xml b/app/src/main/res/drawable/field_remove_disabled.xml new file mode 100644 index 000000000..5c582da40 --- /dev/null +++ b/app/src/main/res/drawable/field_remove_disabled.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/field_remove_over.xml b/app/src/main/res/drawable/field_remove_over.xml new file mode 100644 index 000000000..b8a988b7d --- /dev/null +++ b/app/src/main/res/drawable/field_remove_over.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/field_remove_shape.xml b/app/src/main/res/drawable/field_remove_shape.xml new file mode 100644 index 000000000..75f5c4f69 --- /dev/null +++ b/app/src/main/res/drawable/field_remove_shape.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/led_background.xml b/app/src/main/res/drawable/led_background.xml new file mode 100644 index 000000000..7147daf3c --- /dev/null +++ b/app/src/main/res/drawable/led_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/led_error.xml b/app/src/main/res/drawable/led_error.xml new file mode 100644 index 000000000..e2ce8ac4b --- /dev/null +++ b/app/src/main/res/drawable/led_error.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/led_not_registered.xml b/app/src/main/res/drawable/led_not_registered.xml new file mode 100644 index 000000000..f95c698ac --- /dev/null +++ b/app/src/main/res/drawable/led_not_registered.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/led_registered.xml b/app/src/main/res/drawable/led_registered.xml new file mode 100644 index 000000000..7c701e958 --- /dev/null +++ b/app/src/main/res/drawable/led_registered.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/led_registration_in_progress.xml b/app/src/main/res/drawable/led_registration_in_progress.xml new file mode 100644 index 000000000..53b2810ea --- /dev/null +++ b/app/src/main/res/drawable/led_registration_in_progress.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/assistant_country_picker_fragment.xml b/app/src/main/res/layout/assistant_country_picker_fragment.xml index c2d54958e..1af44f6fb 100644 --- a/app/src/main/res/layout/assistant_country_picker_fragment.xml +++ b/app/src/main/res/layout/assistant_country_picker_fragment.xml @@ -61,7 +61,7 @@ android:layout_centerVertical="true" android:paddingLeft="5dp" android:paddingRight="5dp" - android:src="@drawable/clean_field" /> + android:src="@drawable/field_clean" /> diff --git a/app/src/main/res/layout/call_status_fragment.xml b/app/src/main/res/layout/call_status_fragment.xml index b5a2b1527..501a0fb58 100644 --- a/app/src/main/res/layout/call_status_fragment.xml +++ b/app/src/main/res/layout/call_status_fragment.xml @@ -33,7 +33,8 @@ + android:padding="2dp" /> + android:src="@drawable/field_clean" /> + android:src="@drawable/field_clean" /> + android:src="@drawable/field_clean" /> diff --git a/app/src/main/res/layout/contact_editor_fragment.xml b/app/src/main/res/layout/contact_editor_fragment.xml index 01530a7ca..4a4b58e0c 100644 --- a/app/src/main/res/layout/contact_editor_fragment.xml +++ b/app/src/main/res/layout/contact_editor_fragment.xml @@ -161,13 +161,12 @@ + android:src="@drawable/field_add" /> @@ -199,8 +198,7 @@ android:layout_height="30dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:src="@drawable/field_add" - android:background="@drawable/round_orange_button_background" /> + android:src="@drawable/field_add" /> diff --git a/app/src/main/res/layout/contact_number_address_editor_cell.xml b/app/src/main/res/layout/contact_number_address_editor_cell.xml index c32cdaf62..3b2c42091 100644 --- a/app/src/main/res/layout/contact_number_address_editor_cell.xml +++ b/app/src/main/res/layout/contact_number_address_editor_cell.xml @@ -41,8 +41,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:src="@drawable/field_remove" - android:layout_marginLeft="5dp" - android:background="@drawable/field_button_background" /> + android:layout_marginLeft="5dp" /> diff --git a/app/src/main/res/layout/settings_account_cell.xml b/app/src/main/res/layout/settings_account_cell.xml index 7759a300f..ccd908039 100644 --- a/app/src/main/res/layout/settings_account_cell.xml +++ b/app/src/main/res/layout/settings_account_cell.xml @@ -16,7 +16,9 @@ diff --git a/app/src/main/res/layout/status_fragment.xml b/app/src/main/res/layout/status_fragment.xml index 841a45e45..907f54eb0 100644 --- a/app/src/main/res/layout/status_fragment.xml +++ b/app/src/main/res/layout/status_fragment.xml @@ -33,15 +33,16 @@ + android:adjustViewBounds="true" /> #808080 #99ffffff + + #96c11f + #ffa645 + #e1e1e1 + #ff0000 diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 976bd186b..2104de5e7 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -15,4 +15,6 @@ 60dp 300dp 240dp + 20dp + 3dp \ No newline at end of file