diff options
Diffstat (limited to 'android/MapboxGLAndroidSDK/src/main/res')
18 files changed, 41 insertions, 6 deletions
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png Binary files differdeleted file mode 100644 index de44e3ddc0..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png Binary files differdeleted file mode 100644 index fa26786242..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png Binary files differdeleted file mode 100644 index dd50478ac1..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png Binary files differdeleted file mode 100644 index d377f3cb8c..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml new file mode 100644 index 0000000000..ef82c18f5d --- /dev/null +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:colorControlHighlight"> + <item android:id="@android:id/mask"> + <shape android:shape="oval"> + <solid android:color="@android:color/white" /> + </shape> + </item> +</ripple>
\ No newline at end of file diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png Binary files differdeleted file mode 100644 index df7d7a8875..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png Binary files differdeleted file mode 100644 index f5b1833641..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png Binary files differdeleted file mode 100644 index 0a04d4eaad..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png Binary files differdeleted file mode 100644 index faaef0625d..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png Binary files differdeleted file mode 100644 index bcee96deaa..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png Binary files differdeleted file mode 100644 index 781263f760..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png +++ /dev/null diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml deleted file mode 100644 index b5fedb0fd0..0000000000 --- a/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/attribution_button_pressed" android:state_pressed="true" /> - <item android:drawable="@drawable/attribution_button_normal" /> -</selector>
\ No newline at end of file diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml new file mode 100644 index 0000000000..48e53e7ee8 --- /dev/null +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@color/gray_light" android:state_pressed="true" /> + <item android:drawable="@color/gray_light" android:state_focused="true" /> + <item android:drawable="@android:color/transparent" /> +</selector>
\ No newline at end of file diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml new file mode 100644 index 0000000000..fa82bb8d9b --- /dev/null +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF1E8CAB" + android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z"/> +</vector> diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml new file mode 100644 index 0000000000..074928d05a --- /dev/null +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path + android:fillColor="#551E8CAB" + android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z" /> +</vector> diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml new file mode 100644 index 0000000000..7f6245b30a --- /dev/null +++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml @@ -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/ic_info_outline_24dp_selected" android:state_pressed="true" /> + <item android:drawable="@drawable/ic_info_outline_24dp" /> +</selector>
\ No newline at end of file diff --git a/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml index 92cd2315f4..a7503332a4 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml +++ b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml @@ -26,7 +26,8 @@ android:clickable="true" android:contentDescription="@string/attributionsIconContentDescription" android:padding="7dp" - android:src="@drawable/attribution_button_selector" /> + android:src="@drawable/ic_info_outline_24dp_selector" + android:background="@drawable/bg_default_selector"/> <com.mapbox.mapboxsdk.views.UserLocationView android:id="@+id/userLocationView" diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml index b87580661d..97d29c7d45 100644 --- a/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml +++ b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml @@ -3,6 +3,7 @@ <color name="white">#FFFFFF</color> <color name="black">#000000</color> <color name="gray">#7D7F80</color> + <color name="gray_light">#EEEEEE</color> <color name="mapbox_blue">#1E8CAB</color> <color name="my_location_ring">@color/mapbox_blue</color> </resources> |