Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArsentiy Milchakov <milcars@mapswithme.com>2018-04-11 19:41:40 +0300
committerRoman Kuznetsov <r.kuznetsow@gmail.com>2018-04-12 18:51:33 +0300
commitcd8c347fd58ddd4724c26054ab3c38a545811332 (patch)
tree68db3573eb212682a4a7f7101381dd895503c9a0 /android/res
parentdcb9a778f9ea1fa812741c2157517a068757063d (diff)
[android] Phone auth
Diffstat (limited to 'android/res')
-rw-r--r--android/res/layout/fragment_auth_passport_dialog.xml18
-rw-r--r--android/res/layout/fragment_web_view_with_progress.xml (renamed from android/res/layout/fragment_prefs_copyright.xml)0
-rw-r--r--android/res/values/dimens.xml4
3 files changed, 16 insertions, 6 deletions
diff --git a/android/res/layout/fragment_auth_passport_dialog.xml b/android/res/layout/fragment_auth_passport_dialog.xml
index 2106bba642..e822e6de95 100644
--- a/android/res/layout/fragment_auth_passport_dialog.xml
+++ b/android/res/layout/fragment_auth_passport_dialog.xml
@@ -18,16 +18,16 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/auth_dialog_padding_top"
+ android:layout_marginTop="@dimen/margin_half_plus_eight"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:text="Easy sign in without login and password in a couple of seconds."
/>
<com.facebook.login.widget.LoginButton
xmlns:fb="http://schemas.android.com/apk/res-auto"
- android:id="@+id/loging_button"
+ android:id="@+id/facebook_button"
android:layout_width="match_parent"
- android:layout_height="@dimen/auth_dialog_facebook_btn_height"
- android:layout_marginTop="@dimen/auth_dialog_padding_top"
+ android:layout_height="@dimen/height_primary_button"
+ android:layout_marginTop="@dimen/margin_base"
android:textSize="@dimen/text_size_body_3"
fb:com_facebook_login_text="@string/facebook"
android:paddingStart="@dimen/margin_base"
@@ -37,4 +37,14 @@
android:paddingTop="@dimen/margin_half_plus"
android:paddingBottom="@dimen/margin_half_plus"
android:layout_gravity="center_horizontal"/>
+ <TextView
+ android:id="@+id/phone_button"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/height_primary_button"
+ android:layout_marginTop="@dimen/margin_base"
+ android:textAppearance="@style/MwmTextAppearance.Button"
+ android:textColor="?accentButtonTextColor"
+ android:background="?accentButtonBackground"
+ android:gravity="center"
+ android:text="@string/phone_number"/>
</LinearLayout>
diff --git a/android/res/layout/fragment_prefs_copyright.xml b/android/res/layout/fragment_web_view_with_progress.xml
index 2670612d7a..2670612d7a 100644
--- a/android/res/layout/fragment_prefs_copyright.xml
+++ b/android/res/layout/fragment_web_view_with_progress.xml
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index ef7f3ed957..f34d99629d 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -227,8 +227,8 @@
<dimen name="rating_user_review_min_height">152dp</dimen>
<!-- Authorization-->
- <dimen name="auth_dialog_padding_top">20dp</dimen>
- <dimen name="auth_dialog_padding_bottom">28dp</dimen>
+ <dimen name="auth_dialog_padding_top">28dp</dimen>
+ <dimen name="auth_dialog_padding_bottom">24dp</dimen>
<dimen name="auth_dialog_facebook_btn_height">40dp</dimen>
<dimen name="divider_height">1dp</dimen>