From df48ab7b730959500dd8facc329ae18290f10f0a Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <arnaud.vergnet@mailo.com>
Date: Sun, 3 Jul 2022 16:44:28 +0200
Subject: [PATCH] [android] rework OSM login UX

Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
---
 android/AndroidManifest.xml                   |   2 +-
 .../layout/fragment_auth_editor_dialog.xml    |  61 -------
 android/res/layout/fragment_osm_login.xml     |  53 ++++---
 ...th_editor.xml => fragment_osm_profile.xml} |  90 ++---------
 .../maps/editor/AuthDialogFragment.java       |  51 ------
 .../mapswithme/maps/editor/AuthFragment.java  |  54 -------
 .../maps/editor/EditorHostFragment.java       |  20 +--
 .../maps/editor/OsmAuthFragment.java          | 150 ------------------
 .../maps/editor/OsmAuthFragmentDelegate.java  |  75 ---------
 ...uthActivity.java => OsmLoginActivity.java} |   4 +-
 .../maps/editor/OsmLoginFragment.java         | 122 ++++++++++++++
 .../maps/editor/ProfileFragment.java          |  53 ++++---
 12 files changed, 207 insertions(+), 528 deletions(-)
 delete mode 100644 android/res/layout/fragment_auth_editor_dialog.xml
 rename android/res/layout/{fragment_auth_editor.xml => fragment_osm_profile.xml} (58%)
 delete mode 100644 android/src/com/mapswithme/maps/editor/AuthDialogFragment.java
 delete mode 100644 android/src/com/mapswithme/maps/editor/AuthFragment.java
 delete mode 100644 android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
 delete mode 100644 android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java
 rename android/src/com/mapswithme/maps/editor/{OsmAuthActivity.java => OsmLoginActivity.java} (69%)
 create mode 100644 android/src/com/mapswithme/maps/editor/OsmLoginFragment.java

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index ce2381cd9a..010980558a 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -754,7 +754,7 @@
         android:parentActivityName="com.mapswithme.maps.MwmActivity" />
 
     <activity
-        android:name="com.mapswithme.maps.editor.OsmAuthActivity"
+        android:name="com.mapswithme.maps.editor.OsmLoginActivity"
         android:parentActivityName="com.mapswithme.maps.MwmActivity" />
 
     <activity
diff --git a/android/res/layout/fragment_auth_editor_dialog.xml b/android/res/layout/fragment_auth_editor_dialog.xml
deleted file mode 100644
index 735afcbe0b..0000000000
--- a/android/res/layout/fragment_auth_editor_dialog.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="wrap_content"
-  android:background="?cardBackground"
-  android:layout_height="match_parent">
-
-  <LinearLayout
-    android:id="@+id/block_auth"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
-    android:minWidth="280dp"
-    android:orientation="vertical"
-    android:padding="@dimen/margin_base_plus">
-
-    <ImageView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:src="@drawable/img_auth"/>
-
-    <TextView
-      android:id="@+id/first_osm_edit"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/margin_base_plus"
-      android:layout_marginTop="20dp"
-      android:fontFamily="@string/robotoMedium"
-      android:gravity="center"
-      android:text="@string/login_to_make_edits_visible"
-      android:textColor="?android:textColorPrimary"
-      android:textSize="@dimen/text_size_toolbar"
-      tools:ignore="UnusedAttribute"/>
-
-    <Button
-      android:id="@+id/login_osm"
-      style="@style/MwmWidget.Button.Accent"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/editor_auth_btn_height"
-      android:fontFamily="@string/robotoMedium"
-      android:text="@string/openstreetmap"
-      android:textAllCaps="false"
-      android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
-
-    <Button
-      android:id="@+id/register"
-      style="@style/MwmWidget.Button.Accent"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/margin_base"
-      android:background="@drawable/button_editor_light"
-      android:fontFamily="@string/robotoMedium"
-      android:padding="@dimen/margin_quarter"
-      android:text="@string/register_at_openstreetmap"
-      android:textAppearance="@style/MwmTextAppearance.Body1"
-      android:textColor="@color/text_dark"/>
-
-  </LinearLayout>
-
-</ScrollView>
diff --git a/android/res/layout/fragment_osm_login.xml b/android/res/layout/fragment_osm_login.xml
index f23e2c711d..89a337f6d5 100644
--- a/android/res/layout/fragment_osm_login.xml
+++ b/android/res/layout/fragment_osm_login.xml
@@ -5,15 +5,9 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
-  <androidx.appcompat.widget.Toolbar
+  <include
     android:id="@+id/toolbar"
