archive-gh-me/android-samples
1
0
Fork 0
mirror of https://github.com/googlemaps/android-samples.git synced 2025-12-08 18:02:20 +00:00
Code Issues Projects Releases Wiki Activity

fix: Fix color names. (#716)

Browse Source 
* fix: Fix color names.

Change-Id: Ibb6442c84ef6482426e806502378bb30b811d397

* Bump WearOS compile and target SDK version.

Change-Id: Iba549da3d6f0906aea047e08b1755ac46fa6c902

* Add exported=true

Change-Id: Ia04fcf1402816ce4f265e8cfba468eafb7a37c45
This commit is contained in:
Chris Arriola 2021-10-05 12:20:27 -05:00 committed by GitHub
parent 089c8d85c7
commit f60e762516
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WearOS/Wearable/build.gradle
View File

@ -21,12 +21,12 @@ plugins {
apply plugin: 'kotlin-android'
android {
compileSdkVersion 30
compileSdkVersion 31
defaultConfig {
applicationId "com.example.wearos"
minSdkVersion 23
targetSdkVersion 30
targetSdkVersion 31
versionCode 1
versionName "1.0"
}

3
WearOS/Wearable/src/main/AndroidManifest.xml
View File

@ -39,7 +39,8 @@
<activity
android:name=".kt.MainActivity"
android:label="@string/app_name" >
android:label="@string/app_name"
android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

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

@ -224,10 +224,10 @@ public class PolyActivity extends AppCompatActivity
// [START maps_poly_activity_style_polygon]
private static final int COLOR_WHITE_ARGB = 0xffffffff;
private static final int COLOR_GREEN_ARGB = 0xff388E3C;
private static final int COLOR_PURPLE_ARGB = 0xff81C784;
private static final int COLOR_ORANGE_ARGB = 0xffF57F17;
private static final int COLOR_BLUE_ARGB = 0xffF9A825;
private static final int COLOR_DARK_GREEN_ARGB = 0xff388E3C;
private static final int COLOR_LIGHT_GREEN_ARGB = 0xff81C784;
private static final int COLOR_DARK_ORANGE_ARGB = 0xffF57F17;
private static final int COLOR_LIGHT_ORANGE_ARGB = 0xffF9A825;
private static final int POLYGON_STROKE_WIDTH_PX = 8;
private static final int PATTERN_DASH_LENGTH_PX = 20;
@ -260,14 +260,14 @@ public class PolyActivity extends AppCompatActivity
case "alpha":
// Apply a stroke pattern to render a dashed line, and define colors.
pattern = PATTERN_POLYGON_ALPHA;
strokeColor = COLOR_GREEN_ARGB;
fillColor = COLOR_PURPLE_ARGB;
strokeColor = COLOR_DARK_GREEN_ARGB;
fillColor = COLOR_LIGHT_GREEN_ARGB;
break;
case "beta":
// Apply a stroke pattern to render a line of dots and dashes, and define colors.
pattern = PATTERN_POLYGON_BETA;
strokeColor = COLOR_ORANGE_ARGB;
fillColor = COLOR_BLUE_ARGB;
strokeColor = COLOR_DARK_ORANGE_ARGB;
fillColor = COLOR_LIGHT_ORANGE_ARGB;
break;
}

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

@ -205,10 +205,10 @@ class PolyActivity : AppCompatActivity(), OnMapReadyCallback, OnPolylineClickLis
// [START maps_poly_activity_style_polygon]
private val COLOR_WHITE_ARGB = -0x1
private val COLOR_GREEN_ARGB = -0xc771c4
private val COLOR_PURPLE_ARGB = -0x7e387c
private val COLOR_ORANGE_ARGB = -0xa80e9
private val COLOR_BLUE_ARGB = -0x657db
private val COLOR_DARK_GREEN_ARGB = -0xc771c4
private val COLOR_LIGHT_GREEN_ARGB = -0x7e387c
private val COLOR_DARK_ORANGE_ARGB = -0xa80e9
private val COLOR_LIGHT_ORANGE_ARGB = -0x657db
private val POLYGON_STROKE_WIDTH_PX = 8
private val PATTERN_DASH_LENGTH_PX = 20
@ -234,14 +234,14 @@ class PolyActivity : AppCompatActivity(), OnMapReadyCallback, OnPolylineClickLis
"alpha" -> {
// Apply a stroke pattern to render a dashed line, and define colors.
pattern = PATTERN_POLYGON_ALPHA
strokeColor = COLOR_GREEN_ARGB
fillColor = COLOR_PURPLE_ARGB
strokeColor = COLOR_DARK_GREEN_ARGB
fillColor = COLOR_LIGHT_GREEN_ARGB
}
"beta" -> {
// Apply a stroke pattern to render a line of dots and dashes, and define colors.
pattern = PATTERN_POLYGON_BETA
strokeColor = COLOR_ORANGE_ARGB
fillColor = COLOR_BLUE_ARGB
strokeColor = COLOR_DARK_ORANGE_ARGB
fillColor = COLOR_LIGHT_ORANGE_ARGB
}
}
polygon.strokePattern = pattern