Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Subscription UI fixes

Browse source
This commit is contained in:
Alexey Kulish 2016-01-27 10:56:39 +03:00
parent b6e5b5a01e
commit b56665b2b1
4 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/res/drawable/bg_card_orange.xml Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<nine-patch android:src="@drawable/bg_card_shadow" />
</item>
<item>
<shape>
<solid
android:color="@color/osmand_orange" />
<corners
android:radius="2dp" />
</shape>
</item>
</layer-list>

13
OsmAnd/res/drawable/btn_round_shade.xml Normal file
View file

@ -0,0 +1,13 @@
<?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/map_widget_dark_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">
<solid android:color="@color/fab_color_pressed" />
<corners android:radius="@dimen/map_button_rect_rad" />
</shape></item>
</selector>

6
OsmAnd/res/layout/live_updates_header.xml
View file

@ -13,7 +13,7 @@
android:id="@+id/subscription_banner" android:id="@+id/subscription_banner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/osmand_orange" android:background="@drawable/bg_card_orange"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingLeft="24dp" android:paddingLeft="24dp"
@ -60,7 +60,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:background="@drawable/btn_round_transparent" android:background="@drawable/btn_round_shade"
android:text="@string/shared_string_read_more"/> android:text="@string/shared_string_read_more"/>
<Button <Button
@ -69,7 +69,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="32dp" android:layout_marginLeft="32dp"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:background="@drawable/btn_round_transparent" android:background="@drawable/btn_round_shade"
android:text="@string/osm_live_subscribe_btn"/> android:text="@string/osm_live_subscribe_btn"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

6
OsmAnd/res/layout/subscription_fragment.xml
View file

@ -63,6 +63,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:paddingLeft="2dp"
android:hint="@string/shared_string_email_address" android:hint="@string/shared_string_email_address"
android:inputType="textEmailAddress"/> android:inputType="textEmailAddress"/>
@ -72,6 +73,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingLeft="2dp"
android:layout_marginLeft="72dp" android:layout_marginLeft="72dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:text="@string/osm_live_email_desc" android:text="@string/osm_live_email_desc"
@ -103,6 +105,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:paddingLeft="2dp"
android:hint="@string/osm_live_user_public_name" android:hint="@string/osm_live_user_public_name"
android:inputType="text"/> android:inputType="text"/>
@ -117,6 +120,7 @@
android:layout_marginLeft="72dp" android:layout_marginLeft="72dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:paddingLeft="2dp"
android:text="@string/osm_live_hide_user_name" android:text="@string/osm_live_hide_user_name"
android:textColor="?android:attr/textColorPrimary"/> android:textColor="?android:attr/textColorPrimary"/>
@ -148,6 +152,8 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:paddingLeft="2dp"
android:paddingRight="0dp"
android:drawableRight="@drawable/ic_action_arrow_drop_down" android:drawableRight="@drawable/ic_action_arrow_drop_down"
android:editable="false" android:editable="false"
android:hint="@string/osm_live_support_region"/> android:hint="@string/osm_live_support_region"/>