-    style="@style/MwmWidget.ToolbarStyle"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:background="?cardBackground"
-    android:gravity="end|center_vertical"
-    android:theme="@style/MwmWidget.ToolbarTheme.Light"
-    tools:ignore="UnusedAttribute" />
+    layout="@layout/toolbar_default"/>
   <ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -28,26 +22,35 @@
       android:orientation="vertical"
       android:padding="@dimen/margin_base"
       tools:ignore="ScrollViewSize">
+
+      <TextView
+        android:id="@+id/first_osm_edit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fontFamily="@string/robotoMedium"
+        android:text="@string/login_to_make_edits_visible"
+        android:textColor="?android:textColorPrimary"
+        android:textAppearance="@style/MwmTextAppearance.Body2"/>
       <com.mapswithme.maps.widget.CustomTextInputLayout
         style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_marginTop="@dimen/margin_base"
-        android:minHeight="@dimen/height_block_base"
         android:textColorHint="?android:textColorSecondary">
         <EditText
           android:id="@+id/osm_username"
           style="@style/MwmWidget.Editor.FieldLayout.EditText"
-          android:hint="@string/email_or_username" />
+          android:hint="@string/email_or_username"
+          android:autofillHints="emailAddress" />
       </com.mapswithme.maps.widget.CustomTextInputLayout>
       <com.mapswithme.maps.widget.CustomTextInputLayout
         style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_marginTop="@dimen/margin_base"
-        android:minHeight="@dimen/height_block_base"
         android:textColorHint="?android:textColorSecondary">
         <EditText
           android:id="@+id/osm_password"
           style="@style/MwmWidget.Editor.FieldLayout.EditText"
           android:hint="@string/password"
-          android:inputType="textPassword" />
+          android:inputType="textPassword"
+          android:autofillHints="password" />
       </com.mapswithme.maps.widget.CustomTextInputLayout>
       <FrameLayout
         android:layout_width="match_parent"
@@ -57,26 +60,40 @@
           android:id="@+id/login"
           style="@style/MwmWidget.Button.Accent"
           android:layout_width="match_parent"
-          android:layout_height="@dimen/editor_auth_btn_height"
+          android:layout_height="wrap_content"
           android:text="@string/login"
-          android:textAppearance="@style/MwmTextAppearance.Body1.Light" />
+          android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
         <ProgressBar
           android:id="@+id/osm_login_progress"
           android:layout_width="@dimen/editor_auth_btn_height"
           android:layout_height="@dimen/editor_auth_btn_height"
           android:layout_gravity="center"
-          android:elevation="@dimen/design_fab_elevation"/>
+          android:elevation="@dimen/design_fab_elevation"
+          android:visibility="gone"/>
       </FrameLayout>
-      <TextView
+      <Button
         android:id="@+id/lost_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        style="@style/MwmWidget.Button"
         android:layout_gravity="end"
-        android:background="?clickableBackground"
         android:padding="@dimen/margin_half"
+        android:background="?clickableBackground"
         android:text="@string/forgot_password"
-        android:textAllCaps="true"
         android:textAppearance="@style/MwmTextAppearance.Body3" />
+
+      <Button
+        android:id="@+id/register"
+        style="@style/MwmWidget.Button.Accent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_base"
+        android:background="@drawable/button_editor_light"
+        android:fontFamily="@string/robotoMedium"
+        android:padding="@dimen/margin_quarter"
+        android:text="@string/register_at_openstreetmap"
+        android:textAppearance="@style/MwmTextAppearance.Body2"
+        android:textColor="@color/text_dark"/>
     </LinearLayout>
   </ScrollView>
 </LinearLayout>
