From 8ad298e0aa1db944440878cd96dd88acb08bd965 Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Thu, 4 Feb 2016 19:15:21 +0300
Subject: [PATCH] [android] Auth fragments with profile

---
 android/AndroidManifest.xml                   |   9 +
 android/res/drawable/circle_accent.xml        |   6 +
 android/res/drawable/circle_accent_night.xml  |   6 +
 android/res/layout/fragment_auth_editor.xml   | 197 +++++++++++-------
 android/res/layout/fragment_osm_login.xml     |   2 +-
 android/res/layout/item_osm_edits.xml         |  71 +++++++
 android/res/values/donottranslate.xml         |   1 +
 android/res/values/styles-text.xml            |   4 +
 android/res/values/themes-attrs.xml           |   1 +
 android/res/values/themes-base.xml            |   2 +
 android/res/xml-v21/prefs_misc.xml            |   4 +
 android/res/xml/prefs_misc.xml                |   4 +
 .../src/com/mapswithme/maps/MwmActivity.java  |   2 +-
 .../maps/base/BaseMwmFragmentActivity.java    |   3 +-
 .../mapswithme/maps/editor/AuthFragment.java  | 103 ++-------
 .../maps/editor/BaseAuthFragment.java         |  26 +++
 .../maps/editor/OsmAuthFragment.java          | 135 +-----------
 .../com/mapswithme/maps/editor/OsmOAuth.java  |   4 +-
 .../maps/editor/ProfileActivity.java          |  14 ++
 .../maps/editor/ProfileFragment.java          |  78 +++++++
 .../maps/settings/MiscPrefsFragment.java      |  11 +
 21 files changed, 383 insertions(+), 300 deletions(-)
 create mode 100644 android/res/drawable/circle_accent.xml
 create mode 100644 android/res/drawable/circle_accent_night.xml
 create mode 100644 android/res/layout/item_osm_edits.xml
 create mode 100644 android/src/com/mapswithme/maps/editor/BaseAuthFragment.java
 create mode 100644 android/src/com/mapswithme/maps/editor/ProfileActivity.java
 create mode 100644 android/src/com/mapswithme/maps/editor/ProfileFragment.java

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 7ef7bb0d70..01464d2c5d 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -240,6 +240,15 @@
         android:value="com.mapswithme.maps.MwmActivity"/>
     </activity>
 
+    <activity
+      android:name="com.mapswithme.maps.editor.ProfileActivity"
+      android:parentActivityName="com.mapswithme.maps.settings.SettingsActivity">
+      <!-- The meta-data element is needed for versions lower than 4.1 -->
+      <meta-data
+        android:name="android.support.PARENT_ACTIVITY"
+        android:value="com.mapswithme.maps.settings.SettingsActivity"/>
+    </activity>
+
     <!-- facebook -->
     <activity
         android:name="com.facebook.FacebookActivity"
diff --git a/android/res/drawable/circle_accent.xml b/android/res/drawable/circle_accent.xml
new file mode 100644
index 0000000000..88585f6882
--- /dev/null
+++ b/android/res/drawable/circle_accent.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="oval">
+  <solid android:color="@color/base_accent"/>
+</shape>
\ No newline at end of file
diff --git a/android/res/drawable/circle_accent_night.xml b/android/res/drawable/circle_accent_night.xml
new file mode 100644
index 0000000000..eec2d0e8f6
--- /dev/null
+++ b/android/res/drawable/circle_accent_night.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="oval">
+  <solid android:color="@color/base_accent_night"/>
+</shape>
\ No newline at end of file
diff --git a/android/res/layout/fragment_auth_editor.xml b/android/res/layout/fragment_auth_editor.xml
index 76a3870153..71bc5db63d 100644
--- a/android/res/layout/fragment_auth_editor.xml
+++ b/android/res/layout/fragment_auth_editor.xml
@@ -11,15 +11,27 @@
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="@color/bg_cards"
+    android:background="?colorPrimary"
     android:gravity="end|center_vertical"
