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

[android] Layouts and resources for auth.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-01-23 14:57:12 +03:00 • committed by Sergey Yershov
parent 8284809e09
commit 14c89db9ff
22 changed files with 197 additions and 54 deletions

11
android/res/drawable-v21/accent_button.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/base_accent_pressed">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/base_accent"/>
<corners android:radius="2dp"/>
</shape>
</item>
</ripple>

11
android/res/drawable-v21/accent_button_night.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/base_accent_pressed_night">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/base_accent_night"/>
<corners android:radius="2dp"/>
</shape>
</item>
</ripple>

11
android/res/drawable-v21/editor_light_button.xml Normal file
View file

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

11
android/res/drawable-v21/editor_light_button_night.xml Normal file
View file

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

7
android/res/drawable/accent_button.xml Normal file
View file

@ -0,0 +1,7 @@
<?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/accent_button_night.xml Normal file
View file

@ -0,0 +1,7 @@
<?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/editor_light_button.xml Normal file
View file

@ -0,0 +1,7 @@
<?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 Normal file
View file

@ -0,0 +1,7 @@
<?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 Normal file
View file

@ -0,0 +1,7 @@
<?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>

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

@ -1,35 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/MwmWidget.ToolbarStyle"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/bg_cards"
android:gravity="end|center_vertical"
android:theme="@style/MwmWidget.ToolbarTheme"/>
android:theme="@style/MwmWidget.ToolbarTheme.Light"
tools:ignore="UnusedAttribute"/>
<ScrollView
android:id="@+id/block_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
android:layout_height="match_parent"
android:background="@color/bg_cards"
android:fillViewport="true"
tools:ignore="DuplicateIds">
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/margin_base">
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="@dimen/margin_base"
tools:ignore="ScrollViewSize">
<Button
android:id="@+id/login_google"
android:layout_width="match_parent"
android:layout_height="@dimen/editor_auth_btn_height"
android:layout_marginBottom="@dimen/margin_base"
android:background="@color/bg_editor_login_google"
android:background="?buttonLight"
android:text="Google"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
@ -38,21 +45,18 @@
android:id="@+id/login_facebook"
android:layout_width="match_parent"
android:layout_height="@dimen/editor_auth_btn_height"
android:layout_below="@id/login_google"
android:background="@color/bg_editor_login_fb"
android:text="Facebook"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
<com.mapswithme.maps.widget.CustomTextInputLayout
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="@dimen/base_block_size"
android:layout_below="@id/facebook"
android:layout_marginTop="60dp">
<EditText
android:id="@+id/input"
android:id="@+id/osm_username"
style="@style/MwmWidget.Editor.FieldLayout.EditText"
android:hint="Email address or username"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
@ -60,13 +64,12 @@
</com.mapswithme.maps.widget.CustomTextInputLayout>
<com.mapswithme.maps.widget.CustomTextInputLayout
android:id="@+id/password"
style="@style/MwmWidget.Editor.FieldLayout"
android:layout_below="@id/facebook"
android:layout_marginTop="60dp">
android:layout_width="match_parent"
android:layout_height="@dimen/base_block_size"
android:layout_marginTop="@dimen/margin_base_plus">
<EditText
android:id="@+id/input"
android:id="@+id/osm_password"
style="@style/MwmWidget.Editor.FieldLayout.EditText"
android:hint="Password"
android:inputType="textPassword"
@ -75,42 +78,77 @@
</com.mapswithme.maps.widget.CustomTextInputLayout>
<Button
android:id="@+id/login"
android:id="@+id/login_osm"
android:layout_width="match_parent"
android:layout_height="@dimen/editor_auth_btn_height"
android:layout_marginBottom="@dimen/margin_base"
android:background="?colorAccent"
android:background="?buttonAccent"
android:text="Log in"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
<TextView
android:id="@+id/lost_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@id/login"
android:layout_gravity="right"
android:layout_marginTop="@dimen/margin_base"
android:background="?clickableBackground"
android:padding="@dimen/margin_half"
android:text="Lost password"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3"/>
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<Button
android:id="@+id/register"
android:layout_width="match_parent"
android:layout_height="@dimen/editor_auth_btn_height"
android:layout_alignParentBottom="true"
android:layout_below="@id/lost_password"
android:layout_marginTop="@dimen/margin_base"
android:background="@color/bg_editor_login_google"
android:text="Login"
android:background="?buttonLight"
android:text="Register"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
</RelativeLayout>
</LinearLayout>
</ScrollView>
</RelativeLayout>
<ScrollView
android:id="@+id/block_terms"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fillViewport="true"
tools:ignore="DuplicateIds">
<LinearLayout
android:id="@+id/block_terms"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/margin_base"
android:visibility="gone">
<TextView
android:id="@+id/terms"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<Button
android:id="@+id/btn__confirm"
android:layout_width="match_parent"
android:layout_height="@dimen/base_block_size"
android:background="?buttonAccent"
android:text="@string/agree"
android:textAllCaps="true"
android:textAppearance="@style/MwmTextAppearance.Body3.Light"/>
</LinearLayout>
</ScrollView>
</LinearLayout>

