AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] New UI for profile and auth fragments.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-03-28 19:30:15 +03:00 • committed by Alex Zolotarev
parent a01284a40c
commit 7fe616950d
19 changed files with 444 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
android/res/drawable-v21/editor_light_button.xml → android/res/drawable-v21/button_editor_light.xml
View file

2
android/res/drawable-v21/editor_light_button_night.xml → android/res/drawable-v21/button_editor_light_night.xml
View file

@ -2,7 +2,7 @@
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/bg_editor_light_night_pressed">
<item>
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@color/bg_editor_light_night"/>
<corners android:radius="2dp"/>

18
android/res/drawable/button_editor_light.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/bg_editor_light_pressed"/>
<corners android:radius="2dp"/>
</shape>
</item>
<item>
<shape
android:shape="rectangle">
<solid android:color="@color/bg_editor_light"/>
<corners android:radius="2dp"/>
</shape>
</item>
</selector>

18
android/res/drawable/button_editor_light_night.xml Normal file
View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/bg_editor_light_night_pressed"/>
<corners android:radius="2dp"/>
</shape>
</item>
<item>
<shape
android:shape="rectangle">
<solid android:color="@color/bg_editor_light_night"/>
<corners android:radius="2dp"/>
</shape>
</item>
</selector>

7
android/res/drawable/editor_light_button.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/bg_editor_light_night_pressed"
android:state_pressed="true"/>
<item android:drawable="@color/bg_editor_light_night"/>
</selector>

7
android/res/drawable/editor_light_button_night.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/base_accent_pressed"
android:state_pressed="true"/>
<item android:drawable="@color/base_accent"/>
</selector>

7
android/res/drawable/facebook_button.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/bg_editor_login_fb_pressed"
android:state_pressed="true"/>
<item android:drawable="@color/bg_editor_login_fb"/>
</selector>

91
android/res/layout/fragment_auth_editor.xml
View file

@ -39,7 +39,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="@dimen/margin_base"
android:padding="@dimen/margin_half_plus"
tools:ignore="ScrollViewSize">
<LinearLayout
@ -75,46 +75,55 @@
android:id="@+id/first_osm_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:padding="@dimen/margin_half"
android:text="@string/you_have_edited_your_first_object"
android:layout_marginBottom="20dp"
android:text="@string/login_to_make_edits_visible"
android:textAppearance="@style/MwmTextAppearance.Body3.Light"/>
<Button
android:id="@+id/login_google"
<LinearLayout
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="@string/login_with_google"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:targetApi="jelly_bean"/>
android:layout_height="wrap_content"
android:orientation="horizontal"
tools:ignore="HardcodedText,ButtonStyle">
<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="@string/login_with_facebook"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"
tools:targetApi="jelly_bean"/>
<Button
android:id="@+id/login_google"
android:layout_width="0dp"
android:layout_height="@dimen/editor_auth_btn_height"
android:layout_marginBottom="@dimen/margin_half_plus"
android:layout_marginEnd="@dimen/margin_half_plus"
android:layout_marginRight="@dimen/margin_half_plus"
android:layout_weight="1"
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:textAppearance="@style/MwmTextAppearance.Body1"
tools:targetApi="jelly_bean"/>
<Button
android:id="@+id/login_facebook"
android:layout_width="0dp"
android:layout_height="@dimen/editor_auth_btn_height"
android:layout_marginBottom="@dimen/margin_half_plus"
android:layout_weight="1"
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:textAppearance="@style/MwmTextAppearance.Body1.Light"
tools:targetApi="jelly_bean"/>
</LinearLayout>
<Button
android:id="@+id/login_osm"
@ -122,7 +131,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/editor_auth_btn_height"
android:fontFamily="@string/robotoMedium"
android:text="@string/login_with_openstreetmap"
android:text="OpenStreetMap"
android:textAllCaps="false"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"
tools:targetApi="jelly_bean"/>
@ -130,9 +140,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_double"
android:padding="@dimen/margin_half"
android:text="@string/no_osm_account"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3.Light"/>
<TextView
@ -141,7 +149,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_half"
android:background="?clickableBackground"
android:padding="@dimen/margin_half"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:text="@string/register_at_openstreetmap"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>