-    android:theme="@style/MwmWidget.ToolbarTheme.Light"
-    tools:ignore="UnusedAttribute"/>
+    android:theme="@style/MwmWidget.ToolbarTheme"
+    tools:ignore="UnusedAttribute">
+
+    <ImageView
+      android:id="@+id/logout"
+      android:layout_width="?actionBarSize"
+      android:layout_height="?actionBarSize"
+      android:layout_gravity="end|center_vertical"
+      android:background="?selectableItemBackgroundBorderless"
+      android:scaleType="center"
+      android:src="@drawable/ic_download_map"
+      android:visibility="gone"/>
+
+  </android.support.v7.widget.Toolbar>
 
   <ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_cards"
+    android:background="?colorPrimary"
     android:fillViewport="true"
     tools:ignore="DuplicateIds">
 
@@ -30,88 +42,111 @@
       android:padding="@dimen/margin_base"
       tools:ignore="ScrollViewSize">
 
-      <Button
-        android:id="@+id/login_google"
+      <LinearLayout
+        android:id="@+id/block_edits"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/editor_auth_btn_height"
-        android:layout_marginBottom="@dimen/margin_base"
-        android:background="?buttonLight"
-        android:text="Google"
-        android:textAllCaps="true"
-        android:textAppearance="@style/MwmTextAppearance.Body1"/>
-
-      <Button
-        android:id="@+id/login_facebook"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/editor_auth_btn_height"
-        android:background="@color/bg_editor_login_fb"
-        android:text="Facebook"
-        android:textAllCaps="true"
-        android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
-
-      <com.mapswithme.maps.widget.CustomTextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/base_block_size"
-        android:layout_marginTop="60dp">
-
-        <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_marginTop="@dimen/margin_base_plus">
-
-        <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:layout_marginTop="@dimen/margin_base"
-        android:background="?clickableBackground"
-        android:padding="@dimen/margin_half"
-        android:text="Lost password"
-        android:textAllCaps="true"
-        android:textAppearance="@style/MwmTextAppearance.Body3"/>
+        android:orientation="vertical"
+        android:visibility="gone">
 
-      <Space
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
+        <include
+          android:id="@+id/local_edits"
+          layout="@layout/item_osm_edits"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/margin_half"/>
 
-      <Button
-        android:id="@+id/register"
+        <include
+          android:id="@+id/sent_edits"
+          layout="@layout/item_osm_edits"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/margin_half"/>
+
+      </LinearLayout>
+
+      <LinearLayout
+        android:id="@+id/block_auth"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/editor_auth_btn_height"
-        android:layout_marginTop="@dimen/margin_base"
-        android:background="?buttonLight"
-        android:text="Register"
-        android:textAllCaps="true"
-        android:textAppearance="@style/MwmTextAppearance.Body1"/>
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+          android:id="@+id/first_osm_edit"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/margin_base"
+          android:text="You first object!"
+          android:textAppearance="@style/MwmTextAppearance.Body3.Light"/>
+
+        <Button
+          android:id="@+id/login_google"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/editor_auth_btn_height"
+          android:layout_marginBottom="@dimen/margin_half_plus"
+          android:background="?buttonLight"
+          android:drawableLeft="@drawable/ic_login_google"
+          android:drawableStart="@drawable/ic_login_google"
+          android:fontFamily="@string/robotoMedium"
+          android:paddingEnd="@dimen/margin_half"
+          android:paddingLeft="@dimen/margin_half"
+          android:paddingRight="@dimen/margin_half"
+          android:paddingStart="@dimen/margin_half"
+          android:text="Google"
+          android:textAllCaps="true"
+          android:textAppearance="@style/MwmTextAppearance.Body1"
+          tools:targetApi="jelly_bean"/>
+
+        <Button
+          android:id="@+id/login_facebook"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/editor_auth_btn_height"
+          android:layout_marginBottom="@dimen/margin_half_plus"
+          android:background="@color/bg_editor_login_fb"
+          android:drawableLeft="@drawable/ic_login_fb"
+          android:drawableStart="@drawable/ic_login_fb"
+          android:fontFamily="@string/robotoMedium"
+          android:paddingEnd="@dimen/margin_half"
+          android:paddingLeft="@dimen/margin_half"
+          android:paddingRight="@dimen/margin_half"
+          android:paddingStart="@dimen/margin_half"
+          android:text="Facebook"
+          android:textAllCaps="true"
+          android:textAppearance="@style/MwmTextAppearance.Body1.Light"
+          tools:targetApi="jelly_bean"/>
+
+        <Button
+          android:id="@+id/login_osm"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/editor_auth_btn_height"
+          android:background="?buttonAccent"
+          android:fontFamily="@string/robotoMedium"
+          android:text="Log in with osm"
+          android:textAllCaps="true"
+          android:textAppearance="@style/MwmTextAppearance.Body1.Light"
+          tools:targetApi="jelly_bean"/>
+
+        <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="@dimen/margin_double"
+          android:text="Do you have OSM account?"
+          android:textAllCaps="true"
+          android:textAppearance="@style/MwmTextAppearance.Body3.Light"/>
+
+        <TextView
+          android:id="@+id/register"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="@dimen/margin_half"
+          android:background="?clickableBackground"
+          android:paddingBottom="@dimen/margin_half"
+          android:paddingTop="@dimen/margin_half"
+          android:text="Register"
+          android:textAllCaps="true"
+          android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
+
+      </LinearLayout>
 
     </LinearLayout>
 
