From 309c6a0f84a6f69a1d36701d6a118e422620ee4f Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Wed, 3 Feb 2016 18:20:04 +0300
Subject: [PATCH] [android] Added icons for google and fb.

---
 android/res/drawable-hdpi/ic_login_fb.png     | Bin 0 -> 212 bytes
 android/res/drawable-hdpi/ic_login_google.png | Bin 0 -> 1037 bytes
 android/res/drawable-mdpi/ic_login_fb.png     | Bin 0 -> 173 bytes
 android/res/drawable-mdpi/ic_login_google.png | Bin 0 -> 690 bytes
 android/res/drawable-xhdpi/ic_login_fb.png    | Bin 0 -> 242 bytes
 .../res/drawable-xhdpi/ic_login_google.png    | Bin 0 -> 1336 bytes
 android/res/drawable-xxhdpi/ic_login_fb.png   | Bin 0 -> 301 bytes
 .../res/drawable-xxhdpi/ic_login_google.png   | Bin 0 -> 1965 bytes
 android/res/drawable-xxxhdpi/ic_login_fb.png  | Bin 0 -> 369 bytes
 .../res/drawable-xxxhdpi/ic_login_google.png  | Bin 0 -> 2674 bytes
 android/res/layout/fragment_osm_login.xml     |  86 +++++++
 .../maps/editor/OsmAuthFragment.java          | 232 ++++++++++++++++++
 12 files changed, 318 insertions(+)
 create mode 100644 android/res/drawable-hdpi/ic_login_fb.png
 create mode 100644 android/res/drawable-hdpi/ic_login_google.png
 create mode 100644 android/res/drawable-mdpi/ic_login_fb.png
 create mode 100644 android/res/drawable-mdpi/ic_login_google.png
 create mode 100644 android/res/drawable-xhdpi/ic_login_fb.png
 create mode 100644 android/res/drawable-xhdpi/ic_login_google.png
 create mode 100644 android/res/drawable-xxhdpi/ic_login_fb.png
 create mode 100644 android/res/drawable-xxhdpi/ic_login_google.png
 create mode 100644 android/res/drawable-xxxhdpi/ic_login_fb.png
 create mode 100644 android/res/drawable-xxxhdpi/ic_login_google.png
 create mode 100644 android/res/layout/fragment_osm_login.xml
 create mode 100644 android/src/com/mapswithme/maps/editor/OsmAuthFragment.java

