Fixing wearable black screen (#627)

* initial commit gradle updates * 7.1.1 refactoring in missing activities
mapbox · Feb 15, 2019 · aa528e2 · aa528e2
1 parent 11d6731
commit aa528e2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/MapboxAndroidWearDemo/build.gradle b/MapboxAndroidWearDemo/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 
     compileOnly wearDependencies.googleWearable
     implementation wearDependencies.supportGoogleWearable
-
+    implementation wearDependencies.wearableUi
     implementation wearDependencies.gpsWearable
     implementation wearDependencies.gpsLocation
 
@@ -55,7 +55,6 @@ dependencies {
     // Firebase
     implementation dependenciesList.firebaseCrash
     implementation dependenciesList.firebasePerf
-
     implementation project(':SharedCode')
 }
 

diff --git a/...droidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/OfflineMapActivity.java b/...droidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/OfflineMapActivity.java
@@ -20,6 +20,7 @@
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
+import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.mapboxsdk.offline.OfflineManager;
 import com.mapbox.mapboxsdk.offline.OfflineRegion;
 import com.mapbox.mapboxsdk.offline.OfflineRegionError;
@@ -69,18 +70,23 @@ protected void onCreate(Bundle savedInstanceState) {
   @Override
   public void onMapReady(@NonNull MapboxMap mapboxMap) {
     map = mapboxMap;
-    // Set up the OfflineManager
-    offlineManager = OfflineManager.getInstance(OfflineMapActivity.this);
-    downloadRegion.setOnClickListener(new View.OnClickListener() {
+    map.setStyle(Style.MAPBOX_STREETS, new Style.OnStyleLoaded() {
       @Override
-      public void onClick(View view) {
-        downloadRegionDialog();
-      }
-    });
-    listRegions.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        downloadedRegionList();
+      public void onStyleLoaded(@NonNull Style style) {
+        // Set up the OfflineManager
+        offlineManager = OfflineManager.getInstance(OfflineMapActivity.this);
+        downloadRegion.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+            downloadRegionDialog();
+          }
+        });
+        listRegions.setOnClickListener(new View.OnClickListener() {
+          @Override
+          public void onClick(View view) {
+            downloadedRegionList();
+          }
+        });
       }
     });
   }

diff --git a/...idWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/SimpleMapViewActivity.java b/...idWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/SimpleMapViewActivity.java
@@ -9,6 +9,7 @@
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
+import com.mapbox.mapboxsdk.maps.Style;
 
 /**
  * Show a map in your app using the Mapbox Android SDK.
@@ -35,10 +36,16 @@ protected void onCreate(Bundle savedInstanceState) {
 
   @Override
   public void onMapReady(@NonNull MapboxMap mapboxMap) {
+    mapboxMap.setStyle(Style.MAPBOX_STREETS, new Style.OnStyleLoaded() {
+      @Override
+      public void onStyleLoaded(@NonNull Style style) {
 
-    // Customize map with markers, polylines, etc.
+        // Customize map with markers, polylines, etc.
 
 
+      }
+    });
+
   }
 
   @Override

diff --git a/MapboxAndroidWearDemo/src/main/res/layout/activity_simple_mapview.xml b/MapboxAndroidWearDemo/src/main/res/layout/activity_simple_mapview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<android.support.wear.widget.SwipeDismissFrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -17,4 +17,4 @@
         mapbox:mapbox_cameraTargetLng="-73.99155"
         mapbox:mapbox_cameraZoom="11"/>
 
-</FrameLayout>
+</android.support.wear.widget.SwipeDismissFrameLayout>
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -49,7 +49,8 @@ ext {
 
     wearVersion = [
             googleWearable   : '2.0.4',
-            googlePlayService: '11.0.4'
+            googlePlayService: '11.0.4',
+            wearableUi       : '27.0.0',
     ]
 
     pluginVersion = [
@@ -127,6 +128,7 @@ ext {
 
     wearDependencies = [
             googleWearable       : "com.google.android.wearable:wearable:${wearVersion.googleWearable}",
+            wearableUi           : "com.android.support:wear:${wearVersion.wearableUi}",
             supportGoogleWearable: "com.google.android.support:wearable:${wearVersion.googleWearable}",
             gpsWearable          : "com.google.android.gms:play-services-wearable:${wearVersion.googlePlayService}",
             gpsLocation          : "com.google.android.gms:play-services-location:${wearVersion.googlePlayService}"