diff --git a/android/res/layout/fragment_osm_login.xml b/android/res/layout/fragment_osm_login.xml
index 78dcd5de07..03f19f0458 100644
--- a/android/res/layout/fragment_osm_login.xml
+++ b/android/res/layout/fragment_osm_login.xml
@@ -59,7 +59,7 @@
       </com.mapswithme.maps.widget.CustomTextInputLayout>
 
       <Button
-        android:id="@+id/login_osm"
+        android:id="@+id/login"
         android:layout_width="match_parent"
         android:layout_height="@dimen/editor_auth_btn_height"
         android:layout_marginBottom="@dimen/margin_base"
diff --git a/android/res/layout/item_osm_edits.xml b/android/res/layout/item_osm_edits.xml
new file mode 100644
index 0000000000..fe8bc76250
--- /dev/null
+++ b/android/res/layout/item_osm_edits.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
+
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingBottom="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_half"
+    android:paddingLeft="@dimen/margin_half"
+    android:paddingRight="@dimen/margin_half"
+    android:paddingStart="@dimen/margin_half"
+    android:paddingTop="@dimen/margin_base">
+
+    <ImageView
+      android:id="@+id/image"
+      android:layout_width="40dp"
+      android:layout_height="40dp"
+      android:layout_marginLeft="@dimen/margin_half"
+      android:layout_marginStart="@dimen/margin_half"
+      android:background="?circleAccent"
+      android:scaleType="center"
+      tools:src="@drawable/ic_device"/>
+
+    <LinearLayout
+      android:layout_width="0dp"
+      android:layout_height="match_parent"
+      android:layout_marginLeft="@dimen/margin_base"
+      android:layout_marginStart="@dimen/margin_base"
+      android:layout_weight="1"
+      android:orientation="vertical"
+      tools:ignore="NestedWeights">
+
+      <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fontFamily="@string/robotoMedium"
+        android:gravity="center_vertical"
+        android:textAppearance="@style/MwmTextAppearance.Body1"
+        tools:ignore="UnusedAttribute"
+        tools:text="lalala"/>
+
+      <TextView
+        android:id="@+id/subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:textAppearance="@style/MwmTextAppearance.Body3"
+        tools:text="blalala"/>
+
+    </LinearLayout>
+
+    <ImageView
+      android:id="@+id/more"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:padding="@dimen/margin_half"
+      android:scaleType="center"
+      android:src="@drawable/abc_ic_menu_moreoverflow_mtrl_alpha"
+      android:tint="?iconTint"/>
+
+  </LinearLayout>
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index 83702a6eaa..7d0d33c46c 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -45,6 +45,7 @@
   <string name="pref_3d_buildings" translatable="false">3DBuildings</string>
   <string name="pref_track_record" translatable="false">TrackRecord</string>
   <string name="pref_showcase_switched_on" translatable="false">DisplayShowcase</string>
