Skip to content

Commit f60e762

Browse files
authored
fix: Fix color names. (#716)
* fix: Fix color names. Change-Id: Ibb6442c84ef6482426e806502378bb30b811d397 * Bump WearOS compile and target SDK version. Change-Id: Iba549da3d6f0906aea047e08b1755ac46fa6c902 * Add exported=true Change-Id: Ia04fcf1402816ce4f265e8cfba468eafb7a37c45
1 parent 089c8d8 commit f60e762

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

WearOS/Wearable/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ plugins {
2121
apply plugin: 'kotlin-android'
2222

2323
android {
24-
compileSdkVersion 30
24+
compileSdkVersion 31
2525

2626
defaultConfig {
2727
applicationId "com.example.wearos"
2828
minSdkVersion 23
29-
targetSdkVersion 30
29+
targetSdkVersion 31
3030
versionCode 1
3131
versionName "1.0"
3232
}

WearOS/Wearable/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939

4040
<activity
4141
android:name=".kt.MainActivity"
42-
android:label="@string/app_name" >
42+
android:label="@string/app_name"
43+
android:exported="true" >
4344

4445
<intent-filter>
4546
<action android:name="android.intent.action.MAIN" />

tutorials/java/Polygons/app/src/main/java/com/example/polygons/PolyActivity.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@ public void onPolygonClick(Polygon polygon) {
224224

225225
// [START maps_poly_activity_style_polygon]
226226
private static final int COLOR_WHITE_ARGB = 0xffffffff;
227-
private static final int COLOR_GREEN_ARGB = 0xff388E3C;
228-
private static final int COLOR_PURPLE_ARGB = 0xff81C784;
229-
private static final int COLOR_ORANGE_ARGB = 0xffF57F17;
230-
private static final int COLOR_BLUE_ARGB = 0xffF9A825;
227+
private static final int COLOR_DARK_GREEN_ARGB = 0xff388E3C;
228+
private static final int COLOR_LIGHT_GREEN_ARGB = 0xff81C784;
229+
private static final int COLOR_DARK_ORANGE_ARGB = 0xffF57F17;
230+
private static final int COLOR_LIGHT_ORANGE_ARGB = 0xffF9A825;
231231

232232
private static final int POLYGON_STROKE_WIDTH_PX = 8;
233233
private static final int PATTERN_DASH_LENGTH_PX = 20;
@@ -260,14 +260,14 @@ private void stylePolygon(Polygon polygon) {
260260
case "alpha":
261261
// Apply a stroke pattern to render a dashed line, and define colors.
262262
pattern = PATTERN_POLYGON_ALPHA;
263-
strokeColor = COLOR_GREEN_ARGB;
264-
fillColor = COLOR_PURPLE_ARGB;
263+
strokeColor = COLOR_DARK_GREEN_ARGB;
264+
fillColor = COLOR_LIGHT_GREEN_ARGB;
265265
break;
266266
case "beta":
267267
// Apply a stroke pattern to render a line of dots and dashes, and define colors.
268268
pattern = PATTERN_POLYGON_BETA;
269-
strokeColor = COLOR_ORANGE_ARGB;
270-
fillColor = COLOR_BLUE_ARGB;
269+
strokeColor = COLOR_DARK_ORANGE_ARGB;
270+
fillColor = COLOR_LIGHT_ORANGE_ARGB;
271271
break;
272272
}
273273

tutorials/kotlin/Polygons/app/src/main/java/com/example/polygons/PolyActivity.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,10 @@ class PolyActivity : AppCompatActivity(), OnMapReadyCallback, OnPolylineClickLis
205205

206206
// [START maps_poly_activity_style_polygon]
207207
private val COLOR_WHITE_ARGB = -0x1
208-
private val COLOR_GREEN_ARGB = -0xc771c4
209-
private val COLOR_PURPLE_ARGB = -0x7e387c
210-
private val COLOR_ORANGE_ARGB = -0xa80e9
211-
private val COLOR_BLUE_ARGB = -0x657db
208+
private val COLOR_DARK_GREEN_ARGB = -0xc771c4
209+
private val COLOR_LIGHT_GREEN_ARGB = -0x7e387c
210+
private val COLOR_DARK_ORANGE_ARGB = -0xa80e9
211+
private val COLOR_LIGHT_ORANGE_ARGB = -0x657db
212212
private val POLYGON_STROKE_WIDTH_PX = 8
213213
private val PATTERN_DASH_LENGTH_PX = 20
214214

@@ -234,14 +234,14 @@ class PolyActivity : AppCompatActivity(), OnMapReadyCallback, OnPolylineClickLis
234234
"alpha" -> {
235235
// Apply a stroke pattern to render a dashed line, and define colors.
236236
pattern = PATTERN_POLYGON_ALPHA
237-
strokeColor = COLOR_GREEN_ARGB
238-
fillColor = COLOR_PURPLE_ARGB
237+
strokeColor = COLOR_DARK_GREEN_ARGB
238+
fillColor = COLOR_LIGHT_GREEN_ARGB
239239
}
240240
"beta" -> {
241241
// Apply a stroke pattern to render a line of dots and dashes, and define colors.
242242
pattern = PATTERN_POLYGON_BETA
243-
strokeColor = COLOR_ORANGE_ARGB
244-
fillColor = COLOR_BLUE_ARGB
243+
strokeColor = COLOR_DARK_ORANGE_ARGB
244+
fillColor = COLOR_LIGHT_ORANGE_ARGB
245245
}
246246
}
247247
polygon.strokePattern = pattern

0 commit comments

Comments
 (0)