5
android/res/layout/place_page_phone.xml
View file

@ -11,11 +11,12 @@
<ImageView
android:id="@+id/iv__place_phone"
style="@style/PlacePageMetadataIcon"
android:src="@drawable/ic_phone" />
android:src="@drawable/ic_phone"
android:tint="?colorAccent"/>
<TextView
android:id="@+id/tv__place_phone"
style="@style/PlacePageMetadataText"
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
tools:text="+1 234 567-89-00" />
tools:text="+1 234 567-89-00"/>
</LinearLayout>

10
android/res/layout/place_page_placename.xml
View file

@ -12,13 +12,13 @@
android:id="@+id/iv__place_name"
style="@style/PlacePageMetadataIcon"
android:layout_centerVertical="true"
android:src="@drawable/ic_address" />
android:src="@drawable/ic_address"/>
<Space
<Space
android:id="@+id/anchor_center"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerVertical="true" />
android:layout_centerVertical="true"/>
<TextView
android:id="@+id/tv__place_address"
@ -26,7 +26,7 @@
android:layout_above="@id/anchor_center"
android:layout_toEndOf="@id/iv__place_name"
android:layout_toRightOf="@id/iv__place_name"
tools:text="Sample place" />
tools:text="Sample place"/>
<TextView
android:id="@+id/tv__place_post_address"
@ -36,5 +36,5 @@
android:layout_alignStart="@id/tv__place_address"
android:layout_below="@id/tv__place_address"
android:textAppearance="@style/MwmTextAppearance.Body3"
tools:text="Post address" />
tools:text="Post address"/>
</RelativeLayout>

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

@ -10,16 +10,14 @@
<ImageView
android:id="@+id/iv__place_website"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_base"
style="@style/PlacePageMetadataIcon"
android:src="@drawable/ic_website"
android:tint="?colorAccent" />
android:tint="?colorAccent"/>
<TextView
android:id="@+id/tv__place_website"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
tools:text="osm.org" />
tools:text="osm.org"/>
</LinearLayout>

4
android/res/layout/place_page_wifi.xml
View file

@ -10,10 +10,10 @@
<ImageView
android:id="@+id/iv__place_wifi"
style="@style/PlacePageMetadataIcon"
android:src="@drawable/ic_wifi" />
android:src="@drawable/ic_wifi"/>
<TextView
android:id="@+id/tv__place_wifi"
style="@style/PlacePageMetadataText"
android:text="@string/WiFi_available" />
android:text="@string/WiFi_available"/>
</LinearLayout>

5
android/res/layout/place_page_wiki.xml
View file

@ -11,11 +11,12 @@
<ImageView
android:id="@+id/iv__place_wiki"
style="@style/PlacePageMetadataIcon"
android:src="@drawable/ic_wiki" />
android:src="@drawable/ic_wiki"
android:tint="?colorAccent"/>
<TextView
android:id="@+id/tv__place_wiki"
style="@style/PlacePageMetadataText"
android:text="@string/read_in_wikipedia"
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent" />
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"/>
</LinearLayout>

1
android/res/layout/tab_timepicker.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
style="@style/MwmWidget.Tab"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/MwmWidget.Tab"

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