+  <string name="pref_osm_profile" translatable="false">Osm profile</string>
 
   <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
   <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>
diff --git a/android/res/values/styles-text.xml b/android/res/values/styles-text.xml
index dcf399f792..08969c7600 100644
--- a/android/res/values/styles-text.xml
+++ b/android/res/values/styles-text.xml
@@ -34,6 +34,10 @@
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
 
+  <style name="MwmTextAppearance.Body2.Light">
+    <item name="android:textColor">?android:textColorPrimaryInverse</item>
+  </style>
+
   <style name="MwmTextAppearance.Caption">
     <item name="android:textSize">@dimen/text_size_caption</item>
     <item name="android:textColor">?android:textColorSecondary</item>
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index dd0751ae5d..512abb710c 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -13,6 +13,7 @@
     <attr name="iconTintLight" format="color"/>
     <attr name="counterTextColor" format="color"/>
     <attr name="buttonAccent" format="reference"/>
+    <attr name="circleAccent" format="reference"/>
     <attr name="buttonLight" format="reference"/>
 
     <attr name="zoomPlus" format="reference"/>
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index b82c4d6ba5..7cb4d21a06 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -34,6 +34,7 @@
     <item name="dividerHorizontal">@color/divider</item>
 
     <item name="buttonAccent">@drawable/accent_button</item>
+    <item name="circleAccent">@drawable/circle_accent</item>
     <item name="buttonLight">@drawable/editor_light_button</item>
     <item name="ppBackground">@color/bg_cards</item>
     <item name="ppButtonsBackground">?panel</item>
@@ -86,6 +87,7 @@
     <item name="dividerHorizontal">@color/divider_night</item>
 
     <item name="buttonAccent">@drawable/accent_button_night</item>
+    <item name="circleAccent">@drawable/circle_accent_night</item>
     <item name="buttonLight">@drawable/editor_light_button_night</item>
     <item name="ppBackground">@color/bg_cards_night</item>
     <item name="ppButtonsBackground">@color/bg_window_night</item>
diff --git a/android/res/xml-v21/prefs_misc.xml b/android/res/xml-v21/prefs_misc.xml
index 09754335cc..819abc5709 100644
--- a/android/res/xml-v21/prefs_misc.xml
+++ b/android/res/xml-v21/prefs_misc.xml
@@ -22,4 +22,8 @@
     android:defaultValue="true"
     android:switchTextOff=""
     android:switchTextOn=""/>
+
+  <Preference
+    android:key="@string/pref_osm_profile"
+    android:title="OSM profile"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/res/xml/prefs_misc.xml b/android/res/xml/prefs_misc.xml
index 9298dd176d..e3cc9f2562 100644
--- a/android/res/xml/prefs_misc.xml
+++ b/android/res/xml/prefs_misc.xml
@@ -16,4 +16,8 @@
     android:title="Google Play Services"
     android:summary="@string/pref_use_google_play"
     android:defaultValue="true"/>
+
+  <Preference
+    android:key="@string/pref_osm_profile"
+    android:title="OSM profile"/>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index ea9b1d7420..12395921a1 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -220,7 +220,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   }
 
   @Override
