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

Free bersion banner design fix

Browse source
This commit is contained in:
GaidamakUA 2015-10-22 12:45:00 +03:00
parent 117e3af36c
commit 175b5eda86
10 changed files with 60 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/res/drawable-v21/blue_button_drawable.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item android:drawable="@drawable/blue_button_drawable_idle"/>
</ripple>

5
OsmAnd/res/drawable-v21/later_button_drawable.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item android:drawable="@drawable/later_button_drawable_idle"/>
</ripple>

5
OsmAnd/res/drawable/blue_button_drawable.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/blue_button_drawable_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/blue_button_drawable_idle"/>
</selector>

6
OsmAnd/res/drawable/blue_button_drawable_idle.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/map_widget_blue"/>
</shape>

6
OsmAnd/res/drawable/blue_button_drawable_pressed.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/map_widget_blue_pressed"/>
</shape>

5
OsmAnd/res/drawable/later_button_drawable.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/later_button_drawable_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/later_button_drawable_idle"/>
</selector>

7
OsmAnd/res/drawable/later_button_drawable_idle.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="4dp"/>
<stroke android:width="4dp"
android:color="@color/dashboard_parking_dark_color"/>
</shape>

8
OsmAnd/res/drawable/later_button_drawable_pressed.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/osmand_orange"/>
<stroke android:width="4dp"
android:color="@color/dashboard_parking_dark_color"/>
</shape>

16
OsmAnd/res/layout/free_version_banner.xml
View file

@ -5,7 +5,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:theme="@style/FreeVersionBanner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/osmo_header_dark"
@ -14,6 +13,7 @@
android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding"
android:paddingTop="@dimen/list_header_padding"
android:theme="@style/FreeVersionBanner"
tools:showIn="@layout/local_index_fragment_header">
<LinearLayout
@ -162,22 +162,30 @@
<LinearLayout
android:id="@+id/buttonsLinearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_content_padding">
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/getFullVersionButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/list_header_height"
android:layout_weight="1"
android:background="@drawable/blue_button_drawable"
android:text="@string/get_full_version"
android:textSize="@dimen/default_desc_text_size"
android:textStyle="bold"
osmand:textAllCapsCompat="true"/>
<net.osmand.plus.widgets.ButtonEx
android:id="@+id/laterButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/list_header_height"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_weight="1"
android:background="@drawable/later_button_drawable"
android:text="@string/later"
android:textSize="@dimen/default_desc_text_size"
android:textStyle="bold"
osmand:textAllCapsCompat="true"/>
</LinearLayout>

3
OsmAnd/res/values/styles.xml
View file

@ -138,8 +138,7 @@
</style>
<style name="FreeVersionBanner" parent="OsmandDarkTheme">
<item name="android:textColorSecondary">@color/color_white</item>
<item name="colorAccent">@color/map_widget_blue</item>
<item name="android:textColor">@color/color_white</item>
</style>
<style name="OsmandDarkTheme" parent="Theme.AppCompat">