@ -13,6 +13,9 @@
<color name="base_accent">#FF1E96F0</color>
<color name="base_accent_night">#FFFFE68C</color>
<color name="base_accent_pressed">#FF1C85D6</color>
<color name="base_accent_pressed_night">#FFCCB870</color>
<color name="base_red">#FFF54137</color>
<color name="icon_tint">#FF757575</color>
@ -32,7 +35,7 @@
<color name="bg_cards">@android:color/white</color>
<color name="bg_cards_night">#FF3C4044</color>
<color name="bg_panel">@color/bg_window</color>
<color name="bg_panel_night">@color/bg_cards_night</color>
<color name="bg_panel_night">@color/bg_window_night</color>
<color name="bg_side_panel">@color/bg_cards</color>
<color name="bg_side_panel_night">@color/bg_panel_night</color>
@ -89,7 +92,12 @@
<!-- Editor -->
<color name="bg_editor_add_enabled">@color/base_accent</color>
<color name="bg_editor_add_disabled">#FFF4F4F4</color>
<color name="bg_editor_login_google">#FFF2F6F6</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_night">#FFF2F6F6</color>
<color name="bg_editor_light_night_pressed">#FFDCD9D9</color>
</resources>

2
android/res/values/styles-editor.xml
View file

@ -58,8 +58,6 @@
</style>
<style name="MwmWidget.Editor.FieldLayout.EditText">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:singleLine">true</item>
<item name="android:textAppearance">@style/MwmTextAppearance.Body1</item>
</style>

5
android/res/values/styles-text.xml
View file

@ -73,6 +73,11 @@
<item name="android:textSize">@dimen/text_size_toolbar</item>
</style>
<style name="MwmTextAppearance.Toolbar.Title.Light">
<item name="android:textSize">@dimen/text_size_toolbar</item>
<item name="android:textColor">@color/bg_cards</item>
</style>
<style name="MwmTextAppearance.Toolbar.Title.Button">
<item name="android:textSize">@dimen/text_size_body_3</item>
<item name="android:textAllCaps">true</item>

10
android/res/values/styles.xml
View file

@ -61,11 +61,21 @@
<item name="android:contentInsetLeft" tools:ignore="NewApi">72dp</item>
</style>
<style name="MwmWidget.ToolbarStyle.Light">
<item name="android:titleTextAppearance" tools:targetApi="lollipop">@style/MwmTextAppearance.Toolbar.Title.Light</item>
<item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title.Light</item>
</style>
<style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:gravity">center_vertical</item>
<item name="colorAccent">@android:color/white</item>
</style>
<style name="MwmWidget.ToolbarTheme.Light" parent="ThemeOverlay.AppCompat.ActionBar">
<item name="android:gravity">center_vertical</item>
<item name="colorAccent">@color/bg_window_night</item>
</style>
<style name="MwmWidget.ListView" parent="Widget.AppCompat.ListView">
<item name="android:fadingEdge">none</item>
<item name="android:divider">@color/divider</item>

2
android/res/values/themes-attrs.xml
View file

@ -12,6 +12,8 @@
<attr name="iconTint" format="color"/>
<attr name="iconTintLight" format="color"/>
<attr name="counterTextColor" format="color"/>
<attr name="buttonAccent" format="reference"/>
<attr name="buttonLight" format="reference"/>
<attr name="zoomPlus" format="reference"/>
<attr name="zoomMinus" format="reference"/>

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

@ -33,7 +33,9 @@
<item name="secondary">@color/text_dark_hint</item>
<item name="dividerHorizontal">@color/divider</item>
<item name="ppBackground">@color/bg_window</item>
<item name="buttonAccent">@drawable/accent_button</item>
<item name="buttonLight">@drawable/editor_light_button</item>
<item name="ppBackground">@color/bg_cards</item>
<item name="ppButtonsBackground">?panel</item>
<item name="ppPreviewHead">@drawable/bg_place_page_back</item>
@ -83,7 +85,9 @@
<item name="secondary">@color/text_light_hint</item>
<item name="dividerHorizontal">@color/divider_night</item>
<item name="ppBackground">?panel</item>
<item name="buttonAccent">@drawable/accent_button_night</item>
<item name="buttonLight">@drawable/editor_light_button_night</item>
<item name="ppBackground">@color/bg_cards_night</item>
<item name="ppButtonsBackground">@color/bg_window_night</item>
<item name="ppPreviewHead">@drawable/bg_place_page_back_night</item>