diff --git a/android/res/layout/fragment_auth_editor.xml b/android/res/layout/fragment_osm_profile.xml
similarity index 58%
rename from android/res/layout/fragment_auth_editor.xml
rename to android/res/layout/fragment_osm_profile.xml
index 14fd0673b3..5fa16c531e 100644
--- a/android/res/layout/fragment_auth_editor.xml
+++ b/android/res/layout/fragment_osm_profile.xml
@@ -21,8 +21,7 @@
       android:layout_gravity="end|center_vertical"
       android:background="?selectableItemBackgroundBorderless"
       android:scaleType="center"
-      android:src="@drawable/ic_more"
-      android:visibility="gone"/>
+      android:src="@drawable/ic_more" />
   </androidx.appcompat.widget.Toolbar>
 
   <ScrollView
@@ -72,83 +71,24 @@
 
         </LinearLayout>
       </LinearLayout>
-
-      <LinearLayout
-        android:id="@+id/block_auth"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="?colorPrimary"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:orientation="vertical"
-        android:paddingStart="@dimen/margin_base"
-        android:paddingEnd="@dimen/margin_base"
-        tools:visibility="gone">
-
-        <TextView
-          android:id="@+id/first_osm_edit"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="20dp"
-          android:text="@string/login_to_make_edits_visible"
-          android:textAppearance="@style/MwmTextAppearance.Body3.Light"
-          android:textColor="@color/text_light"/>
-
-        <Button
-          android:id="@+id/login_osm"
-          style="@style/MwmWidget.Button.Accent"
-          android:layout_width="match_parent"
-          android:layout_height="@dimen/editor_auth_btn_height"
-          android:fontFamily="@string/robotoMedium"
-          android:text="@string/openstreetmap"
-          android:textAllCaps="false"
-          android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
-
-        <TextView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="@dimen/margin_double"
-          android:text="@string/no_osm_account"
-          android:textAppearance="@style/MwmTextAppearance.Body3.Light"
-          android:textColor="@color/text_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:paddingTop="@dimen/margin_half"
-          android:paddingBottom="@dimen/margin_half"
-          android:text="@string/register_at_openstreetmap"
-          android:textAllCaps="true"
-          android:textAppearance="@style/MwmTextAppearance.Body1.Light"
-          android:textColor="@color/text_light"/>
-
-      </LinearLayout>
-
       <RelativeLayout
-        android:id="@+id/block_rating"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:padding="@dimen/margin_base">
-
         <TextView
-            android:id="@+id/osm_history"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:background="?clickableBackground"
-            android:gravity="center"
-            android:paddingBottom="@dimen/margin_half"
-            android:paddingTop="@dimen/margin_half"
-            android:text="@string/history"
-            android:textAppearance="@style/MwmTextAppearance.Body4"
-            android:textColor="?colorAccent"
-            android:textSize="@dimen/text_size_body_1"/>
-
+          android:id="@+id/osm_history"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_alignParentTop="true"
+          android:background="?clickableBackground"
+          android:gravity="center"
+          android:paddingTop="@dimen/margin_half"
+          android:paddingBottom="@dimen/margin_half"
+          android:text="@string/history"
+          android:textAppearance="@style/MwmTextAppearance.Body4"
+          android:textColor="?colorAccent"
+          android:textSize="@dimen/text_size_body_1" />
         <TextView
           android:id="@+id/about_osm"
           android:layout_width="match_parent"
@@ -156,12 +96,12 @@
           android:layout_alignParentBottom="true"
           android:background="?clickableBackground"
           android:gravity="center"
-          android:paddingBottom="@dimen/margin_half"
           android:paddingTop="@dimen/margin_half"
+          android:paddingBottom="@dimen/margin_half"
           android:text="@string/editor_more_about_osm"
           android:textAppearance="@style/MwmTextAppearance.Body4"
           android:textColor="?colorAccent"
