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

[android] Remove google button

Browse source
This commit is contained in:
Александр Зацепин 2017-07-31 13:31:55 +03:00 • committed by Roman Kuznetsov
parent ef719b8066
commit 1ebc663b54
2 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,27 +114,6 @@
android:orientation="horizontal"
tools:ignore="ButtonStyle">
<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="@drawable/button_editor_light"
android:drawableLeft="@drawable/ic_login_google"
android:drawableStart="@drawable/ic_login_google"
android:fontFamily="@string/robotoMedium"
android:paddingLeft="@dimen/margin_half"
android:paddingStart="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:paddingEnd="@dimen/margin_half"
android:text="@string/google"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:textColor="@color/text_dark"
tools:targetApi="jelly_bean"/>
<Button
android:id="@+id/login_facebook"
android:layout_width="0dp"
@ -147,8 +126,8 @@
android:fontFamily="@string/robotoMedium"
android:paddingLeft="@dimen/margin_half"
android:paddingStart="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:paddingEnd="@dimen/margin_half"
android:paddingRight="@dimen/margin_double"
android:paddingEnd="@dimen/margin_double"
android:text="@string/facebook"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"
android:textColor="@color/text_light"

6
android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java
View file

@ -35,7 +35,7 @@ public abstract class OsmAuthFragmentDelegate implements View.OnClickListener
public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
{
for (@IdRes int childId : new int[] {R.id.login_osm, R.id.login_facebook, R.id.login_google, R.id.register})
for (@IdRes int childId : new int[] {R.id.login_osm, R.id.login_facebook, R.id.register})
{
final View v = view.findViewById(childId);
if (v != null)
@ -57,10 +57,6 @@ public abstract class OsmAuthFragmentDelegate implements View.OnClickListener
Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.FACEBOOK);
loginWebview(OsmOAuth.AuthType.FACEBOOK);
break;
case R.id.login_google:
Statistics.INSTANCE.trackAuthRequest(OsmOAuth.AuthType.GOOGLE);
loginWebview(OsmOAuth.AuthType.GOOGLE);
break;
case R.id.register:
Statistics.INSTANCE.trackEvent(Statistics.EventName.EDITOR_REG_REQUEST);
register();