diff --git a/android/res/drawable-hdpi/ic_login_fb.png b/android/res/drawable-hdpi/ic_login_fb.png
new file mode 100644
index 0000000000000000000000000000000000000000..9da5db45f3704c562b5fe990c5661afbc5ab1869
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpY)==*kP60RiHi^RKl$JHfBL`r
zAOHXV-~Ye<|No!+n{1M0fb4#*u*u0i5B~Qn?42SV!hF$tr{ne&Nf+vu{og-<C*z;~
z-*_I5pC0BO5=T{&p1AMf=yGIY&c5(pMq!PE;R+EArlz_jk}c9Yi>Eo>y<)UtLKIu;
z<g^Qt3VRxo4pc7S;E)Q`{nftLaWPx3lu4Gr_x~q7CQMFDVPep9=X3eatp5e*Oa@O^
KKbLh*2~7a&u2vfW

literal 0
HcmV?d00001

diff --git a/android/res/drawable-hdpi/ic_login_google.png b/android/res/drawable-hdpi/ic_login_google.png
new file mode 100644
index 0000000000000000000000000000000000000000..02ffdbbe344515c230be7706a8f031e41d2bf085
GIT binary patch
literal 1037
zcmV+o1oHcdP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000BjNkl<ZcmeI!
z1CSh900!VbTcxvoSBSH*owaQnu|1w;@64LPD7J0ec6P_jnSPf}Rs4F;d%pXt{zCJ6
z7$E<N{2xo1G{!h{!b*Kc?46b{FY=yufBW6R9?U)e!M2vz0IQ)O?Se@(z0#_bclg5)
zKqY&_ES`a~FT69LGjOGM2X$ric_|l7sKn=Y#bD*KpnH)%gmVN3Y(QtmI5zXRzE=Kz
zn=z(2lNQ|_(v5Ks0dGr`KV~kM_veq9K6X8S00a~hh#6}Y-}A%Fp0wEIB^lA1X$cxm
z-yPDO;l#uRS&2I3x4baMvcf2KLpnmVCWjl1;%N=|yxOlGZ+z9OmWq-g#+egWwge5M
zA7SD{EO>4CSG+Kww)XXw=m3m!Haz<>CfOX3)8{lby=xesbF?)v%+%VT{DSwsp>}69
z>vM;|r#;-8G}oYg+!|nU@oT&>0Du>4+rKC24etO;rS~)Yq!(jV6ni3nW^AVm66tlX
zfQKbl4Fq>adOQG`1XDGC8srh^NXVu~poiW3Gcb<vB@NB!2Y)_jZ=YMwg4o&*`5bh1
z@7Vdo(XcX%aJS=C1oyM)9lzo*5Pc#=<_wfshu!Kw%L3eOY7N%H4chXN9Xdm&vQqvi
zP>d3@a)Y*hNkc)Wv(x@4P;d!GaqpoWKjTo)$;4u3pbVa%pkgb{4cg!TIt)Y|@IK;n
zhU)Q~1Ma^7UT#oAC1&CV9gkl2EN1uCLBMZWiVZ!|{0-8EOjO}JVW83T@Uz^Yvtz>_
z&C1$WK=qbn&}BgY=rrFS<Zlt|;ftBN5xg8)f{`$ga4Ff~@Md~fd+WUoAA{_**(~Hy
zyQ@PO>7klnKA<^E$Oaf@kig0)*He!Fcb_^sSut{P0*iRAeYBBw(SfQscQB=^spz3X
zD+2=+G~*YXK0pOjFNLqlH?aU%duqa%>ATBH?qB+X!({?fUleRxg$@<LF>DoU$WWI?
zRdl#<D7!=~fUAKkvMm#L70nautL~Y!Px;CN#6IPl;{8>g<9En(-pkT(_PW>=A}~yH
z_c=^fJ$BQrb)T^tZGb?a?Ytm>VP}r(yyxO{5LR{a5hen~2<2Mb{XcEf_mnlVFLRD^
z-tMYUkfK`!yrouq)dqS1!Z)+_D3p-p<JA#Mlc|#JyJC^HrtDC2znHaS@3jS!y?NG2
z<q7S_$nP1!{t98-y770rr~+M@u^yUGCUxVqOVWe2ImjOw<>C1qrtT`yq;HyjK4ev%
z#dB#2HGD}D9l9#doV;Q3wft>@1GDy)D{7CcK0^NO`9Hq_Wr{t%STs0s00000NkvXX
Hu0mjf{s;TO

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/ic_login_fb.png b/android/res/drawable-mdpi/ic_login_fb.png
new file mode 100644
index 0000000000000000000000000000000000000000..49d209c93d5b721a13209200c2238ba136380bb1
GIT binary patch
literal 173
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i5>FS$kP60R35^f;U;N+qU;aN3
zy#IgyzfsH7=)eDe$@6tw+#tQ8r-Jvt<p271t+~JLSvhucW<F@0t;-;&7{@Fwc&hPS
z1k3deAO6QEh#XwcDEwi<vWLow>UaOv%dh)kH(`5wia)<7?_w#7|M~4sWo?WM3~4*R
VzJId%yCl$l22WQ%mvv4FO#nMvMs@%I

literal 0
HcmV?d00001

diff --git a/android/res/drawable-mdpi/ic_login_google.png b/android/res/drawable-mdpi/ic_login_google.png
new file mode 100644
index 0000000000000000000000000000000000000000..eebb1557115e55bfea758830dcbfc11061206251
GIT binary patch
literal 690
zcmV;j0!{siP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0007cNkl<Zcmds$
z1CX>g06=SZSlb?+ZQK5Bo^9K<ZQHhO8*6^)`PRF|=rR*0?}e{i{{Rd0v_7<aKCx?{
zjM-5ThIXWQpgj#4{K2!^+b}oV0(4Bs_x}nE5A}PxcS8-mEye*D#T_{T2<Bu_53(KK
zVi|tqVpX*x&IvJtlg0zX2dk{XU9BtWu2zy8IyolF_FYv8A}k_Eh550B`8?YZ;~)c^
z?BvMGa1;?4s1E>m^<*3-G3rN{k4yZnmK=UpO_BhM^jBaCKbZ{oGk}w=Oi_dg3-&Ri
zHwT>@^$k2GM3|+cAx@h-!q>e6P?<`{aQ0IHJjBcHe|wI^L8TFV?VI2v;_3y!k?sBU
z|Mk5S+W$md2u>n#{9X*LaZeLa+iHPG0;Bje5w%4vX!@8)Dgd))H)siNN23v<ZV13A
z>VzV3R1@*dpOXm)lZJO_3L;TRW&&k@B$0Xt9e<G>5pL{W{J-77jR+K)`jQ6}#xLL{
zExO=tt;Ig8_vc!ODJ2ycrJ$E+JX2FMMD2&bweclj&r~~&u07#?%-~VI;63dS6qZ!r
zUWh56`O!=ot&c9?Cy^&d3v%y{bYTR4k%U?&h0FRNq2yNZ4b2GwgUJS*S?Um}gyXpW
zq|s^GyC>#>f4l#?C*!<&;(m4R3JcM#G(|kfZYDc_+Z=Qc!!0{>1m}?ms3KRkCPdlx
zusjxsdmMrXvFM}h2JivXOLOcF&EU$`AO$gvFY1C1B5SdKu>7-w22(V(D~;jIz$f=)
z-s;mDwO;bxEB_`04kg|&Zt?27Rb#oUSn?PrS$Kz_S#F5DUuU=G*cq0RFj4T`E7v;w
Y4eSej<KnxyG5`Po07*qoM6N<$g4a(xGXMYp

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/ic_login_fb.png b/android/res/drawable-xhdpi/ic_login_fb.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7e62a8e2fb167feb81e8be3565a2a84f35c345
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Dot`d^Ar*{oFRMDaGK#of?2bNk
zccHBjpRBqu2bYzio5LYlF1?wI3k2^T_}+i}^X~HuVOEc}nM{&Q=@Qm!beG%lyf1pz
zlln!CviDX;{!`{TchICkh3|k*0>>HFWoOy^D(`YeFO>Xr-Q(fBA8t?W7q?sw{i`2v
z>h&j44p;AlzkAlro_3<>A5+b8zs-$Rn;UhC8?yzA8-+JF?%dC~xpD2MU8!l#v$wp-
q;L=#ozyu^5#15~YrZ~&HimC74#0A?<OgI4a1cRrmpUXO@geCwCIbrkw

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xhdpi/ic_login_google.png b/android/res/drawable-xhdpi/ic_login_google.png
new file mode 100644
index 0000000000000000000000000000000000000000..afda55066389503e0e2e91f463c8f31d2ff29928
GIT binary patch
literal 1336
zcmV-81;_e{P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000F4Nkl<ZcmeI1
zW0V_f9LC>k+qP}nSlh+gTf3X2leIC)nnkvDd$Bru*FLq4VAEhGocDG<Ox>Buc7hN2
zo%4L#B){jyKUm<zi4$(nmleOE$`j^{%}yRsL<K2jA?`Y<=TBzoFP{-Ij~~slP%m5&
z6DC*ANgh<^A$)C7(c{40K(Y8HRW6b%5BFD}{^28NNu)o0N{mH^%2j!3vu!V4Sa^#{
zIDduQ{|^JREOX?Od^M^ZL<nqwrmXNsMYtce;+#g29C1`3E_fPP3sok+R{Hx_1o!gi
zL++}kI6DMz%^BXTHf8~CqMRCYfLr-Rb2r;cer#&=5%P|4cWg3JCF7Nmx&L66hj{2^
z-oKhy$xn+p1SOK2xsyi=JfuH=O0X98`@?v4x3;Lo`95&t#*0=FZ)|)<jpj!w7fkDu
zx_nDqCO<uHKRK2GS3rs62DbBE`r8+TI+NeXcJ<VC=))@BtXAnypO8hMa%RFF^7Xi#
zIB5%3vKoCM?mD%o&~scPxg<N~%)%Mn5W?#Lm%v@A4;tG(Gs?riqd&7Tp$c*}fumvC
zHo4LG_f62)`~XztxLoDD|87)Omc9ZU5z~KfVPpX+_?qA0>7PG7f98Mun9!hwLBJ6)
z?4AF?dHM4(w7d^xq2E%o`Y>=*Oxq%>NZ~7{<q@b7{t4A+t}k#@%)@RYSCpsH`L-5V
z0Dq-!(<Cvj<|1dGYd!N0^nP=au7GLCvj<qftfjhb-y<5xMUv{U<IDv*-^6GOY!9!n
zSAj4T!vGV;wx>*V1<X6*Q|(p2zX&rh??A`PdfEcpV+6ngW-h_Eb5+2%P-|o^(Dkl{
zw!pSY)s9`D_X`<qfkBrcdli^mhO3zi4EuJ|6~H^*!YsW5KOh>&CX7?49zO<{Fz-rA
zyPEu-*7u<A`WToyQ0)(_Kyn>+n6AKrCcGOk0S{-rc_sOc?SAm9ra<`NQZE?OoVp)y
zOm#E7)g@bNrYlgeMK1(wF!g?^pv1Ai?|^A7iKO`XEb}5V`zn$EhX_~Wb+kuFs3po<
z^{)Xo7<VP-kn)FHUV|YU<0$cq^81=dLtcN~Yk&jLX85dEzScxnAgV&E1Z;t@`qq}t
zFx_`6LMY)Y#&=_~rf|67NpKCMZi6?+RADlv3!JeIuK|{@s0S@0C7I&7K311IRP!?!
z2PIpur(&zI(@gRnxmt5w2ekZ~U-;kiPO&NRd6Pdetv#bXuTT6KU_oS`_@?=t1?Aye
z5zM3L2;=w^uF<Uk<3TjK<il@P1QV1fQ@&dfYL08>?GW^$shNYKmq03@zN}xDI*2|i
z=s~BZw5N5F_lJ7S4=X3aiH+S?l@CQRT+$5h9RGCa6&I6J=e#KUe7ww?_<lv0`4fo`
z?c+aM>J6jUHNx)@)kX5ZWM~P|zj{w_tsuQ<<wwiBDG943cw;Jb$v=K>Y-VrJl>@Fo
z`a~rRE6GWISrq}pYKLI@8eJ3Mn)Lp%jBi(jShd6#%L53cS1bb7qI`7u+cC|lhpi#+
zwIKm78fx$Zwjis&a-sXWI6W8QKd+i(PVFjgl5CUQ3~UL6@VeZA>gc3aWCz=EOXU-Z
zFA=(R#u(Bg5}y^n6WE)^k@fdw4^+*Y-<iKPx;gbo@Rn(3JU7Ja{#+Yv^xl|&2W_6F
uB9GqO&isF~`YO`J+aw(PFU*M(C;tQRApy9j2d3cw0000<MNUMnLSTXqHjNMf

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/ic_login_fb.png b/android/res/drawable-xxhdpi/ic_login_fb.png
new file mode 100644
index 0000000000000000000000000000000000000000..47871e79905203f9f0be41cc53dca2d295577807
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawzIeJghEy=Vy{a1EkSO5#P`+G<
zwOsvCp6qs)rh6MbRQ9)d=VvV8e>bf_h_Ah6_xss5i+`WFzV4#QS-po2YO*~BXYH=X
z6dzR;pHqBHQ$6I5>9R)Md#irwTQ>SIa4<eRuG7Kz@Pvv7lWCKJz`8dln5H)A1gtl?
zut-DTUCigA=O&Y#E;aw0b-$k>ZuQwe?ngdFz5LJI^?2(cktGVOwYJaRZ#$K}*5H52
z*Zu6jqDn70R9<ojyyP%%lY{%Q6HI5ln0q~#OFfyl{#QG(>$br9tNmXyj#jPX3YyRa
s(y!^^2xp#XQwUFrpV@uU#5c#BLGbMN?aSi!0{ze6>FVdQ&MBb@04gkj3jhEB

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxhdpi/ic_login_google.png b/android/res/drawable-xxhdpi/ic_login_google.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9616ff7108af9ed3aeaa677dfb0a07b581720fd
GIT binary patch
literal 1965
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

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxxhdpi/ic_login_fb.png b/android/res/drawable-xxxhdpi/ic_login_fb.png
new file mode 100644
index 0000000000000000000000000000000000000000..d770805e1b22d5dc4d27c17c4a1cc495535d8629
GIT binary patch
literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z-Zy=;uuoF`1ZPL$c;i7*N^w_
zsIFam=I(Yg|L9ryrImf(ix)hI>&!T6<RYWBj#YA<c=`AL-#@&2{ZM#*u$Si2ZPt2%
z9#TuUTsVB<Mw?{P1jb)47f+Yl_43j5&q;GsJDd`}*39|-NZFS`jZsFK`G7`)b4p_*
z!*379(+%$vBo1WG%4KdkXwdNY%5AniY_}UEUN_WSX83mb=&Pp_J+3tE{lNA>X0_>&
z=;wEL9LjRF(m$>o_PTjHqkqKO+t(P)Sp^&z7+Gcr|NAU<I;-{Z{wMd|h$XD%+RXQ1
zBj1lS*$-!|9xN(7V0gR1?0F8e)*9xbwak;&FgvYbu8U&dbKlnC!JeZVqXb#>Hh%ua
w%*3J4z<`f9aF6BA(yXbmWtTOVP6^5qIixw?q(WV#78sNap00i_>zopr0G$n*Y5)KL

literal 0
HcmV?d00001

diff --git a/android/res/drawable-xxxhdpi/ic_login_google.png b/android/res/drawable-xxxhdpi/ic_login_google.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ea6041c8707180f871555229b8d805ff266baa1
GIT binary patch
literal 2674
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

literal 0
HcmV?d00001

diff --git a/android/res/layout/fragment_osm_login.xml b/android/res/layout/fragment_osm_login.xml
new file mode 100644
index 0000000000..78dcd5de07
--- /dev/null
+++ b/android/res/layout/fragment_osm_login.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <android.support.v7.widget.Toolbar
+    android:id="@+id/toolbar"
+    style="@style/MwmWidget.ToolbarStyle"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="@color/bg_cards"
+    android:gravity="end|center_vertical"
+    android:theme="@style/MwmWidget.ToolbarTheme.Light"
+    tools:ignore="UnusedAttribute"/>
+
+  <ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_cards"
+    android:fillViewport="true"
+    tools:ignore="DuplicateIds">
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical"
+      android:padding="@dimen/margin_base"
+      tools:ignore="ScrollViewSize">
+
+      <com.mapswithme.maps.widget.CustomTextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/base_block_size"
+        android:layout_marginTop="@dimen/margin_base">
+
+        <EditText
+          android:id="@+id/osm_username"
+          style="@style/MwmWidget.Editor.FieldLayout.EditText"
+          android:hint="Email address or username"
+          android:textAppearance="@style/MwmTextAppearance.Body1"/>
+
+      </com.mapswithme.maps.widget.CustomTextInputLayout>
+
+      <com.mapswithme.maps.widget.CustomTextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/base_block_size"
+        android:layout_marginBottom="@dimen/margin_base"
+        android:layout_marginTop="@dimen/margin_base">
+
+        <EditText
+          android:id="@+id/osm_password"
+          style="@style/MwmWidget.Editor.FieldLayout.EditText"
+          android:hint="Password"
+          android:inputType="textPassword"
+          android:textAppearance="@style/MwmTextAppearance.Body1"/>
+
+      </com.mapswithme.maps.widget.CustomTextInputLayout>
+
+      <Button
+        android:id="@+id/login_osm"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/editor_auth_btn_height"
+        android:layout_marginBottom="@dimen/margin_base"
+        android:background="?buttonAccent"
+        android:text="Log in"
+        android:textAllCaps="true"
+        android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
+
+      <TextView
+        android:id="@+id/lost_password"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:background="?clickableBackground"
+        android:padding="@dimen/margin_half"
+        android:text="Lost password"
+        android:textAllCaps="true"
+        android:textAppearance="@style/MwmTextAppearance.Body3"/>
+
+    </LinearLayout>
+
+  </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
new file mode 100644
index 0000000000..1f17b967bf
--- /dev/null
+++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
@@ -0,0 +1,232 @@
+package com.mapswithme.maps.editor;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.net.UrlQuerySanitizer;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.Size;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.EditText;
+
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.base.BaseMwmToolbarFragment;
+import com.mapswithme.maps.widget.ToolbarController;
+import com.mapswithme.util.Constants;
+import com.mapswithme.util.Graphics;
+import com.mapswithme.maps.widget.InputWebView;
+import com.mapswithme.util.ThemeUtils;
+import com.mapswithme.util.Utils;
+import com.mapswithme.util.concurrency.ThreadPool;
+import com.mapswithme.util.concurrency.UiThread;
+
+public class OsmAuthFragment extends BaseMwmToolbarFragment implements View.OnClickListener
+{
+  protected static class AuthToolbarController extends ToolbarController
+  {
+    public AuthToolbarController(View root, Activity activity)
+    {
+      super(root, activity);
+      mToolbar.setNavigationIcon(Graphics.tint(activity, ThemeUtils.getResource(activity, R.attr.homeAsUpIndicator)));
+    }
+
+    @Override
+    public void onUpClick()
+    {
+      super.onUpClick();
+    }
+  }
+
+  private EditText mEtLogin;
+  private EditText mEtPassword;
+
+  @Nullable
+  @Override
+  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
+  {
+    return inflater.inflate(R.layout.fragment_auth_editor, container, false);
+  }
+
+  @Override
+  public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
+  {
+    super.onViewCreated(view, savedInstanceState);
+    mToolbarController.setTitle("Log In");
+    view.findViewById(R.id.login_osm).setOnClickListener(this);
+    mEtLogin = (EditText) view.findViewById(R.id.osm_username);
+    mEtPassword = (EditText) view.findViewById(R.id.osm_password);
+    view.findViewById(R.id.login_facebook).setOnClickListener(this);
+    view.findViewById(R.id.login_google).setOnClickListener(this);
+    view.findViewById(R.id.lost_password).setOnClickListener(this);
+    view.findViewById(R.id.register).setOnClickListener(this);
+  }
+
+  @Override
+  protected ToolbarController onCreateToolbarController(@NonNull View root)
+  {
+    return new AuthToolbarController(root, getActivity());
+  }
+
+  @Override
+  public void onClick(View v)
+  {
+    // TODO show/hide spinners
+    switch (v.getId())
+    {
+    case R.id.login_osm:
+      loginOsm();
+      break;
+    case R.id.login_facebook:
+      loginWebview(true);
+      break;
+    case R.id.login_google:
+      loginWebview(false);
+      break;
+    case R.id.lost_password:
+      recoverPassword();
+      break;
+    case R.id.register:
+      register();
+      break;
+    }
+  }
+
+  private void loginOsm()
+  {
+    final String username = mEtLogin.getText().toString();
+    final String password = mEtPassword.getText().toString();
+
+    ThreadPool.getWorker().execute(new Runnable()
+    {
+      @Override
+      public void run()
+      {
+        final String[] auth;
+        auth = OsmOAuth.nativeAuthWithPassword(username, password);
+
+        UiThread.run(new Runnable()
+        {
+          @Override
+          public void run()
+          {
+            if (!isAdded())
+              return;
+
+            processAuth(auth);
+          }
+        });
+      }
+    });
+  }
+
+  private void processAuth(@Size(2) String[] auth)
+  {
+    if (auth == null)
+    {
+      if (isAdded())
+      {
+        new AlertDialog.Builder(getActivity()).setTitle("Auth error!")
+                                              .setPositiveButton(android.R.string.ok, null).show();
+      }
+      return;
+    }
+
+    OsmOAuth.setAuthorization(auth[0], auth[1]);
+    Utils.navigateToParent(getActivity());
+  }
+
+  private void loginWebview(final boolean facebook)
+  {
+    final WebView webview = new InputWebView(getActivity());
+    final AlertDialog dialog = new AlertDialog.Builder(getActivity()).setView(webview).create();
+
+    ThreadPool.getWorker().execute(new Runnable()
+    {
+      @Override
+      public void run()
+      {
+        // TODO(@yunikkk): auth can be nullptr in case of errors.
+        // Need to handle it in UI.
+        // [url, key, secret]
+        final String[] auth = facebook ? OsmOAuth.nativeGetFacebookAuthUrl()
+                                       : OsmOAuth.nativeGetGoogleAuthUrl();
+
+        UiThread.run(new Runnable()
+        {
+          @Override
+          public void run()
+          {
+            if (isAdded())
+              loadWebviewAuth(dialog, webview, auth);
+          }
+        });
+      }
+    });
+
+    dialog.show();
+  }
+
+  private void loadWebviewAuth(final AlertDialog dialog, final WebView webview, @Size(3) final String[] auth)
+  {
+    final String authUrl = auth[0];
+    webview.setWebViewClient(new WebViewClient()
+    {
+      @Override
+      public boolean shouldOverrideUrlLoading(WebView view, String url)
+      {
+        if (OsmOAuth.shouldReloadWebviewUrl(url))
+        {
+          webview.loadUrl(authUrl);
+        }
+        else if (url.contains(OsmOAuth.URL_PARAM_VERIFIER))
+        {
+          UrlQuerySanitizer sanitizer = new UrlQuerySanitizer();
+          sanitizer.setAllowUnregisteredParamaters(true);
+          sanitizer.parseUrl(url);
+          final String verifier = sanitizer.getValue(OsmOAuth.URL_PARAM_VERIFIER);
+          finishWebviewAuth(auth[1], auth[2], verifier);
+          dialog.cancel();
+          return true;
+        }
+
+        return false;
+      }
+    });
+    webview.loadUrl(authUrl);
+  }
+
+  private void finishWebviewAuth(final String key, final String secret, final String verifier)
+  {
+    ThreadPool.getWorker().execute(new Runnable() {
+      @Override
+      public void run()
+      {
+        final String[] auth = OsmOAuth.nativeAuthWithWebviewToken(key, secret, verifier);
+        UiThread.run(new Runnable() {
+          @Override
+          public void run()
+          {
+            processAuth(auth);
+          }
+        });
+      }
+    });
+  }
+
+  private void recoverPassword()
+  {
+    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_RECOVER_PASSWORD)));
+  }
+
+  private void register()
+  {
+    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_REGISTER)));
+  }
+}