-          android:textSize="@dimen/text_size_body_4"/>
+          android:textSize="@dimen/text_size_body_4" />
       </RelativeLayout>
     </LinearLayout>
   </ScrollView>
diff --git a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java
deleted file mode 100644
index 5345420bff..0000000000
--- a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.mapswithme.maps.editor;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.Nullable;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.base.BaseMwmDialogFragment;
-
-public class AuthDialogFragment extends BaseMwmDialogFragment
-{
-  @Nullable
-  @Override
-  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
-  {
-    return inflater.inflate(R.layout.fragment_auth_editor_dialog, container, false);
-  }
-
-  @Override
-  protected int getStyle()
-  {
-    return STYLE_NO_TITLE;
-  }
-
-  @Override
-  public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
-  {
-    super.onViewCreated(view, savedInstanceState);
-    OsmAuthFragmentDelegate osmAuthDelegate = new AuthFragmentDelegate();
-    osmAuthDelegate.onViewCreated(view, savedInstanceState);
-  }
-
-  private class AuthFragmentDelegate extends OsmAuthFragmentDelegate
-  {
-    AuthFragmentDelegate()
-    {
-      super(AuthDialogFragment.this);
-    }
-
-    @Override
-    protected void loginOsm()
-    {
-      startActivity(new Intent(getContext(), OsmAuthActivity.class));
-      dismiss();
-    }
-  }
-}
diff --git a/android/src/com/mapswithme/maps/editor/AuthFragment.java b/android/src/com/mapswithme/maps/editor/AuthFragment.java
deleted file mode 100644
index fd469c967a..0000000000
--- a/android/src/com/mapswithme/maps/editor/AuthFragment.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mapswithme.maps.editor;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.base.BaseMwmFragmentActivity;
-import com.mapswithme.maps.base.BaseMwmToolbarFragment;
-import com.mapswithme.maps.widget.ToolbarController;
-
-public class AuthFragment extends BaseMwmToolbarFragment
-{
-  @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(@NonNull View view, @Nullable Bundle savedInstanceState)
-  {
-    super.onViewCreated(view, savedInstanceState);
-    getToolbarController().setTitle(R.string.thank_you);
-    OsmAuthFragmentDelegate osmAuthDelegate = new OsmAuthFragmentDelegate(this)
-    {
-      @Override
-      protected void loginOsm()
-      {
-        ((BaseMwmFragmentActivity) getActivity()).replaceFragment(OsmAuthFragment.class, null, null);
-      }
-    };
-    osmAuthDelegate.onViewCreated(view, savedInstanceState);
-  }
-
-  @NonNull
-  @Override
-  protected ToolbarController onCreateToolbarController(@NonNull View root)
-  {
-    return new ToolbarController(root, requireActivity())
-    {
-      @Override
-      public void onUpClick()
-      {
-        super.onUpClick();
-      }
-    };
-  }
-}
diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
index 6002056cb8..cc0bd2b855 100644
--- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
+++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
@@ -17,7 +17,6 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 
-import com.mapswithme.maps.MwmActivity;
 import com.mapswithme.maps.MwmApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmToolbarFragment;
@@ -28,7 +27,6 @@ import com.mapswithme.maps.editor.data.LocalizedName;
 import com.mapswithme.maps.editor.data.LocalizedStreet;
 import com.mapswithme.maps.editor.data.NamesDataSource;
 import com.mapswithme.maps.editor.data.PhoneFragment;
-import com.mapswithme.maps.intent.Factory;
 import com.mapswithme.maps.widget.SearchToolbarController;
 import com.mapswithme.maps.widget.ToolbarController;
 import com.mapswithme.util.ConnectionState;
@@ -370,23 +368,13 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
       return;
     }
 
-    final Intent intent = makeParentActivityIntent();
-    final Activity parent = getActivity();
-    parent.startActivity(intent);
-
-    if (parent instanceof MwmActivity)
-      ((MwmActivity) parent).customOnNavigateUp();
-    else
-      parent.finish();
+    showLoginDialog();
   }
 