-  public void replaceFragment(Class<? extends Fragment> fragmentClass, Bundle args, Runnable completionListener)
+  public void replaceFragment(@NonNull Class<? extends Fragment> fragmentClass, @Nullable Bundle args, @Nullable Runnable completionListener)
   {
     if (mPanelAnimator.isVisible() && getFragment(fragmentClass) != null)
     {
diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
index fe8b6f75b7..2eea885151 100644
--- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
+++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
@@ -3,6 +3,7 @@ package com.mapswithme.maps.base;
 import android.app.Activity;
 import android.media.AudioManager;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
@@ -149,7 +150,7 @@ public class BaseMwmFragmentActivity extends AppCompatActivity
   /**
    * Replace attached fragment with the new one.
    */
-  public void replaceFragment(Class<? extends Fragment> fragmentClass, @Nullable Bundle args, @Nullable Runnable completionListener)
+  public void replaceFragment(@NonNull Class<? extends Fragment> fragmentClass, @Nullable Bundle args, @Nullable Runnable completionListener)
   {
     final int resId = getFragmentContentResId();
     if (resId <= 0 || findViewById(resId) == null)
diff --git a/android/src/com/mapswithme/maps/editor/AuthFragment.java b/android/src/com/mapswithme/maps/editor/AuthFragment.java
index 3d9b1ad7b1..5580f1c428 100644
--- a/android/src/com/mapswithme/maps/editor/AuthFragment.java
+++ b/android/src/com/mapswithme/maps/editor/AuthFragment.java
@@ -1,11 +1,9 @@
 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;
@@ -14,39 +12,15 @@ 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.Constants;
 import com.mapswithme.util.concurrency.ThreadPool;
 import com.mapswithme.util.concurrency.UiThread;
 
-public class AuthFragment extends BaseMwmToolbarFragment implements View.OnClickListener
+public class AuthFragment extends BaseAuthFragment 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)
@@ -58,22 +32,13 @@ public class AuthFragment extends BaseMwmToolbarFragment implements View.OnClick
   public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
-    mToolbarController.setTitle("Log In");
+    mToolbarController.setTitle("Thank you!");
     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)
   {
@@ -98,51 +63,12 @@ public class AuthFragment extends BaseMwmToolbarFragment implements View.OnClick
     }
   }
 
-  private void loginOsm()
+  protected 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);
-          }
-        });
-      }
-    });
+    getMwmActivity().replaceFragment(OsmAuthFragment.class, null, null);
   }
 
-  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)
+  protected void loginWebview(final boolean facebook)
   {
     final WebView webview = new InputWebView(getActivity());
     final AlertDialog dialog = new AlertDialog.Builder(getActivity()).setView(webview).create();
@@ -152,9 +78,6 @@ public class AuthFragment extends BaseMwmToolbarFragment implements View.OnClick
       @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();
 
@@ -173,8 +96,14 @@ public class AuthFragment extends BaseMwmToolbarFragment implements View.OnClick
     dialog.show();
   }
 
-  private void loadWebviewAuth(final AlertDialog dialog, final WebView webview, @Size(3) final String[] auth)
+  protected void loadWebviewAuth(final AlertDialog dialog, final WebView webview, @Size(3) final String[] auth)
   {
+    if (auth == null)
+    {
+      // TODO show some dialog
+      return;
+    }
+
     final String authUrl = auth[0];
     webview.setWebViewClient(new WebViewClient()
     {
@@ -202,7 +131,7 @@ public class AuthFragment extends BaseMwmToolbarFragment implements View.OnClick
     webview.loadUrl(authUrl);
   }
 
-  private void finishWebviewAuth(final String key, final String secret, final String verifier)
+  protected void finishWebviewAuth(final String key, final String secret, final String verifier)
   {
     ThreadPool.getWorker().execute(new Runnable() {
       @Override
@@ -220,12 +149,12 @@ public class AuthFragment extends BaseMwmToolbarFragment implements View.OnClick
     });
   }
 
-  private void recoverPassword()
+  protected void recoverPassword()
   {
     startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_RECOVER_PASSWORD)));
   }
 
-  private void register()
+  protected void register()
   {
     startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_REGISTER)));
   }
