Skip to content

Commit 075d97c

Browse files
shubham7109shubham7109
authored
Samples project: Code cleanup (#341)
2 parents 2e680b3 + f36196b commit 075d97c

File tree

40 files changed

+60
-299
lines changed

40 files changed

+60
-299
lines changed

Diff for: ‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ build/
2626
Icon?
2727
ehthumbs.db
2828
Thumbs.db
29-
*.salive

Diff for: ‎app/src/main/java/com/esri/arcgismaps/kotlin/sampleviewer/MainActivity.kt

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import androidx.activity.enableEdgeToEdge
2323
import androidx.compose.material3.MaterialTheme
2424
import androidx.compose.material3.Surface
2525
import androidx.compose.runtime.Composable
26-
import androidx.compose.runtime.LaunchedEffect
2726
import androidx.compose.runtime.getValue
2827
import androidx.compose.runtime.mutableStateOf
2928
import androidx.compose.runtime.remember

Diff for: ‎app/src/main/java/com/esri/arcgismaps/kotlin/sampleviewer/ui/screens/about/AboutScreen.kt

+8-7
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import com.esri.arcgismaps.kotlin.sampleviewer.BuildConfig
6262
import com.esri.arcgismaps.kotlin.sampleviewer.R
6363
import com.esri.arcgismaps.kotlin.sampleviewer.ui.components.SampleViewerTopAppBar
6464
import com.esri.arcgismaps.sample.sampleslib.theme.SampleAppTheme
65+
import androidx.core.net.toUri
6566

6667
/**
6768
* Showcase information about the application.
@@ -213,7 +214,7 @@ private fun PoweredBySection() {
213214
.clickable {
214215
val intent = Intent(
215216
Intent.ACTION_VIEW,
216-
Uri.parse("https://github.com/Esri/arcgis-runtime-toolkit-android")
217+
"https://github.com/Esri/arcgis-runtime-toolkit-android".toUri()
217218
)
218219
context.startActivity(intent)
219220
},
@@ -242,7 +243,7 @@ private fun PoweredBySection() {
242243
.clickable {
243244
val intent = Intent(
244245
Intent.ACTION_VIEW,
245-
Uri.parse("https://developers.arcgis.com/kotlin/")
246+
"https://developers.arcgis.com/kotlin/".toUri()
246247
)
247248
context.startActivity(intent)
248249
},
@@ -308,7 +309,7 @@ private fun EsriCommunitySection() {
308309
.clickable {
309310
val intent = Intent(
310311
Intent.ACTION_VIEW,
311-
Uri.parse("https://community.esri.com/t5/kotlin-maps-sdk-questions/bd-p/kotlin-maps-sdk-questions")
312+
"https://community.esri.com/t5/kotlin-maps-sdk-questions/bd-p/kotlin-maps-sdk-questions".toUri()
312313
)
313314
context.startActivity(intent)
314315
}
@@ -376,7 +377,7 @@ fun AcknowledgementsDialog(onDismissRequest: () -> Unit) {
376377
OutlinedButton(onClick = {
377378
val intent = Intent(
378379
Intent.ACTION_VIEW,
379-
Uri.parse("https://github.com/showdownjs/showdown/blob/master/LICENSE")
380+
"https://github.com/showdownjs/showdown/blob/master/LICENSE".toUri()
380381
)
381382
context.startActivity(intent)
382383
}) {
@@ -385,7 +386,7 @@ fun AcknowledgementsDialog(onDismissRequest: () -> Unit) {
385386
OutlinedButton(onClick = {
386387
val intent = Intent(
387388
Intent.ACTION_VIEW,
388-
Uri.parse("https://github.com/highlightjs/highlight.js/blob/main/LICENSE")
389+
"https://github.com/highlightjs/highlight.js/blob/main/LICENSE".toUri()
389390
)
390391
context.startActivity(intent)
391392
}) {
@@ -406,7 +407,7 @@ private fun GithubSection() {
406407
.clickable {
407408
val intent = Intent(
408409
Intent.ACTION_VIEW,
409-
Uri.parse("https://github.com/Esri/arcgis-maps-sdk-kotlin-samples")
410+
"https://github.com/Esri/arcgis-maps-sdk-kotlin-samples".toUri()
410411
)
411412
context.startActivity(intent)
412413
}
@@ -460,7 +461,7 @@ private fun ApiDetailsSection() {
460461
.clickable {
461462
val intent = Intent(
462463
Intent.ACTION_VIEW,
463-
Uri.parse("https://developers.arcgis.com/kotlin/api-reference/")
464+
"https://developers.arcgis.com/kotlin/api-reference/".toUri()
464465
)
465466
context.startActivity(intent)
466467
}

Diff for: ‎app/src/main/java/com/esri/arcgismaps/kotlin/sampleviewer/ui/screens/sampleList/SampleListScreen.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.esri.arcgismaps.kotlin.sampleviewer.ui.screens.sampleList
1818

1919
import android.content.Intent
20-
import android.net.Uri
2120
import androidx.compose.animation.animateContentSize
2221
import androidx.compose.foundation.background
2322
import androidx.compose.foundation.layout.Arrangement
@@ -46,6 +45,7 @@ import androidx.compose.ui.platform.LocalContext
4645
import androidx.compose.ui.res.stringResource
4746
import androidx.compose.ui.text.style.TextAlign
4847
import androidx.compose.ui.unit.dp
48+
import androidx.core.net.toUri
4949
import androidx.lifecycle.viewmodel.compose.viewModel
5050
import com.esri.arcgismaps.kotlin.sampleviewer.R
5151
import com.esri.arcgismaps.kotlin.sampleviewer.model.DefaultSampleInfoRepository
@@ -132,7 +132,7 @@ fun ListOfSamplesScreen(
132132
sample.metadata.title
133133
.replace(" ", "-")
134134
.lowercase(Locale.getDefault())
135-
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
135+
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
136136
context.startActivity(intent)
137137
}
138138
),

Diff for: ‎gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22

33
# ArcGIS Maps SDK for Kotlin version
4-
arcgisMapsKotlinVersion = "200.7.0-4541"
4+
arcgisMapsKotlinVersion = "200.7.0-4549"
55

66
### Android versions
77
androidGradlePlugin = "8.7.3"

Diff for: ‎samples-lib/src/main/java/com/esri/arcgismaps/sample/sampleslib/DownloaderActivity.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ abstract class DownloaderActivity : AppCompatActivity() {
126126
// dismiss provision dialog question dialog
127127
dialog.dismiss()
128128
// set to should download
129-
downloadRequiredContinuation.resume(true, null)
129+
downloadRequiredContinuation.resume(true) { _, _, _ -> }
130130
}
131131
// if user taps "Continue" with existing folder
132132
provisionQuestionDialog.setPositiveButton("Continue") { dialog, _ ->
133133
// dismiss the provision question dialog
134134
dialog.dismiss()
135135
// set to should not download
136-
downloadRequiredContinuation.resume(false, null)
136+
downloadRequiredContinuation.resume(false) { _, _, _ -> }
137137
}
138138
}
139139
// if folder does not exist, ask for download permission
@@ -145,7 +145,7 @@ abstract class DownloaderActivity : AppCompatActivity() {
145145
// dismiss provision dialog
146146
dialog.dismiss()
147147
// set to should download
148-
downloadRequiredContinuation.resume(true, null)
148+
downloadRequiredContinuation.resume(true) { _, _, _ -> }
149149
}
150150
provisionQuestionDialog.setNegativeButton("Exit") { dialog, _ ->
151151
dialog.dismiss()

Diff for: ‎samples-lib/src/main/java/com/esri/arcgismaps/sample/sampleslib/components/MessageDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class MessageDialogViewModel : ViewModel() {
116116
fun showMessageDialog(exception: ArcGISException) {
117117
showMessageDialog(
118118
title = exception.message,
119-
description = exception.additionalMessage.toString() + "\n" + exception.cause
119+
description = exception.additionalInformation.toString() + "\n" + exception.cause.toString()
120120
)
121121
}
122122

Diff for: ‎samples-lib/src/main/res/mipmap-anydpi-v26/arcgis_sdk.xml renamed to ‎samples-lib/src/main/res/mipmap-anydpi/arcgis_sdk.xml

File renamed without changes.

Diff for: ‎samples-lib/src/main/res/mipmap-anydpi-v26/arcgis_sdk_round.xml renamed to ‎samples-lib/src/main/res/mipmap-anydpi/arcgis_sdk_round.xml

File renamed without changes.

Diff for: ‎samples/add-raster-from-file/src/main/java/com/esri/arcgismaps/sample/addrasterfromfile/components/AddRasterFromFileViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ class AddRasterFromFileViewModel(application: Application) : AndroidViewModel(ap
3939
val mapViewProxy = MapViewProxy()
4040

4141
// create a raster
42-
val raster = Raster.createWithPath(provisionPath +
42+
private val raster = Raster.createWithPath(provisionPath +
4343
File.separator + "raster-file" + File.separator + "Shasta.tif")
4444

4545
// create a raster layer
46-
val rasterLayer = RasterLayer(raster)
46+
private val rasterLayer = RasterLayer(raster)
4747

4848
val arcGISMap = ArcGISMap(BasemapStyle.ArcGISImagery).apply {
4949
operationalLayers.add(rasterLayer)

Diff for: ‎samples/apply-dictionary-renderer-to-feature-layer/src/main/AndroidManifest.xml

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
android:name=".DownloadActivity"
88
android:exported="true"
99
android:label="@string/apply_dictionary_renderer_to_feature_layer_app_name">
10-
11-
12-
<meta-data
13-
android:name="android.app.lib_name"
14-
android:value="" />
1510
</activity>
1611
<activity
1712
android:exported="true"

Diff for: ‎samples/augment-reality-to-show-tabletop-scene/src/main/res/values/strings.xml

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<resources>
22
<string name="augment_reality_to_show_tabletop_scene_app_name">Augment reality to show tabletop scene</string>
3-
<string name="arcore_not_installed_screen_message">Google Play Services for AR must be installed to run this app.</string>
4-
<string name="initialization_status">Initialization status: %1$s</string>
53
<string name="detect_planes_overlay">Move your phone around to detect planes…</string>
6-
<string name="lat_lon">Lat: %1$s, Lon: %2$s</string>
74
<string name="tap_scene_overlay">Tap on a plane to place the scene</string>
85
<string name="initializing_overlay">Setting up AR…</string>
96
<string name="failed_to_initialize_overlay">Failed to initialize: %1$s</string>

Diff for: ‎samples/clip-geometry/src/main/java/com/esri/arcgismaps/sample/clipgeometry/components/ClipGeometryViewModel.kt

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import com.arcgismaps.mapping.symbology.SimpleLineSymbol
3333
import com.arcgismaps.mapping.symbology.SimpleLineSymbolStyle
3434
import com.arcgismaps.mapping.view.Graphic
3535
import com.arcgismaps.mapping.view.GraphicsOverlay
36-
import com.arcgismaps.toolkit.geoviewcompose.MapViewProxy
3736
import com.esri.arcgismaps.sample.clipgeometry.R
3837
import com.esri.arcgismaps.sample.sampleslib.components.MessageDialogViewModel
3938
import kotlinx.coroutines.launch

Diff for: ‎samples/create-symbol-styles-from-web-styles/src/main/java/com/esri/arcgismaps/sample/createsymbolstylesfromwebstyles/components/CreateSymbolStylesFromWebStylesViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CreateSymbolStylesFromWebStylesViewModel(application: Application) : Andro
4242
}
4343

4444
// Create a feature layer from a service
45-
val featureLayer =
45+
private val featureLayer =
4646
FeatureLayer.createWithFeatureTable(ServiceFeatureTable("http://services.arcgis.com/V6ZHFr6zdgNZuVG0/arcgis/rest/services/LA_County_Points_of_Interest/FeatureServer/0"))
4747
.apply {
4848
// Set the unique value renderer on the feature layer

Diff for: ‎samples/display-device-location-with-nmea-data-sources/src/main/AndroidManifest.xml

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
android:name=".DownloadActivity"
88
android:exported="true"
99
android:label="@string/display_device_location_with_nmea_data_sources_app_name">
10-
11-
12-
<meta-data
13-
android:name="android.app.lib_name"
14-
android:value="" />
1510
</activity>
1611
<activity
1712
android:name=".MainActivity"

Diff for: ‎samples/display-map-from-mobile-map-package/src/main/res/layout/display_map_from_mobile_map_package_activity_main.xml

-15
This file was deleted.

Diff for: ‎samples/display-web-scene-from-portal-item/src/main/java/com/esri/arcgismaps/sample/displaywebscenefromportalitem/components/DisplayWebSceneFromPortalItemViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import kotlinx.coroutines.launch
2828
class DisplayWebSceneFromPortalItemViewModel(application: Application) : AndroidViewModel(application) {
2929

3030
// Create a portal
31-
val portal = Portal("https://www.arcgis.com/")
31+
private val portal = Portal("https://www.arcgis.com/")
3232

3333
// Create a portal item
34-
val portalItem = PortalItem(portal, "31874da8a16d45bfbc1273422f772270")
34+
private val portalItem = PortalItem(portal, "31874da8a16d45bfbc1273422f772270")
3535

3636
// Create a scene from the portal item
3737
val arcGISScene = ArcGISScene(portalItem)

Diff for: ‎samples/download-preplanned-map-area/src/main/java/com/esri/arcgismaps/sample/downloadpreplannedmaparea/components/DownloadPreplannedMapAreaViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ class DownloadPreplannedMapAreaViewModel(application: Application) : AndroidView
4848
}
4949

5050
// Create a portal to ArcGIS Online
51-
val portal = Portal("https://www.arcgis.com")
51+
private val portal = Portal("https://www.arcgis.com")
5252

5353
// create a portal item using the portal and the item id of a map service
54-
val portalItem = PortalItem(portal, "acc027394bc84c2fb04d1ed317aac674")
54+
private val portalItem = PortalItem(portal, "acc027394bc84c2fb04d1ed317aac674")
5555

5656
private val offlineMapTask = OfflineMapTask(portalItem)
5757

Diff for: ‎samples/edit-feature-attachments/src/main/java/com/esri/arcgismaps/sample/editfeatureattachments/MainActivity.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import com.google.android.material.snackbar.Snackbar
5252
import kotlinx.coroutines.launch
5353
import java.io.File
5454
import java.io.FileOutputStream
55+
import androidx.core.graphics.drawable.toDrawable
5556

5657
class MainActivity : AppCompatActivity() {
5758

@@ -205,10 +206,7 @@ class MainActivity : AppCompatActivity() {
205206
// fetch the attachment data
206207
attachment.fetchData().onSuccess {
207208
// create a drawable from InputStream, then create the Bitmap
208-
val bitmapDrawable = BitmapDrawable(
209-
resources,
210-
BitmapFactory.decodeByteArray(it, 0, it.size)
211-
)
209+
val bitmapDrawable = BitmapFactory.decodeByteArray(it, 0, it.size).toDrawable(resources)
212210
// create a file output stream using the attachment file
213211
FileOutputStream(file).use { imageOutputStream ->
214212
// compress the bitmap to PNG format

Diff for: ‎samples/find-nearest-vertex/src/main/java/com/esri/arcgismaps/sample/findnearestvertex/components/FindNearestVertexViewModel.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ class FindNearestVertexViewModel(application: Application) : AndroidViewModel(ap
5252
private val statePlaneCaliforniaZone5SpatialReference = SpatialReference(2229)
5353

5454
// create a portal
55-
val portal = Portal("https://arcgisruntime.maps.arcgis.com")
55+
private val portal = Portal("https://arcgisruntime.maps.arcgis.com")
5656

5757
// get the USA States Generalized Boundaries layer from the portal using its ID
58-
val portalItem =
58+
private val portalItem =
5959
PortalItem(
6060
portal = portal,
6161
itemId = "8c2d6d7df8fa4142b0a1211c8dd66903"
@@ -102,7 +102,7 @@ class FindNearestVertexViewModel(application: Application) : AndroidViewModel(ap
102102
)
103103

104104
// create a polygon geometry
105-
val polygon = PolygonBuilder(statePlaneCaliforniaZone5SpatialReference) {
105+
private val polygon = PolygonBuilder(statePlaneCaliforniaZone5SpatialReference) {
106106
addPoint(Point(x = 6627416.41469281, y = 1804532.53233782))
107107
addPoint(Point(x = 6669147.89779046, y = 2479145.16609522))
108108
addPoint(Point(x = 7265673.02678292, y = 2484254.50442408))

Diff for: ‎samples/find-route-in-transport-network/src/main/AndroidManifest.xml

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
android:name=".DownloadActivity"
88
android:exported="true"
99
android:label="@string/find_route_in_transport_network_app_name">
10-
11-
12-
<meta-data
13-
android:name="android.app.lib_name"
14-
android:value="" />
1510
</activity>
1611
<activity
1712
android:name=".MainActivity"

Diff for: ‎samples/find-route/src/main/res/values/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
<string name="find_route_app_name">Find route</string>
33
<string name="directions">Directions</string>
44
<string name="collapse_directions">Collapse directions</string>
5-
<string name="display_directions_button">Display Directions button</string>
65
</resources>

Diff for: ‎samples/generate-geodatabase-replica-from-feature-service/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources>
22
<string name="generate_geodatabase_replica_from_feature_service_app_name">Generate geodatabase replica from feature service</string>
33
<string name="generate_button_text">Generate</string>
4-
<string name="dialog_title">Generating geodatabase replica...</string>
4+
<string name="dialog_title">Generating geodatabase replica…</string>
55
<string name="reset_map">Reset map</string>
66
</resources>

Diff for: ‎samples/generate-offline-map/src/main/res/layout/generate_offline_map_activity_main.xml

-57
This file was deleted.

0 commit comments

Comments
 (0)