-  private Intent makeParentActivityIntent()
+  private void showLoginDialog()
   {
-    Activity parent = getActivity();
-    Factory.ShowDialogTask task = new Factory.ShowDialogTask(AuthDialogFragment.class.getName());
-    return new Intent(parent, MwmActivity.class)
-        .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
-        .putExtra(MwmActivity.EXTRA_TASK, task);
+    startActivity(new Intent(getContext(), OsmLoginActivity.class));
+    requireActivity().finish();
   }
 
   private void saveNote()
diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
deleted file mode 100644
index 81f635bf53..0000000000
--- a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.mapswithme.maps.editor;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.LightingColorFilter;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.base.BaseMwmFragmentActivity;
-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.util.InputUtils;
-import com.mapswithme.util.ThemeUtils;
-import com.mapswithme.util.UiUtils;
-import com.mapswithme.util.concurrency.ThreadPool;
-import com.mapswithme.util.concurrency.UiThread;
-
-public class OsmAuthFragment extends BaseMwmToolbarFragment implements View.OnClickListener
-{
-  private OsmAuthFragmentDelegate mDelegate;
-
-  private ProgressBar mProgress;
-  private TextView mTvLogin;
-  private View mTvLostPassword;
-
-  private static class AuthToolbarController extends ToolbarController
-  {
-    AuthToolbarController(View root, Activity activity)
-    {
-      super(root, activity);
-      getToolbar().setNavigationIcon(Graphics.tint(activity, activity.getResources().getDrawable(R.drawable.ic_cancel)));
-      getToolbar().setTitleTextColor(ThemeUtils.getColor(activity, android.R.attr.textColorPrimary));
-    }
-  }
-
-  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_osm_login, container, false);
-  }
-
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
-  {
-    super.onViewCreated(view, savedInstanceState);
-    mDelegate = new OsmAuthFragmentDelegate(this)
-    {
-      @Override
-      protected void loginOsm()
-      {
-        ((BaseMwmFragmentActivity) getActivity()).replaceFragment(OsmAuthFragment.class, null, null);
-      }
-    };
-    mDelegate.onViewCreated(view, savedInstanceState);
-    getToolbarController().setTitle(R.string.login);
-    mEtLogin = view.findViewById(R.id.osm_username);
-    mEtPassword = view.findViewById(R.id.osm_password);
-    mTvLogin = view.findViewById(R.id.login);
-    mTvLogin.setOnClickListener(this);
-    mTvLostPassword = view.findViewById(R.id.lost_password);
-    mTvLostPassword.setOnClickListener(this);
-    mProgress = view.findViewById(R.id.osm_login_progress);
-    mProgress.getIndeterminateDrawable().setColorFilter(new LightingColorFilter(0xFF000000, 0xFFFFFF));
-    UiUtils.hide(mProgress);
-  }
-
-  @NonNull
-  @Override
-  protected ToolbarController onCreateToolbarController(@NonNull View root)
-  {
-    return new AuthToolbarController(root, getActivity());
-  }
-
-  @Override
-  public void onClick(View v)
-  {
-    switch (v.getId())
-    {
-    case R.id.login:
-      login();
-      break;
-    case R.id.lost_password:
-      recoverPassword();
-      break;
-    }
-  }
-
-  private void login()
-  {
-    InputUtils.hideKeyboard(mEtLogin);
-    final String username = mEtLogin.getText().toString();
-    final String password = mEtPassword.getText().toString();
-    enableInput(false);
-    UiUtils.show(mProgress);
-    mTvLogin.setText("");
-
-    ThreadPool.getWorker().execute(new Runnable()
-    {
-      @Override
-      public void run()
-      {
-        final String[] auth = OsmOAuth.nativeAuthWithPassword(username, password);
-        final String username = auth == null ? null : OsmOAuth.nativeGetOsmUsername(auth[0], auth[1]);
-        UiThread.run(new Runnable()
-        {
-          @Override
-          public void run()
-          {
-            if (!isAdded())
-              return;
-
-            enableInput(true);
-            UiUtils.hide(mProgress);
-            mTvLogin.setText(R.string.login);
-            mDelegate.processAuth(auth, OsmOAuth.AuthType.OSM, username);
-          }
-        });
-      }
-    });
-  }
-
-  private void enableInput(boolean enable)
-  {
-    mEtPassword.setEnabled(enable);
-    mEtLogin.setEnabled(enable);
-    mTvLogin.setEnabled(enable);
-    mTvLostPassword.setEnabled(enable);
-  }
-
-  private void recoverPassword()
-  {
-    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_RECOVER_PASSWORD)));
-  }
-}
diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java
deleted file mode 100644
index 43d157d487..0000000000
--- a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.mapswithme.maps.editor;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.IdRes;
-import androidx.annotation.Nullable;
-import androidx.annotation.Size;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.util.Constants;
-import com.mapswithme.util.Utils;
-
-public abstract class OsmAuthFragmentDelegate implements View.OnClickListener
-{
-  private final Fragment mFragment;
-
-  protected abstract void loginOsm();
-
-  public OsmAuthFragmentDelegate(Fragment fragment)
-  {
-    mFragment = fragment;
-  }
-
-  public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
-  {
-    for (@IdRes int childId : new int[] {R.id.login_osm, R.id.register})
-    {
-      final View v = view.findViewById(childId);
-      if (v != null)
-        v.setOnClickListener(this);
-    }
-  }
-
-  @Override
-  public void onClick(View v)
-  {
-    // TODO show/hide spinners
-    switch (v.getId())
-    {
-    case R.id.login_osm:
-      loginOsm();
-      break;
-    case R.id.register:
-      register();
-      break;
-    }
-  }
-
-  protected void processAuth(@Size(2) String[] auth, OsmOAuth.AuthType type, String username)
-  {
-    if (auth == null)
-    {
-      if (mFragment.isAdded())
-      {
-        new AlertDialog.Builder(mFragment.getActivity()).setTitle(R.string.editor_login_error_dialog)
-                                                        .setPositiveButton(android.R.string.ok, null).show();
-      }
-      return;
-    }
-
-    OsmOAuth.setAuthorization(mFragment.requireContext(), auth[0], auth[1], username);
-    if (mFragment.isAdded())
-      Utils.navigateToParent(mFragment.getActivity());
-  }
-
-  protected void register()
-  {
-    mFragment.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_REGISTER)));
-  }
-}
diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthActivity.java b/android/src/com/mapswithme/maps/editor/OsmLoginActivity.java
similarity index 69%
rename from android/src/com/mapswithme/maps/editor/OsmAuthActivity.java
rename to android/src/com/mapswithme/maps/editor/OsmLoginActivity.java
index e0814f2fd7..4684097053 100644
--- a/android/src/com/mapswithme/maps/editor/OsmAuthActivity.java
+++ b/android/src/com/mapswithme/maps/editor/OsmLoginActivity.java
@@ -4,11 +4,11 @@ import androidx.fragment.app.Fragment;
 
 import com.mapswithme.maps.base.BaseMwmFragmentActivity;
 
