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

Review fixes.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-03-28 19:49:22 +03:00 • committed by Alex Zolotarev
parent 7fe616950d
commit 784231c291
15 changed files with 32 additions and 24 deletions

0
android/res/drawable-hdpi/ic_img_login.png → android/res/drawable-hdpi/img_auth.png
View file

Side by side Swipe Overlay

Before

(image error) Size: 4.1 KiB

After

(image error) Size: 4.1 KiB

0
android/res/drawable-mdpi/ic_img_login.png → android/res/drawable-mdpi/img_auth.png
View file

Side by side Swipe Overlay

Before

(image error) Size: 2.9 KiB

After

(image error) Size: 2.9 KiB

0
android/res/drawable-xhdpi/ic_img_login.png → android/res/drawable-xhdpi/img_auth.png
View file

Side by side Swipe Overlay

Before

(image error) Size: 5.4 KiB

After

(image error) Size: 5.4 KiB

0
android/res/drawable-xxhdpi/ic_img_login.png → android/res/drawable-xxhdpi/img_auth.png
View file

Side by side Swipe Overlay

Before

(image error) Size: 8.4 KiB

After

(image error) Size: 8.4 KiB

0
android/res/drawable-xxxhdpi/ic_img_login.png → android/res/drawable-xxxhdpi/img_auth.png
View file

Side by side Swipe

Before

(image error) Size: 11 KiB

After

(image error) Size: 11 KiB

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

@ -83,7 +83,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
tools:ignore="HardcodedText,ButtonStyle">
tools:ignore="ButtonStyle">
<Button
android:id="@+id/login_google"
@ -101,7 +101,7 @@
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:paddingStart="@dimen/margin_half"
android:text="Google"
android:text="@string/google"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:targetApi="jelly_bean"/>
@ -119,7 +119,7 @@
android:paddingLeft="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:paddingStart="@dimen/margin_half"
android:text="Facebook"
android:text="@string/facebook"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"
tools:targetApi="jelly_bean"/>
@ -131,7 +131,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/editor_auth_btn_height"
android:fontFamily="@string/robotoMedium"
android:text="OpenStreetMap"
android:text="@string/openstreetmap"
android:textAllCaps="false"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"
tools:targetApi="jelly_bean"/>

9
android/res/layout/fragment_auth_editor_dialog.xml
View file

@ -3,8 +3,7 @@
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">
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/block_auth"
@ -18,7 +17,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_img_login"/>
android:src="@drawable/img_auth"/>
<TextView
android:id="@+id/first_osm_edit"
@ -29,8 +28,8 @@
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"
android:textSize="@dimen/text_size_toolbar"
tools:ignore="UnusedAttribute"/>
<LinearLayout
@ -38,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half_plus"
android:orientation="horizontal"
tools:ignore="HardcodedText,ButtonStyle">
tools:ignore="ButtonStyle">
<ImageButton
android:id="@+id/login_google"

2
android/res/values/donottranslate.xml
View file

@ -8,6 +8,8 @@
<!-- App names -->
<string name="facebook" translatable="false">Facebook</string>
<string name="twitter" translatable="false">Twitter</string>
<string name="google" translatable="false">Google</string>
<string name="openstreetmap" translatable="false">OpenStreetMap</string>
<!-- Font names -->
<string name="robotoLight" translatable="false">sans-serif-light</string>

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

@ -407,7 +407,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (Framework.nativeIsDownloadedMapAtScreenCenter())
startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class));
else
UiUtils.showAlertDialog(getActivity(), R.string.message_invalid_feature_position);
UiUtils.showAlertDialog(getActivity(), R.string.message_invalid_feature_position);
}
});
UiUtils.hide(mPositionChooser);

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

@ -54,19 +54,19 @@ public class AuthDialogFragment extends BaseMwmDialogFragment implements View.On
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));
Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.OSM);
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));
Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.FACEBOOK);
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));
Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.GOOGLE);
loginWebview(OsmOAuth.AuthType.GOOGLE);
break;
case R.id.lost_password:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST);
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_LOST_PASSWORD);
recoverPassword();
break;
case R.id.register:
@ -185,8 +185,7 @@ public class AuthDialogFragment extends BaseMwmDialogFragment implements View.On
{
if (isAdded())
{
// TODO set correct text
new AlertDialog.Builder(getActivity()).setTitle("Auth error!")
new AlertDialog.Builder(getActivity()).setTitle(R.string.editor_login_error_dialog)
.setPositiveButton(android.R.string.ok, null).show();
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST_RESULT,

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

@ -63,19 +63,19 @@ 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, OsmOAuth.AuthType.OSM.name));
Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.OSM);
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));
Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.FACEBOOK);
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));
Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.GOOGLE);
loginWebview(OsmOAuth.AuthType.GOOGLE);
break;
case R.id.lost_password:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST);
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_LOST_PASSWORD);
recoverPassword();
break;
case R.id.register:

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

@ -3,6 +3,7 @@ package com.mapswithme.maps.editor;
import android.support.annotation.Size;
import android.support.v7.app.AlertDialog;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmToolbarFragment;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
@ -15,8 +16,7 @@ public abstract class BaseAuthFragment extends BaseMwmToolbarFragment
{
if (isAdded())
{
// TODO set correct text
new AlertDialog.Builder(getActivity()).setTitle("Auth error!")
new AlertDialog.Builder(getActivity()).setTitle(R.string.editor_login_error_dialog)
.setPositiveButton(android.R.string.ok, null).show();
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_AUTH_REQUEST_RESULT,

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

@ -189,7 +189,9 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
intent.putExtra(MwmActivity.EXTRA_TASK, new MwmActivity.ShowAuthorizationTask());
parent.startActivity(intent);
if (!(parent instanceof MwmActivity))
if (parent instanceof MwmActivity)
((MwmActivity) parent).customOnNavigateUp();
else
parent.finish();
}
}

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

@ -19,7 +19,7 @@ public final class OsmOAuth
FACEBOOK("Facebook"),
GOOGLE("Google");
String name;
public final String name;
AuthType(String name)
{

6
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -120,6 +120,7 @@ public enum Statistics
public static final String EDITOR_AUTH_REQUEST = "Editor_Auth_request";
public static final String EDITOR_AUTH_REQUEST_RESULT = "Editor_Auth_request_result";
public static final String EDITOR_REG_REQUEST = "Editor_Reg_request";
public static final String EDITOR_LOST_PASSWORD = "Editor_Lost_password";
public static final String EDITOR_SHARE_SHOW = "Editor_SecondTimeShare_show";
public static final String EDITOR_SHARE_CLICK = "Editor_SecondTimeShare_click";
public static final String EDITOR_REPORT = "Editor_Problem_report";
@ -379,6 +380,11 @@ public enum Statistics
.add(EventParam.IS_ONLINE, String.valueOf(ConnectionState.isConnected())));
}
public void trackAuthRequest(OsmOAuth.AuthType type)
{
trackEvent(EventName.EDITOR_AUTH_REQUEST, Statistics.params().add(Statistics.EventParam.TYPE, type.name));
}
public static ParameterBuilder params()
{
return new ParameterBuilder();