Skip to content

Commit 596b127

Browse files
kikosokikoso
authored
feat: removed renderer selection from the samples (#1430)
Since the new renderer is default as of Maps SDK for Android v18.2.0, the renderer selection is unnecessary for these demos.
1 parent e6f8b8a commit 596b127

6 files changed

Lines changed: 6 additions & 136 deletions

File tree

‎ApiDemos/java/app/src/gms/java/com/example/mapdemo/MainActivity.java‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2012 The Android Open Source Project
2+
* Copyright 2023 The Android Open Source Project
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,19 +20,11 @@
2020
import android.content.Intent;
2121
import android.content.res.Resources;
2222
import android.os.Bundle;
23-
import android.util.Log;
2423
import android.view.View;
2524
import android.view.ViewGroup;
26-
import android.widget.AdapterView;
27-
import android.widget.AdapterView.OnItemSelectedListener;
2825
import android.widget.ArrayAdapter;
2926
import android.widget.ListAdapter;
3027
import android.widget.ListView;
31-
import android.widget.Spinner;
32-
import android.widget.Toast;
33-
import com.google.android.gms.maps.MapsInitializer;
34-
import com.google.android.gms.maps.MapsInitializer.Renderer;
35-
import com.google.android.gms.maps.OnMapsSdkInitializedCallback;
3628

3729
import androidx.appcompat.app.AppCompatActivity;
3830

@@ -41,7 +33,7 @@
4133
*
4234
* <p>The main layout lists the demonstrated features, with buttons to launch them.
4335
*/
44-
public final class MainActivity extends AppCompatActivity implements OnMapsSdkInitializedCallback {
36+
public final class MainActivity extends AppCompatActivity {
4537

4638
private static final String TAG = MainActivity.class.getSimpleName();
4739

@@ -92,47 +84,5 @@ protected void onCreate(Bundle savedInstanceState) {
9284
startActivity(new Intent(view.getContext(), demo.activityClass));
9385
});
9486
}
95-
96-
Spinner spinner = (Spinner) findViewById(R.id.map_renderer_spinner);
97-
ArrayAdapter<CharSequence> spinnerAdapter =
98-
ArrayAdapter.createFromResource(
99-
this, R.array.map_renderer_spinner_array, android.R.layout.simple_spinner_item);
100-
spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
101-
spinner.setAdapter(spinnerAdapter);
102-
spinner.setOnItemSelectedListener(
103-
new OnItemSelectedListener() {
104-
@Override
105-
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
106-
String preferredRendererName = ((String) spinner.getSelectedItem());
107-
Renderer preferredRenderer;
108-
109-
if (preferredRendererName.equals(getString(R.string.latest))) {
110-
preferredRenderer = Renderer.LATEST;
111-
} else if (preferredRendererName.equals(getString(R.string.legacy))) {
112-
preferredRenderer = Renderer.LEGACY;
113-
} else if (preferredRendererName.equals(getString(R.string.default_renderer))) {
114-
preferredRenderer = null;
115-
} else {
116-
Log.i(TAG, "Error setting renderer with name " + preferredRendererName);
117-
return;
118-
}
119-
MapsInitializer.initialize(getApplicationContext(), preferredRenderer, MainActivity.this);
120-
121-
// Disable spinner since renderer cannot be changed once map is intitialized.
122-
spinner.setEnabled(false);
123-
}
124-
125-
@Override
126-
public void onNothingSelected(AdapterView<?> parent) {}
127-
});
128-
}
129-
130-
@Override
131-
public void onMapsSdkInitialized(MapsInitializer.Renderer renderer) {
132-
Toast.makeText(
133-
getApplicationContext(),
134-
"All demo activities will use " + renderer.toString() + " renderer.",
135-
Toast.LENGTH_LONG)
136-
.show();
13787
}
13888
}

‎ApiDemos/java/app/src/gms/res/layout/main.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?><!--
2-
Copyright (C) 2012 The Android Open Source Project
2+
Copyright 2023 The Android Open Source Project
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -17,11 +17,6 @@
1717
android:layout_width="match_parent"
1818
android:layout_height="match_parent"
1919
android:orientation="vertical">
20-
<Spinner
21-
android:id="@+id/map_renderer_spinner"
22-
android:layout_width="match_parent"
23-
android:layout_height="wrap_content"
24-
android:spinnerMode="dialog"/>
2520

2621
<ListView
2722
android:id="@+id/list"

‎ApiDemos/java/app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?><!--
2-
Copyright (C) 2012 The Android Open Source Project
2+
Copyright 2023 The Android Open Source Project
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -44,7 +44,6 @@
4444
<string name="custom_info_contents">Custom info contents</string>
4545
<string name="custom_info_window">Custom info window</string>
4646
<string name="default_info_window">Default info window</string>
47-
<string name="default_renderer">Default</string>
4847
<string name="down_arrow">\u2193</string>
4948
<string name="drag_melbourne">Drag Melbourne</string>
5049
<string name="duration">Custom Duration</string>
@@ -73,21 +72,12 @@
7372
<string name="layers_demo_label">Layers</string>
7473
<string name="layers_demo_description">Demonstrates the different map layers.</string>
7574
<string name="left_arrow">\u2190</string>
76-
<string name="legacy">Legacy</string>
7775
<string name="location_source_demo_label">Location Source Demo</string>
7876
<string name="location_source_demo_description">Demonstrates how to use a custom location source.</string>
7977
<string name="map_circle_description">Google Map with circles.</string>
8078
<string name="map_not_ready">Map is not ready yet</string>
8179
<string name="map_in_pager_demo_label">Map In Pager</string>
8280
<string name="map_in_pager_demo_description">Demonstrates how to add a map to a ViewPager.</string>
83-
<string name="map_renderer_alert_dialog_message">Select a Map renderer before opening any demo.</string>
84-
<string-array name="map_renderer_spinner_array">
85-
<item>@string/map_renderer_spinner_label</item>
86-
<item>@string/default_renderer</item>
87-
<item>@string/legacy</item>
88-
<item>@string/latest</item>
89-
</string-array>
90-
<string name="map_renderer_spinner_label">Select Preferred Map Renderer</string>
9181
<string name="marker_demo_label">Markers</string>
9282
<string name="marker_close_info_window_on_retap_demo_label">Marker Close Info Window on Retap</string>
9383
<string name="marker_close_info_window_on_retap_demo_description">Demonstrates how to close the info window when the currently selected marker is retapped.</string>