-public class OsmAuthActivity extends BaseMwmFragmentActivity
+public class OsmLoginActivity extends BaseMwmFragmentActivity
 {
   @Override
   protected Class<? extends Fragment> getFragmentClass()
   {
-    return OsmAuthFragment.class;
+    return OsmLoginFragment.class;
   }
 }
diff --git a/android/src/com/mapswithme/maps/editor/OsmLoginFragment.java b/android/src/com/mapswithme/maps/editor/OsmLoginFragment.java
new file mode 100644
index 0000000000..5ee683b163
--- /dev/null
+++ b/android/src/com/mapswithme/maps/editor/OsmLoginFragment.java
@@ -0,0 +1,122 @@
+package com.mapswithme.maps.editor;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
+import androidx.appcompat.app.AlertDialog;
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.base.BaseMwmToolbarFragment;
+import com.mapswithme.util.Constants;
+import com.mapswithme.util.InputUtils;
+import com.mapswithme.util.UiUtils;
+import com.mapswithme.util.concurrency.ThreadPool;
+import com.mapswithme.util.concurrency.UiThread;
+
+public class OsmLoginFragment extends BaseMwmToolbarFragment
+{
+  private ProgressBar mProgress;
+  private Button mLoginButton;
+  private Button mLostPasswordButton;
+  private EditText mLoginInput;
+  private EditText mPasswordInput;
+
+  @Nullable
+  @Override
+  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
+  {
+    return inflater.inflate(R.layout.fragment_osm_login, container, false);
+  }
+
+  @Override
+  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
+  {
+    super.onViewCreated(view, savedInstanceState);
+    getToolbarController().setTitle(R.string.login);
+    mLoginInput = view.findViewById(R.id.osm_username);
+    mPasswordInput = view.findViewById(R.id.osm_password);
+    mLoginButton = view.findViewById(R.id.login);
+    mLoginButton.setOnClickListener((v) -> login());
+    mLostPasswordButton = view.findViewById(R.id.lost_password);
+    mLostPasswordButton.setOnClickListener((v) -> recoverPassword());
+    Button registerButton = view.findViewById(R.id.register);
+    registerButton.setOnClickListener((v) -> register());
+    mProgress = view.findViewById(R.id.osm_login_progress);
+  }
+
+  private void login()
+  {
+    InputUtils.hideKeyboard(mLoginInput);
+    final String username = mLoginInput.getText().toString();
+    final String password = mPasswordInput.getText().toString();
+    enableInput(false);
+    UiUtils.show(mProgress);
+    mLoginButton.setText("");
+
+    ThreadPool.getWorker().execute(() -> {
+      final String[] auth = OsmOAuth.nativeAuthWithPassword(username, password);
+      final String username1 = auth == null ? null : OsmOAuth.nativeGetOsmUsername(auth[0], auth[1]);
+      UiThread.run(() -> processAuth(auth, username1));
+    });
+  }
+
+  private void enableInput(boolean enable)
+  {
+    mPasswordInput.setEnabled(enable);
+    mLoginInput.setEnabled(enable);
+    mLoginButton.setEnabled(enable);
+    mLostPasswordButton.setEnabled(enable);
+  }
+
+  private void recoverPassword()
+  {
+    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_RECOVER_PASSWORD)));
+  }
+
+  private void processAuth(@Size(2) String[] auth, String username)
+  {
+    if (!isAdded())
+      return;
+
+    enableInput(true);
+    UiUtils.hide(mProgress);
+    mLoginButton.setText(R.string.login);
+    if (auth == null)
+      onAuthFail();
+    else
+      onAuthSuccess(auth, username);
+  }
+
+  private void onAuthFail()
+  {
+    new AlertDialog.Builder(requireActivity()).setTitle(R.string.editor_login_error_dialog)
+                                              .setPositiveButton(android.R.string.ok, null)
+                                              .show();
+  }
+
+  private void onAuthSuccess(@Size(2) String[] auth, String username)
+  {
+    OsmOAuth.setAuthorization(requireContext(), auth[0], auth[1], username);
+    final Bundle extras = requireActivity().getIntent().getExtras();
+    final boolean redirectToProfile = extras.getBoolean("redirectToProfile", false);
+    if (redirectToProfile)
+    {
+      startActivity(new Intent(getContext(), ProfileActivity.class));
+      requireActivity().finish();
+    }
+  }
+
+  private void register()
+  {
+    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_REGISTER)));
+  }
+}
diff --git a/android/src/com/mapswithme/maps/editor/ProfileFragment.java b/android/src/com/mapswithme/maps/editor/ProfileFragment.java
index 73438a2ce0..46528c8ca3 100644
--- a/android/src/com/mapswithme/maps/editor/ProfileFragment.java
+++ b/android/src/com/mapswithme/maps/editor/ProfileFragment.java
@@ -3,14 +3,16 @@ package com.mapswithme.maps.editor;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-
 import com.mapswithme.maps.R;
