From 797366c142ff5ac98d5067eaf97942ffd61f99dc Mon Sep 17 00:00:00 2001 From: Alex Sytnyk Date: Thu, 21 Jun 2018 12:44:43 +0300 Subject: [PATCH] Add live_now_dialog_card and related resources; refactor dimens --- .../drawable-hdpi/ic_overflow_menu_white.png | Bin 0 -> 1134 bytes .../drawable-mdpi/ic_overflow_menu_white.png | Bin 0 -> 1135 bytes .../drawable-xhdpi/ic_overflow_menu_white.png | Bin 0 -> 1196 bytes .../ic_overflow_menu_white.png | Bin 0 -> 1331 bytes .../res/layout/live_now_dialog_card.xml | 118 ++++++++++++++++++ OsmAnd-telegram/res/values/attrs.xml | 1 + OsmAnd-telegram/res/values/dimens.xml | 29 ++++- OsmAnd-telegram/res/values/strings.xml | 1 + OsmAnd-telegram/res/values/styles.xml | 5 +- 9 files changed, 148 insertions(+), 6 deletions(-) create mode 100644 OsmAnd-telegram/res/drawable-hdpi/ic_overflow_menu_white.png create mode 100644 OsmAnd-telegram/res/drawable-mdpi/ic_overflow_menu_white.png create mode 100644 OsmAnd-telegram/res/drawable-xhdpi/ic_overflow_menu_white.png create mode 100644 OsmAnd-telegram/res/drawable-xxhdpi/ic_overflow_menu_white.png create mode 100644 OsmAnd-telegram/res/layout/live_now_dialog_card.xml diff --git a/OsmAnd-telegram/res/drawable-hdpi/ic_overflow_menu_white.png b/OsmAnd-telegram/res/drawable-hdpi/ic_overflow_menu_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a0001ebe324065e8c3f24f4e9287afb71907b5e7 GIT binary patch literal 1134 zcmaJ>PiPcZ7$0bnXbEh=OZDJ5=Ae+-c{BTFcHfv)vNPFcpc}(xs}aQH&CJ`)n9RI! z=EdCvTB5WSrLBb)u@|WzXg%nqiXcJSiwdQO(o=IWR|$A31rOqz&2ID%9GH3Ud++;w z-|zc3mnJ7Z9o)5Nmmmm(&bVFY>rnO%?BL&Z;o3F6e8R@2*%WQEHcp5z>Qk49PKaBi zPO!gp_8A!wgb%(78q;jL_L=F?Fpo2xd?$=KS`bE#c4F+!6DGQ(6+~s}<)g=v82DxB zgkA%+*dlYm_;Ny~mM0qC^1O$9>F5!0q+@aeAz@hTgbPt>cFI!MuF3b=u_B3G6*ga% zHc3s_CPj-TMAY+!>;V;uMU+={qlk*bqQ+$floSof0GWEh1e(};Bf|krZMDDYg!;m$@fHDFQ$q4zHY!H>`o(oCS z_4{_V!&_=qgV3&2v{9(4W3W=N!I-60O3(&+6`(%WiBg6mkMw;9+;u@cfsTwWi*|mv1nP{s*49t1d&hM>7lGln^D^&3C+NI z0#uYCf`*I@f@J~$C=pOnbkUJZT2ZY;c>)$IwsbTS1<~`j7vsAR#n1N+QdZ0 zI`LGbH=$NkC52N|vetR0mHJ1#KeO%DU~pk;v`EC~DdB^&n!9|D58aAmk2X60Zv6E7 z&J~dR@VhJUmvFB$_~6#Qy$?@4KmF?CW8Xd<-e~Q|&efgL-(NWAE4!0B?dw-woLv3+ zNAmyYGf&rtTD9wkS7#pFxo91qIkRy8#*>ehioc!u^Yq$eqxE0(*HwKjH+wU8^P7Ku r*i)Yxs9R^o2Y+49ef{O}+XFzjRek;J`xk#a&i(+-*o1wzGJD|-(ROio literal 0 HcmV?d00001 diff --git a/OsmAnd-telegram/res/drawable-mdpi/ic_overflow_menu_white.png b/OsmAnd-telegram/res/drawable-mdpi/ic_overflow_menu_white.png new file mode 100644 index 0000000000000000000000000000000000000000..eb2b0d75d8141ed4a63685c307bef01e81fa4c67 GIT binary patch literal 1135 zcmaJ>O>EOh6n5366a*{?(84Z)k$d5%6aU0^GFC%r;}n8O326kqv15DESgk$Ao^H~@ z0T7^42_!fnv=tRB5?tUp9^q;GeQV~xFI3nff{!{4tOxzBvr$_nFbjMi8KM?@HMsZBu9#}lMNusd_& z2^kQC?sHysoQ;;3V_kw|@$qo2~VbJuag4k^4#Fkx??-Q{kf|d%K%!!Mn#!F?8 zrx5{q%7BinXdr`9if&|3rXQ&MEXi3(m7$DGJ#ES=XkQ}t7P&REVvV$Y@l#H$GZvbX z)MzwPjdY4e6Ow`ul4Mm@0`3 zhBY)?;I}%YDM~@h7WAQfW~5LsWKGVd(;aLvh#3wX((&za-)*e*U96dp2xc^@QaaV? zf^wZQ8rNwE^7&TP!Omk|;L=9CD=E`r)E0@n--tUBQ6IGOYBlkL)A@Waw*k$}%r#0Tf&8}U3Jx-&&sPFMRzv*bTcj zc3*n%_}}|K%^mOlkOu3((T#npt}OJP@BQ*joZBwm+*Y2y`seK*x19LruUgm6w|CF>9C=ya{jlf7>CbyNom}&zYJCC+ oyI!v>|888Lzi@el(A6WH+SC8TwWq(_PksT#!l?E4@ULh80|Pf|rT_o{ literal 0 HcmV?d00001 diff --git a/OsmAnd-telegram/res/drawable-xhdpi/ic_overflow_menu_white.png b/OsmAnd-telegram/res/drawable-xhdpi/ic_overflow_menu_white.png new file mode 100644 index 0000000000000000000000000000000000000000..67673adab6ce29d545eb874dd9acebe960dc269e GIT binary patch literal 1196 zcmaJ>UuYaf7+=pSu@K0E8g2WqZlP4#x&6O)v*cPYw|B`wE)Ca%3sP!kcjuBN*`4j~ z#JdEQVvTJoDpG4ft9=lC5G|Bc5el`I^r28t@g@3PrJx{U`XJ=N*~@M0L+HZp%zX3x zzVG+_+vSPzk^Y^#c5)ooUmdmTY?YF??{W5RX8t|RmS<^sk{%^3+C~xPiY~D+U-i*6 zu4CjboVbmLIPTFmyv8J*tc{rt@v|t=$#(pZp*e2oa3@60ET+7Tr@f#c{B`X+f%n{k z(9~;EEiB;~Z*(!jM;FH%&f=^CUE%N{eyC$I13spR@Az{;Y<3Dl*RIL-iC7f)t_qzk z2%DrPYZH8lM3~pJ25=-<<8v@8>qZXd4)O{+i&9=xBp^XkS4~Obdyl}pMQ+QiTa}(K zb}9%nl!m4#w%hG&Tg{SaT9hG#qNIq50+7!)7yrFjiH91 zEdx!0IiNw!0LZ`yU`>+pSjx+~V+cLG`#}CS`;ur*pZVDl8Q!P#;Ae3K2`^{Q2DbbkHw zgDd?vrGc`uZ*(Xl?B>6J^WeF6-XG(3KePN)-(y#QABmQPv-?Ne_dZ_V_0qXZEA!&r ziwA!A`iqN$kMzC3Wj3ZyzI|`?(;v^T+&Zu^_1;&v%B%1Gb8YSHNB5uDv+vMrUw*!R z=g8E?&-X7JU*9-$>h#DfAO51oOD~@ITTC2P7(P(64TQpjHn9)Q=}?VTX6L%IoC!-=*j?Dl0)fR+HP+dgvoOM3oEhAO zR&8mU)WlGdMx&<1CTmlq#>8l1tTCpxRHfAyYrV!sV(2ApY*bRBF?wcUu@9t^%$)iE z`M&@D&x@VyEtTc#%K-qDiPmTrIa~dE&E4eLbK|`ha@^;|dcAHd<7E{GgNSCOF-#ar zAMV16HvG&NxE_F2`}9<=*PCpURm%t{J|>VeY{CYheoM|))B)_lH15;QF!kF@6f8iz zfiSfgRBy5qHd_vc!GJ`oEGNPc3UEOwghI8DCo;ppP zOTLH{ruse4mKi3S%?7eUz;gN+4k5&_Jj3%eLD257=_xtdbZd$hqS#d(-S%|LguX>3 zZ4G&0ibT4Yf?+3<%Z5#NsZgY3Oir;GF2FK|;pbIAyIvRmKa3U8Zfe-ZOc!>oAx9=_R6JihK!Zx+aT3O-rXGiRL9qq!BA38X=9R zCCuTVnig>;trhL8#7BHI!V67Y6CV*dE+#g`If3ZnQalz73UQ&xO_;8ym?|#%)`{;W zE_+9=-0Wb*vz(M=4Hl=Mv)}S8x8Jg1b915V@WE}msaaWfv)`u0tfSb`pT%0-u?$$K zv#hTWLmDGdL1~T_Srnp0Buca*VTHyb%hqAGjti<1wZzwMtKZ_B5)H}2E`}p3JW>To z&}gMj5@?RYq@)=I(@GGl913PcKEzQB36b$f=eAKQs>po$ugi-;gyq%3CfO&4EY7j5 zmE!=E#1hd+D)+vBIj7uF4 zY-B5b-}>60_nu~JKlfgNpn5kbgP>$hBcMR(qVVNRd(ZJ}cuKhSYyP=$yXUm`(A8TH z@7urqt!uMazCUqt?&S2^JtNPryUMiwYdtzP@#HtJZ_aE#bNKjoU*|7R2uCmGFCP|Q z_|*Dyf1Fik?*He|hJ%0Sr*8B=eq_^UI|p~yJq-%p{@T$va{ki!4^M=?#rIh2_Eb&L z4U=bA|FZY(Q>)QvRr$LIPzSebyk-Hm+>GpaY3Hu$mP$}^fRGcVpAy*I3upm8ax*fv zuyFK)mX3?vZQfnSO2Vb{n<^$NFC40c;UiBpw5Ep7%DMD3Ox4H{LEK9lbZh + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OsmAnd-telegram/res/values/attrs.xml b/OsmAnd-telegram/res/values/attrs.xml index b79cf5d82f..1b69045815 100644 --- a/OsmAnd-telegram/res/values/attrs.xml +++ b/OsmAnd-telegram/res/values/attrs.xml @@ -2,6 +2,7 @@ + diff --git a/OsmAnd-telegram/res/values/dimens.xml b/OsmAnd-telegram/res/values/dimens.xml index 24378ab076..f8c63c2143 100644 --- a/OsmAnd-telegram/res/values/dimens.xml +++ b/OsmAnd-telegram/res/values/dimens.xml @@ -1,17 +1,38 @@ + 4dp 8dp 16dp + 32dp - 22sp + + 60dp + 24dp 60dp 44dp - 48dp + 36dp 2dp + + 60dp + 48dp + + 32dp + 12dp + 20dp + + 64dp + + 6dp + + 12dp + + + + 22sp + 18sp 16sp - 60dp - \ No newline at end of file + diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml index 3133c46467..c693bc3b52 100644 --- a/OsmAnd-telegram/res/values/strings.xml +++ b/OsmAnd-telegram/res/values/strings.xml @@ -1,4 +1,5 @@ + Show on map OsmAnd Telegram Phone number Phone number in the international format diff --git a/OsmAnd-telegram/res/values/styles.xml b/OsmAnd-telegram/res/values/styles.xml index 876536fd3d..a89d3df5c0 100644 --- a/OsmAnd-telegram/res/values/styles.xml +++ b/OsmAnd-telegram/res/values/styles.xml @@ -2,8 +2,8 @@