diff --git a/android/src/com/mapswithme/maps/editor/BaseAuthFragment.java b/android/src/com/mapswithme/maps/editor/BaseAuthFragment.java
new file mode 100644
index 0000000000..c4c1aec32c
--- /dev/null
+++ b/android/src/com/mapswithme/maps/editor/BaseAuthFragment.java
@@ -0,0 +1,26 @@
+package com.mapswithme.maps.editor;
+
+import android.support.annotation.Size;
+import android.support.v7.app.AlertDialog;
+
+import com.mapswithme.maps.base.BaseMwmToolbarFragment;
+import com.mapswithme.util.Utils;
+
+public abstract class BaseAuthFragment extends BaseMwmToolbarFragment
+{
+  protected 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());
+  }
+}
diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
index 1f17b967bf..55f2d23b02 100644
--- a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
+++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
@@ -3,38 +3,30 @@ 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
+public class OsmAuthFragment extends BaseAuthFragment 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)));
+      mToolbar.setNavigationIcon(Graphics.tint(activity,
+                                               activity.getResources().getDrawable(R.drawable.ic_cancel)));
     }
 
     @Override
@@ -51,7 +43,7 @@ public class OsmAuthFragment extends BaseMwmToolbarFragment implements View.OnCl
   @Override
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
   {
-    return inflater.inflate(R.layout.fragment_auth_editor, container, false);
+    return inflater.inflate(R.layout.fragment_osm_login, container, false);
   }
 
   @Override
@@ -59,13 +51,10 @@ public class OsmAuthFragment extends BaseMwmToolbarFragment implements View.OnCl
   {
     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.login).setOnClickListener(this);
     view.findViewById(R.id.lost_password).setOnClickListener(this);
-    view.findViewById(R.id.register).setOnClickListener(this);
   }
 
   @Override
@@ -80,25 +69,16 @@ public class OsmAuthFragment extends BaseMwmToolbarFragment implements View.OnCl
     // 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);
+    case R.id.login:
+      login();
       break;
     case R.id.lost_password:
       recoverPassword();
       break;
-    case R.id.register:
-      register();
-      break;
     }
   }
 
-  private void loginOsm()
+  private void login()
   {
     final String username = mEtLogin.getText().toString();
     final String password = mEtPassword.getText().toString();
@@ -126,107 +106,8 @@ public class OsmAuthFragment extends BaseMwmToolbarFragment implements View.OnCl
     });
   }
 
-  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)));
-  }
 }
diff --git a/android/src/com/mapswithme/maps/editor/OsmOAuth.java b/android/src/com/mapswithme/maps/editor/OsmOAuth.java
index 828d0349de..ea076fa21a 100644
--- a/android/src/com/mapswithme/maps/editor/OsmOAuth.java
+++ b/android/src/com/mapswithme/maps/editor/OsmOAuth.java
@@ -82,13 +82,13 @@ public final class OsmOAuth
    * @return url for web auth, and token with secret for finishing authorization later
    */
   @Size(3)
-  @NonNull
+  @Nullable
   public static native String[] nativeGetFacebookAuthUrl();
 
   /**
    * @return url for web auth, and token with secret for finishing authorization later
    */
   @Size(3)
-  @NonNull
+  @Nullable
   public static native String[] nativeGetGoogleAuthUrl();
 }