+import com.mapswithme.maps.base.BaseMwmToolbarFragment;
 import com.mapswithme.util.Constants;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.bottomsheet.MenuBottomSheetFragment;
@@ -20,13 +22,9 @@ import com.mapswithme.util.concurrency.UiThread;
 
 import java.util.ArrayList;
 
-public class ProfileFragment extends AuthFragment implements View.OnClickListener
+public class ProfileFragment extends BaseMwmToolbarFragment implements View.OnClickListener
 {
-  private View mSentBlock;
   private TextView mEditsSent;
-  private View mMore;
-  private View mAuthBlock;
-  private View mRatingBlock;
 
   private void onLogoutActionSelected(final ProfileFragment fragment)
   {
@@ -42,6 +40,13 @@ public class ProfileFragment extends AuthFragment implements View.OnClickListene
         .show();
   }
 
+  @Nullable
+  @Override
+  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
+  {
+    return inflater.inflate(R.layout.fragment_osm_profile, container, false);
+  }
+
   @Override
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
   {
@@ -53,14 +58,12 @@ public class ProfileFragment extends AuthFragment implements View.OnClickListene
 
   private void initViews(View view)
   {
-    mMore = getToolbarController().getToolbar().findViewById(R.id.more);
-    mMore.setOnClickListener(this);
+    View more = getToolbarController().getToolbar().findViewById(R.id.more);
+    more.setOnClickListener(this);
     View editsBlock = view.findViewById(R.id.block_edits);
     UiUtils.show(editsBlock);
-    mSentBlock = editsBlock.findViewById(R.id.sent_edits);
-    mEditsSent = mSentBlock.findViewById(R.id.edits_count);
-    mAuthBlock = view.findViewById(R.id.block_auth);
-    mRatingBlock = view.findViewById(R.id.block_rating);
+    View sentBlock = editsBlock.findViewById(R.id.sent_edits);
+    mEditsSent = sentBlock.findViewById(R.id.edits_count);
     view.findViewById(R.id.about_osm).setOnClickListener(this);
     view.findViewById(R.id.osm_history).setOnClickListener(this);
   }
@@ -69,8 +72,6 @@ public class ProfileFragment extends AuthFragment implements View.OnClickListene
   {
     if (OsmOAuth.isAuthorized(requireContext()))
     {
-      UiUtils.show(mMore, mRatingBlock, mSentBlock);
-      UiUtils.hide(mAuthBlock);
       // Update the number of uploaded changesets from OSM.
       ThreadPool.getWorker().execute(() -> {
         final int count = OsmOAuth.getOsmChangesetsCount(requireContext(), getParentFragmentManager());
@@ -79,8 +80,10 @@ public class ProfileFragment extends AuthFragment implements View.OnClickListene
     }
     else
     {
-      UiUtils.show(mAuthBlock);
-      UiUtils.hide(mMore, mRatingBlock, mSentBlock);
+      Intent intent = new Intent(getContext(), OsmLoginActivity.class);
+      intent.putExtra("redirectToProfile", true);
+      startActivity(intent);
+      requireActivity().finish();
     }
   }
 
@@ -89,15 +92,15 @@ public class ProfileFragment extends AuthFragment implements View.OnClickListene
   {
     switch (v.getId())
     {
-    case R.id.more:
-      showBottomSheet();
-      break;
-    case R.id.about_osm:
-      startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(Constants.Url.OSM_ABOUT)));
-      break;
-    case R.id.osm_history:
-      startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(OsmOAuth.getHistoryUrl(requireContext()))));
-      break;
+      case R.id.more:
+        showBottomSheet();
+        break;
+      case R.id.about_osm:
+        startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(Constants.Url.OSM_ABOUT)));
+        break;
+      case R.id.osm_history:
+        startActivity(new Intent((Intent.ACTION_VIEW), Uri.parse(OsmOAuth.getHistoryUrl(requireContext()))));
+        break;
     }
   }