diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-10-29 11:30:15 +0100 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-10-29 16:38:00 +0100 |
commit | c7b417e24747dbe9a0dbdf698dbba9776f66bcdb (patch) | |
tree | c7b646b4ca0dac9663bac92e83d5b21e00b5f4ab /platform/android/MapboxGLAndroidSDKTestApp | |
parent | 516a2858a240fbab2e9de37ffc041408b7c48340 (diff) | |
download | qtlocation-mapboxgl-c7b417e24747dbe9a0dbdf698dbba9776f66bcdb.tar.gz |
[android] - move CameraPositionActivity to use FragmetnActivity above AppCompatActivity
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp')
4 files changed, 46 insertions, 20 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml index 5fcbcb9630..14066123d3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml @@ -126,6 +126,7 @@ </activity> <activity android:name=".activity.camera.CameraPositionActivity" + android:theme="@style/NoActionBar" android:description="@string/description_cameraposition" android:label="@string/activity_camera_position"> <meta-data diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java index 42711a4379..c8ce82f359 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java @@ -6,14 +6,14 @@ import android.os.Bundle; import android.support.annotation.IdRes; import android.support.annotation.NonNull; import android.support.design.widget.FloatingActionButton; +import android.support.v4.app.FragmentActivity; import android.support.v4.content.ContextCompat; import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.widget.SeekBar; import android.widget.TextView; - import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -21,13 +21,12 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.testapp.R; - import timber.log.Timber; /** * Test activity showcasing how to listen to camera change events. */ -public class CameraPositionActivity extends AppCompatActivity implements OnMapReadyCallback, View.OnClickListener, +public class CameraPositionActivity extends FragmentActivity implements OnMapReadyCallback, View.OnClickListener, MapboxMap.OnMapLongClickListener { private MapView mapView; @@ -40,6 +39,11 @@ public class CameraPositionActivity extends AppCompatActivity implements OnMapRe super.onCreate(savedInstanceState); setContentView(R.layout.activity_camera_position); + Toolbar toolbar = findViewById(R.id.toolbar); + toolbar.setTitle(R.string.activity_camera_position); + toolbar.setNavigationIcon(R.drawable.ic_ab_back); + toolbar.setNavigationOnClickListener(v -> finish()); + mapView = (MapView) findViewById(R.id.mapView); mapView.onCreate(savedInstanceState); mapView.getMapAsync(this); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml new file mode 100644 index 0000000000..a972876485 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_ab_back.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:autoMirrored="true" + android:tint="#FFFFFF"> + <path + android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z" + android:fillColor="#FFFFFF"/> +</vector>
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml index 341218c406..bafafb9546 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml @@ -1,24 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> <android.support.design.widget.CoordinatorLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/coordinator_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/coordinator_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_height="?android:attr/actionBarSize" + android:layout_width="match_parent" + android:minHeight="?android:attr/actionBarSize" + android:background="@color/primary" /> <com.mapbox.mapboxsdk.maps.MapView - android:id="@id/mapView" - android:layout_width="match_parent" - android:layout_height="match_parent" - app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> + android:id="@id/mapView" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="?android:attr/actionBarSize" + app:mapbox_uiAttributionTintColor="@color/redAccent" + app:mapbox_styleUrl="@string/mapbox_style_mapbox_streets"/> <android.support.design.widget.FloatingActionButton - android:id="@+id/fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:layout_margin="@dimen/fab_margin" - android:src="@drawable/ic_input" - app:backgroundTint="@android:color/white"/> + android:id="@+id/fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:layout_margin="@dimen/fab_margin" + app:srcCompat="@drawable/ic_input" + app:backgroundTint="@android:color/white"/> </android.support.design.widget.CoordinatorLayout> |