tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - remove preview image integration (#9657)

Browse Source
This commit is contained in:
Tobrun
2017-08-01 15:25:07 +02:00
committed by GitHub
parent 11b8f2dcb2
commit de46df21a7
6 changed files with 1 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
View File

@@ -108,8 +108,7 @@ public class MapView extends FrameLayout {
private void initialise(@NonNull final Context context, @NonNull final MapboxMapOptions options) {
if (isInEditMode()) {
// in IDE, show preview map
LayoutInflater.from(context).inflate(R.layout.mapbox_mapview_preview, this);
// in IDE layout editor, just return
return;
}
mapboxMapOptions = options;

BIN
platform/android/MapboxGLAndroidSDK/src/main/res/drawable-nodpi/mapbox_mapview_preview.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 162 KiB

9
platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/mapbox_default_bg_selector.xml
View File

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

6
platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_default_bg_selector.xml
View File

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

52
platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_preview.xml
View File

@@ -1,52 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:contentDescription="@null"
android:src="@drawable/mapbox_mapview_preview"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
<ImageView
android:id="@id/logoView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="@dimen/mapbox_four_dp"
android:layout_marginLeft="@dimen/mapbox_four_dp"
android:layout_marginStart="@dimen/mapbox_four_dp"
android:contentDescription="@null"
android:src="@drawable/mapbox_logo_icon"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toEndOf="@+id/logoView"
android:contentDescription="@null"
android:layout_marginBottom="@dimen/mapbox_four_dp"
android:background="@drawable/mapbox_default_bg_selector"
android:src="@drawable/mapbox_info_bg_selector"
android:layout_marginLeft="@dimen/mapbox_four_dp"
android:layout_marginStart="@dimen/mapbox_four_dp"
android:layout_toRightOf="@+id/logoView"/>
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_margin="10dp"
android:contentDescription="@null"
android:src="@drawable/mapbox_compass_icon"/>
</RelativeLayout>

1
platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="mapbox_gray">#7D7F80</color>
<color name="mapbox_gray_light">#EEEEEE</color>
<color name="mapbox_blue">#1E8CAB</color>
</resources>