diff --git a/android/src/com/mapswithme/maps/editor/ProfileActivity.java b/android/src/com/mapswithme/maps/editor/ProfileActivity.java
new file mode 100644
index 0000000000..ec1d92b59d
--- /dev/null
+++ b/android/src/com/mapswithme/maps/editor/ProfileActivity.java
@@ -0,0 +1,14 @@
+package com.mapswithme.maps.editor;
+
+import android.support.v4.app.Fragment;
+
+import com.mapswithme.maps.base.BaseMwmFragmentActivity;
+
+public class ProfileActivity extends BaseMwmFragmentActivity
+{
+  @Override
+  protected Class<? extends Fragment> getFragmentClass()
+  {
+    return ProfileFragment.class;
+  }
+}
diff --git a/android/src/com/mapswithme/maps/editor/ProfileFragment.java b/android/src/com/mapswithme/maps/editor/ProfileFragment.java
new file mode 100644
index 0000000000..9995e09fd7
--- /dev/null
+++ b/android/src/com/mapswithme/maps/editor/ProfileFragment.java
@@ -0,0 +1,78 @@
+package com.mapswithme.maps.editor;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.mapswithme.maps.R;
+import com.mapswithme.util.UiUtils;
+
+public class ProfileFragment extends AuthFragment implements View.OnClickListener
+{
+  protected View mEditsBlock;
+  protected TextView mEditsLocal;
+  protected View mEditsMore;
+  protected TextView mEditsSent;
+  protected TextView mEditsSentDate;
+  protected View mLogout;
+  private View mAuthBlock;
+
+  @Override
+  public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
+  {
+    super.onViewCreated(view, savedInstanceState);
+    mToolbarController.setTitle("OSM profile.");
+    initViews(view);
+    refreshViews();
+  }
+
+  protected void initViews(View view)
+  {
+    mLogout = mToolbarController.findViewById(R.id.logout);
+    mLogout.setOnClickListener(this);
+    mEditsBlock = view.findViewById(R.id.block_edits);
+    UiUtils.show(mEditsBlock);
+    final View localEdits = mEditsBlock.findViewById(R.id.local_edits);
+    ((ImageView) localEdits.findViewById(R.id.image)).setImageResource(R.drawable.ic_device);
+    mEditsLocal = (TextView) localEdits.findViewById(R.id.title);
+    mEditsMore = localEdits.findViewById(R.id.more);
+    UiUtils.hide(localEdits.findViewById(R.id.subtitle));
+    final View sentEdits = mEditsBlock.findViewById(R.id.sent_edits);
+    ((ImageView) sentEdits.findViewById(R.id.image)).setImageResource(R.drawable.ic_upload);
+    mEditsSent = (TextView) sentEdits.findViewById(R.id.title);
+    mEditsSentDate = (TextView) sentEdits.findViewById(R.id.subtitle);
+    mAuthBlock = view.findViewById(R.id.block_auth);
+  }
+
+  protected void refreshViews()
+  {
+    if (OsmOAuth.isAuthorized())
+    {
+      UiUtils.show(mLogout);
+      UiUtils.hide(mAuthBlock);
+    }
+    else
+    {
+      UiUtils.show(mAuthBlock);
+      UiUtils.hide(mLogout);
+    }
+  }
+
+  @Override
+  public void onClick(View v)
+  {
+    // TODO show/hide spinners
+    // TODO process clicks
+    switch (v.getId())
+    {
+    case R.id.logout:
+      break;
+    case R.id.more:
+      break;
+    default:
+      super.onClick(v);
+    }
+  }
+}
diff --git a/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java b/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
index 4da2c47b36..f801ecda8e 100644
--- a/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
@@ -1,5 +1,6 @@
 package com.mapswithme.maps.settings;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.TwoStatePreference;
@@ -8,6 +9,7 @@ import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
+import com.mapswithme.maps.editor.ProfileActivity;
 import com.mapswithme.util.Config;
 import com.mapswithme.util.statistics.MytargetHelper;
 import com.mapswithme.util.statistics.Statistics;
@@ -42,5 +44,14 @@ public class MiscPrefsFragment extends BaseXmlSettingsFragment
 
     if (!MytargetHelper.isShowcaseSwitchedOnServer())
       getPreferenceScreen().removePreference(findPreference(getString(R.string.pref_showcase_switched_on)));
+
+    findPreference(getString(R.string.pref_osm_profile)).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+      @Override
+      public boolean onPreferenceClick(Preference preference)
+      {
+        startActivity(new Intent(getActivity(), ProfileActivity.class));
+        return true;
+      }
+    });
   }
 }