‎ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MainActivity.kt‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 Google LLC
2+
* Copyright 2023 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,21 +20,16 @@ import android.annotation.SuppressLint
2020
import android.content.Context
2121
import android.content.Intent
2222
import android.os.Bundle
23-
import android.util.Log
2423
import android.view.View
2524
import android.view.ViewGroup
2625
import android.widget.*
27-
import android.widget.AdapterView.OnItemSelectedListener
2826
import androidx.appcompat.app.AppCompatActivity
29-
import com.google.android.gms.maps.MapsInitializer
30-
import com.google.android.gms.maps.MapsInitializer.Renderer;
31-
import com.google.android.gms.maps.OnMapsSdkInitializedCallback;
3227

3328
/**
3429
* The main activity of the API library demo gallery.
3530
* The main layout lists the demonstrated features, with buttons to launch them.
3631
*/
37-
class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener, OnMapsSdkInitializedCallback {
32+
class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
3833

3934
private val TAG = MainActivity::class.java.simpleName
4035

@@ -59,51 +54,6 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener, OnMap
5954
if (BuildConfig.MAPS_API_KEY.isEmpty()) {
6055
Toast.makeText(this, "Add your own API key in local.properties as MAPS_API_KEY=YOUR_API_KEY", Toast.LENGTH_LONG).show()
6156
}
62-
63-
val spinner = findViewById<Spinner>(R.id.map_renderer_spinner)
64-
val spinnerAdapter = ArrayAdapter.createFromResource(
65-
this, R.array.map_renderer_spinner_array, android.R.layout.simple_spinner_item
66-
)
67-
spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
68-
spinner.adapter = spinnerAdapter
69-
spinner.onItemSelectedListener = object : OnItemSelectedListener {
70-
override fun onItemSelected(
71-
parent: AdapterView<*>?,
72-
view: View,
73-
position: Int,
74-
id: Long
75-
) {
76-
val preferredRendererName = spinner.selectedItem as String
77-
val preferredRenderer: Renderer?
78-
preferredRenderer = if (preferredRendererName == getString(R.string.latest)) {
79-
Renderer.LATEST
80-
} else if (preferredRendererName == getString(R.string.legacy)) {
81-
Renderer.LEGACY
82-
} else if (preferredRendererName == getString(R.string.default_renderer)) {
83-
null
84-
} else {
85-
Log.i(
86-
TAG,
87-
"Error setting renderer with name $preferredRendererName"
88-
)
89-
return
90-
}
91-
MapsInitializer.initialize(applicationContext, preferredRenderer, this@MainActivity)
92-
93-
// Disable spinner since renderer cannot be changed once map is intitialized.
94-
spinner.isEnabled = false
95-
}
96-
97-
override fun onNothingSelected(parent: AdapterView<*>?) {}
98-
}
99-
}
100-
101-
override fun onMapsSdkInitialized(renderer: Renderer) {
102-
Toast.makeText(
103-
this,
104-
"All demo activities will use the $renderer renderer.",
105-
Toast.LENGTH_LONG
106-
).show()
10757
}
10858

10959
/**

‎ApiDemos/kotlin/app/src/gms/res/layout/activity_main.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@
2525
android:layout_height="0dp"
2626
android:layout_weight="1" />
2727

28-
<Spinner
29-
android:id="@+id/map_renderer_spinner"
30-
android:layout_width="match_parent"
31-
android:layout_height="wrap_content"
32-
android:spinnerMode="dialog" />
33-
3428
<TextView
3529
android:id="@+id/empty"
3630
android:layout_width="match_parent"

‎ApiDemos/kotlin/app/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,8 @@
1717
<string name="app_name">Maps SDK for Android Demos (Kotlin)</string>
1818
<string name="default_renderer">Default</string>
1919
<string name="demo_title">Google Maps API Demos</string>
20-
<string name="latest">Latest</string>
21-
<string name="legacy">Legacy</string>
22-
<string name="map_renderer_alert_dialog_message">Select a Map renderer before opening any demo.</string>
2320
<string name="no_demos">No demos</string>
2421
<string name="play_services_not_installed">Google Play services is not installed on this device.</string>
25-
<string-array name="map_renderer_spinner_array">
26-
<item>@string/map_renderer_spinner_label</item>
27-
<item>@string/default_renderer</item>
28-
<item>@string/legacy</item>
29-
<item>@string/latest</item>
30-
</string-array>
3122
<string name="map_renderer_spinner_label">Select Preferred Map Renderer</string>
3223

3324
<!-- Tile Overlay -->

0 commit comments

Comments
 (0)