Skip to content

Commit 345c2f6

Browse files
author
Langston Smith
authored
Adding Kotlin lint check plugin and cleanup tweaks (#1012)
1 parent 2ff5655 commit 345c2f6

File tree

13 files changed

+29
-19
lines changed

13 files changed

+29
-19
lines changed

.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[*.{kt,kts}]
2+
indent_size=2

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ MBGL_ANDROID_PLUGINS += places;plugin-places
66
MBGL_ANDROID_PLUGINS += localization;plugin-localization
77

88
checkstyle:
9-
./gradlew checkstyle
9+
./gradlew checkstyle && ./gradlew ktlintCheck
10+
11+
kotlin-lint:
12+
./gradlew ktlintCheck
1013

1114
test:
1215
./gradlew test --info

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-kapt'
4+
apply plugin: "org.jlleitschuh.gradle.ktlint"
45

56
android {
67
compileSdkVersion androidVersions.compileSdkVersion

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/Utils.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import java.io.Reader
1212
import java.nio.charset.Charset
1313
import java.util.*
1414

15-
1615
/**
1716
* Useful utilities used throughout the testapp.
1817
*/

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/building/BuildingActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class BuildingActivity : AppCompatActivity(), OnMapReadyCallback {
4343

4444
override fun onMapReady(mapboxMap: MapboxMap) {
4545
this.mapboxMap = mapboxMap
46-
mapboxMap.setStyle(Style.MAPBOX_STREETS){
46+
mapboxMap.setStyle(Style.MAPBOX_STREETS) {
4747
buildingPlugin = BuildingPlugin(mapView, mapboxMap, it)
4848
buildingPlugin?.setMinZoomLevel(15f)
4949
fabBuilding.visibility = View.VISIBLE

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class MapboxKtxActivity : AppCompatActivity(), OnMapReadyCallback, MapboxMap.OnM
2626
this.mapboxMap = mapboxMap
2727
mapboxMap.setStyle(Style.MAPBOX_STREETS) {
2828
mapboxMap.addOnMapClickListener(this)
29-
Toast.makeText(this,"Click on the map", Toast.LENGTH_SHORT).show()
29+
Toast.makeText(this, "Click on the map", Toast.LENGTH_SHORT).show()
3030
}
3131
}
3232

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,5 +172,4 @@ class LocalizationActivity : AppCompatActivity(), OnMapReadyCallback {
172172
return LOCALES[index]
173173
}
174174
}
175-
}
176-
175+
}

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ class OfflineDownloadActivity : AppCompatActivity() {
8585
}
8686

8787
override fun onStartTrackingTouch(seekBar: SeekBar) {
88-
88+
// Empty on purpose
8989
}
9090

9191
override fun onStopTrackingTouch(seekBar: SeekBar) {
92-
92+
// Empty on purpose
9393
}
9494
})
9595

@@ -99,11 +99,11 @@ class OfflineDownloadActivity : AppCompatActivity() {
9999
}
100100

101101
override fun onStartTrackingTouch(seekBar: SeekBar) {
102-
102+
// Empty on purpose
103103
}
104104

105105
override fun onStopTrackingTouch(seekBar: SeekBar) {
106-
106+
// Empty on purpose
107107
}
108108
})
109109
}
@@ -152,8 +152,12 @@ class OfflineDownloadActivity : AppCompatActivity() {
152152
)
153153
}
154154

155-
private fun validCoordinates(latitudeNorth: Double, longitudeEast: Double, latitudeSouth: Double,
156-
longitudeWest: Double): Boolean {
155+
private fun validCoordinates(
156+
latitudeNorth: Double,
157+
longitudeEast: Double,
158+
latitudeSouth: Double,
159+
longitudeWest: Double
160+
): Boolean {
157161
if (latitudeNorth < -90 || latitudeNorth > 90) {
158162
return false
159163
} else if (longitudeEast < -180 || longitudeEast > 180) {

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ class OfflineUiComponentsActivity : AppCompatActivity() {
2323
override fun onCreate(savedInstanceState: Bundle?) {
2424
super.onCreate(savedInstanceState)
2525
setContentView(R.layout.activity_offline_ui_components)
26-
fabRegionSelector.setOnClickListener{onOfflineRegionSelectorButtonClicked()}
26+
fabRegionSelector.setOnClickListener {
27+
onOfflineRegionSelectorButtonClicked()
28+
}
2729
}
2830

2931
fun onOfflineRegionSelectorButtonClicked() {

app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/PickerLauncherActivity.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@ import android.app.Activity
44
import android.content.Intent
55
import android.os.Bundle
66
import android.support.v7.app.AppCompatActivity
7-
import android.widget.Switch
87
import android.widget.Toast
9-
108
import com.mapbox.mapboxsdk.Mapbox
119
import com.mapbox.mapboxsdk.camera.CameraPosition
1210
import com.mapbox.mapboxsdk.geometry.LatLng
1311
import com.mapbox.mapboxsdk.plugins.places.picker.PlacePicker
1412
import com.mapbox.mapboxsdk.plugins.places.picker.model.PlacePickerOptions
1513
import com.mapbox.mapboxsdk.plugins.testapp.R
16-
1714
import kotlinx.android.synthetic.main.activity_picker_launcher.*
1815

1916
class PickerLauncherActivity : AppCompatActivity() {

0 commit comments

Comments
 (0)