91
android/res/layout/fragment_auth_editor_dialog.xml Normal file
View file

@ -0,0 +1,91 @@
<?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:layout_height="match_parent"
tools:ignore="DuplicateIds">
<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/ic_img_login"/>
<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:textAppearance="@style/MwmTextAppearance.Toolbar"
android:textColor="@color/text_dark"
tools:ignore="UnusedAttribute"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half_plus"
android:orientation="horizontal"
tools:ignore="HardcodedText,ButtonStyle">
<ImageButton
android:id="@+id/login_google"
android:layout_width="0dp"
android:layout_height="@dimen/editor_auth_btn_height"
android:layout_marginEnd="@dimen/margin_half_plus"
android:layout_marginRight="@dimen/margin_half_plus"
android:layout_weight="1"
android:background="@drawable/button_editor_light"
android:src="@drawable/ic_login_google"/>
<ImageButton
android:id="@+id/login_facebook"
android:layout_width="0dp"
android:layout_height="@dimen/editor_auth_btn_height"
android:layout_weight="1"
android:background="@drawable/com_facebook_button_background"
android:src="@drawable/ic_login_fb"/>
</LinearLayout>
<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="OpenStreetMap"
android:textAllCaps="false"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"
tools:ignore="HardcodedText"
tools:targetApi="jelly_bean"/>
<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="?buttonLight"
android:fontFamily="@string/robotoMedium"
android:padding="@dimen/margin_quarter"
android:text="@string/register_at_openstreetmap"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:ignore="HardcodedText"
tools:targetApi="jelly_bean"/>
</LinearLayout>
</ScrollView>

5
android/res/values/colors.xml
View file

@ -105,9 +105,8 @@
<color name="bg_editor_add_disabled">#0C000000</color>
<color name="bg_editor_login_fb">#FF4861A3</color>
<color name="bg_editor_login_fb_pressed">#FF405792</color>
<color name="bg_editor_light">#FFF2F6F6</color>
<color name="bg_editor_light_pressed">#FFDCD9D9</color>
<!-- TODO yunikkk correct colors -->
<color name="bg_editor_light">#0C000000</color>
<color name="bg_editor_light_pressed">#3D000000</color>
<color name="bg_editor_light_night">#FFF2F6F6</color>
<color name="bg_editor_light_night_pressed">#FFDCD9D9</color>

4
android/res/values/themes-base.xml
View file

@ -54,7 +54,7 @@
<item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled</item>
<item name="circleAccent">@drawable/circle_accent</item>
<item name="buttonLight">@drawable/editor_light_button</item>
<item name="buttonLight">@drawable/button_editor_light</item>
<item name="menuBackgroundClosed">@color/bg_menu_closed</item>
<item name="menuBackgroundOpen">@color/bg_menu_open</item>
@ -119,7 +119,7 @@
<item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
<item name="circleAccent">@drawable/circle_accent_night</item>
<item name="buttonLight">@drawable/editor_light_button_night</item>
<item name="buttonLight">@drawable/button_editor_light_night</item>
<item name="menuBackgroundClosed">@color/bg_menu_closed_night</item>
<item name="menuBackgroundOpen">@color/bg_menu_open_night</item>

19
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -10,6 +10,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
@ -42,7 +43,7 @@ import com.mapswithme.maps.downloader.DownloaderFragment;
import com.mapswithme.maps.downloader.MapManager;
import com.mapswithme.maps.downloader.MigrationFragment;
import com.mapswithme.maps.downloader.OnmapDownloader;
import com.mapswithme.maps.editor.AuthFragment;
import com.mapswithme.maps.editor.AuthDialogFragment;
import com.mapswithme.maps.editor.Editor;
import com.mapswithme.maps.editor.EditorActivity;
import com.mapswithme.maps.editor.EditorHostFragment;
@ -110,7 +111,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
MigrationFragment.class.getName(),
RoutingPlanFragment.class.getName(),
EditorHostFragment.class.getName(),
AuthFragment.class.getName(),
ReportFragment.class.getName() };
// Instance state
private static final String STATE_PP_OPENED = "PpOpened";
@ -407,9 +407,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (Framework.nativeIsDownloadedMapAtScreenCenter())
startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class));
else
// TODO uncomment
// UiUtils.showAlertDialog(getActivity(), R.string.message_invalid_feature_position);
UiUtils.showAlertDialog(getActivity(), R.string.invalid_username_or_password);
UiUtils.showAlertDialog(getActivity(), R.string.message_invalid_feature_position);
}
});
UiUtils.hide(mPositionChooser);
@ -1313,6 +1311,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
}
public static class ShowAuthorizationTask implements MapTask
{
@Override
public boolean run(MwmActivity target)
{
final DialogFragment fragment = (DialogFragment) Fragment.instantiate(target, AuthDialogFragment.class.getName());
fragment.show(target.getSupportFragmentManager(), AuthDialogFragment.class.getName());
return true;
}
}
public void adjustCompass(int offsetX, int offsetY)
{
if (mMapFragment == null || !mMapFragment.isAdded())

6
android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java
View file

@ -34,6 +34,7 @@ public class BaseMwmDialogFragment extends DialogFragment
int style = getStyle();
int theme = getCustomTheme();
if (style != STYLE_NORMAL || theme != 0)
//noinspection WrongConstant
setStyle(style, theme);
}
@ -51,4 +52,9 @@ public class BaseMwmDialogFragment extends DialogFragment
super.onPause();
org.alohalytics.Statistics.logEvent("$onPause", getClass().getSimpleName());
}
public BaseMwmFragmentActivity getMwmActivity()
{
return (BaseMwmFragmentActivity) getActivity();
}
}

203
android/src/com/mapswithme/maps/editor/AuthDialogFragment.java Normal file
View file

@ -0,0 +1,203 @@
package com.mapswithme.maps.editor;
import android.content.Intent;
import android.net.Uri;
import android.net.UrlQuerySanitizer;
import android.os.Bundle;
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 com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.maps.widget.InputWebView;
import com.mapswithme.util.Constants;
import com.mapswithme.util.concurrency.ThreadPool;
import com.mapswithme.util.concurrency.UiThread;
import com.mapswithme.util.statistics.Statistics;
// TODO refactor together with with AuthFragment and BaseAuthFragment to avoid code duplication
public class AuthDialogFragment extends BaseMwmDialogFragment implements View.OnClickListener
{
@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);
view.findViewById(R.id.login_osm).setOnClickListener(this);
view.findViewById(R.id.login_facebook).setOnClickListener(this);
view.findViewById(R.id.login_google).setOnClickListener(this);
view.findViewById(R.id.register).setOnClickListener(this);
}
@Override
public void onClick(View v)
{
// TODO show/hide spinners
switch (v.getId())
{
case R.id.login_osm:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, OsmOAuth.AuthType.OSM.name));
loginOsm();
break;
case R.id.login_facebook:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, OsmOAuth.AuthType.FACEBOOK.name));
loginWebview(OsmOAuth.AuthType.FACEBOOK);
break;
case R.id.login_google:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, OsmOAuth.AuthType.GOOGLE.name));
loginWebview(OsmOAuth.AuthType.GOOGLE);
break;
case R.id.lost_password:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST);
recoverPassword();
break;
case R.id.register:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_REG_REQUEST);
register();
break;
}
}
protected void loginOsm()
{
getMwmActivity().replaceFragment(OsmAuthFragment.class, null, null);
dismiss();
}
protected void loginWebview(final OsmOAuth.AuthType type)
{
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()
{
final String[] auth = (type == OsmOAuth.AuthType.FACEBOOK) ? OsmOAuth.nativeGetFacebookAuthUrl()
: OsmOAuth.nativeGetGoogleAuthUrl();
UiThread.run(new Runnable()
{
@Override
public void run()
{
if (isAdded())
loadWebviewAuth(dialog, webview, auth, type);
}
});
}
});
dialog.show();
}
protected void loadWebviewAuth(final AlertDialog dialog, final WebView webview, @Size(3) final String[] auth, final OsmOAuth.AuthType type)
{
if (auth == null)
{
// TODO show some dialog
return;
}
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))
{
finishWebviewAuth(auth[1], auth[2], getVerifierFromUrl(url), type);
dialog.cancel();
return true;
}
return false;
}
private String getVerifierFromUrl(String authUrl)
{
UrlQuerySanitizer sanitizer = new UrlQuerySanitizer();
sanitizer.setAllowUnregisteredParamaters(true);
sanitizer.parseUrl(authUrl);
return sanitizer.getValue(OsmOAuth.URL_PARAM_VERIFIER);
}
});
webview.loadUrl(authUrl);
}
protected void finishWebviewAuth(final String key, final String secret, final String verifier, final OsmOAuth.AuthType type)
{
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, type);
}
});
}
});
}
protected void recoverPassword()
{
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_RECOVER_PASSWORD)));
}
protected void register()
{
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.OSM_REGISTER)));
dismiss();
}
protected void processAuth(@Size(2) String[] auth, OsmOAuth.AuthType type)
{
if (auth == null)
{
if (isAdded())
{
// TODO set correct text
new AlertDialog.Builder(getActivity()).setTitle("Auth error!")
.setPositiveButton(android.R.string.ok, null).show();
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST_RESULT,
Statistics.params().add(Statistics.EventParam.IS_SUCCESS, false).add(Statistics.EventParam.TYPE, type.name));
}
return;
}
OsmOAuth.setAuthorization(auth[0], auth[1]);
dismiss();
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST_RESULT,
Statistics.params().add(Statistics.EventParam.IS_SUCCESS, true).add(Statistics.EventParam.TYPE, type.name));
}
}

20
android/src/com/mapswithme/maps/editor/AuthFragment.java
View file

@ -63,16 +63,16 @@ public class AuthFragment extends BaseAuthFragment implements View.OnClickListen
switch (v.getId())
{
case R.id.login_osm:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, AuthType.OSM.name));
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, OsmOAuth.AuthType.OSM.name));
loginOsm();
break;
case R.id.login_facebook:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, AuthType.FACEBOOK.name));
loginWebview(AuthType.FACEBOOK);
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, OsmOAuth.AuthType.FACEBOOK.name));
loginWebview(OsmOAuth.AuthType.FACEBOOK);
break;
case R.id.login_google:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, AuthType.GOOGLE.name));
loginWebview(AuthType.GOOGLE);
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, OsmOAuth.AuthType.GOOGLE.name));
loginWebview(OsmOAuth.AuthType.GOOGLE);
break;
case R.id.lost_password:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST);
@ -90,7 +90,7 @@ public class AuthFragment extends BaseAuthFragment implements View.OnClickListen
getMwmActivity().replaceFragment(OsmAuthFragment.class, null, null);
}
protected void loginWebview(final AuthType type)
protected void loginWebview(final OsmOAuth.AuthType type)
{
final WebView webview = new InputWebView(getActivity());
final AlertDialog dialog = new AlertDialog.Builder(getActivity()).setView(webview).create();
@ -100,8 +100,8 @@ public class AuthFragment extends BaseAuthFragment implements View.OnClickListen
@Override
public void run()
{
final String[] auth = (type == AuthType.FACEBOOK) ? OsmOAuth.nativeGetFacebookAuthUrl()
: OsmOAuth.nativeGetGoogleAuthUrl();
final String[] auth = (type == OsmOAuth.AuthType.FACEBOOK) ? OsmOAuth.nativeGetFacebookAuthUrl()
: OsmOAuth.nativeGetGoogleAuthUrl();
UiThread.run(new Runnable()
{
@ -118,7 +118,7 @@ public class AuthFragment extends BaseAuthFragment implements View.OnClickListen
dialog.show();
}
protected void loadWebviewAuth(final AlertDialog dialog, final WebView webview, @Size(3) final String[] auth, final AuthType type)
protected void loadWebviewAuth(final AlertDialog dialog, final WebView webview, @Size(3) final String[] auth, final OsmOAuth.AuthType type)
{
if (auth == null)
{
@ -158,7 +158,7 @@ public class AuthFragment extends BaseAuthFragment implements View.OnClickListen
webview.loadUrl(authUrl);
}
protected void finishWebviewAuth(final String key, final String secret, final String verifier, final AuthType type)
protected void finishWebviewAuth(final String key, final String secret, final String verifier, final OsmOAuth.AuthType type)
{
ThreadPool.getWorker().execute(new Runnable() {
@Override

16
android/src/com/mapswithme/maps/editor/BaseAuthFragment.java
View file

@ -9,21 +9,7 @@ import com.mapswithme.util.statistics.Statistics;
public abstract class BaseAuthFragment extends BaseMwmToolbarFragment
{
public enum AuthType
{
OSM("OSM"),
FACEBOOK("Facebook"),
GOOGLE("Google");
String name;
AuthType(String name)
{
this.name = name;
}
}
protected void processAuth(@Size(2) String[] auth, AuthType type)
protected void processAuth(@Size(2) String[] auth, OsmOAuth.AuthType type)
{
if (auth == null)
{

27
android/src/com/mapswithme/maps/editor/EditorHostFragment.java
View file

@ -1,5 +1,7 @@
package com.mapswithme.maps.editor;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -9,7 +11,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmToolbarFragment;
import com.mapswithme.maps.base.OnBackPressListener;
@ -180,12 +182,20 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
if (OsmOAuth.isAuthorized() || !ConnectionState.isConnected())
Utils.navigateToParent(getActivity());
else
showAuthorization();
{
final Activity parent = getActivity();
Intent intent = new Intent(parent, MwmActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
intent.putExtra(MwmActivity.EXTRA_TASK, new MwmActivity.ShowAuthorizationTask());
parent.startActivity(intent);
if (!(parent instanceof MwmActivity))
parent.finish();
}
}
else
{
Statistics.INSTANCE.trackEditorError(mIsNewObject);
// TODO(yunikkk) set correct error text.
UiUtils.showAlertDialog(getActivity(), R.string.downloader_no_space_title);
}
break;
@ -198,15 +208,4 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
Editor.nativeSetStreet(street);
editMapObject();
}
private void showAuthorization()
{
if (!MwmApplication.prefs().contains(PREF_LAST_AUTH_DISPLAY_TIMESTAMP))
{
MwmApplication.prefs().edit().putLong(PREF_LAST_AUTH_DISPLAY_TIMESTAMP, System.currentTimeMillis()).apply();
getMwmActivity().replaceFragment(AuthFragment.class, null, null);
}
else
mToolbarController.onUpClick();
}
}

2
android/src/com/mapswithme/maps/editor/OsmAuthFragment.java
View file

@ -120,7 +120,7 @@ public class OsmAuthFragment extends BaseAuthFragment implements View.OnClickLis
enableInput(true);
UiUtils.hide(mProgress);
mTvLogin.setText(R.string.login);
processAuth(auth, AuthType.OSM);
processAuth(auth, OsmOAuth.AuthType.OSM);
}
});
}

14
android/src/com/mapswithme/maps/editor/OsmOAuth.java
View file

@ -13,6 +13,20 @@ public final class OsmOAuth
{
private OsmOAuth() {}
public enum AuthType
{
OSM("OSM"),
FACEBOOK("Facebook"),
GOOGLE("Google");
String name;
AuthType(String name)
{
this.name = name;
}
}
// Result type corresponds to OsmOAuth::AuthResult.
@IntDef({OK, FAIL_COOKIE, FAIL_LOGIN, NO_O_AUTH, FAIL_AUTH, NO_ACCESS, NETWORK_ERROR, SERVER_ERROR})
public @interface AuthResult {}