Skip to content

Commit cb00760

Browse files
savschnicolas-raoul
savsch
and
nicolas-raoul
authored
Issue #5996 - Fix Android Studio warnings in LocationPickerActivity.kt (#6026)
* Replace deprecated zoomLevel with zoomLevelDouble * Replace deprecated Html.fromHtml call * LocationPickerActivity: Replace deprecated methods with androidx * LocationPickerActivity: Reformatted overlong lines * Renamed package LocationPicker to locationpicker --------- Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
1 parent 8a55b5e commit cb00760

File tree

14 files changed

+78
-39
lines changed

14 files changed

+78
-39
lines changed

‎app/src/androidTest/java/fr/free/nrw/commons/UploadCancelledTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import androidx.test.platform.app.InstrumentationRegistry
1818
import androidx.test.rule.ActivityTestRule
1919
import androidx.test.rule.GrantPermissionRule
2020
import androidx.test.uiautomator.UiDevice
21-
import fr.free.nrw.commons.LocationPicker.LocationPickerActivity
21+
import fr.free.nrw.commons.locationpicker.LocationPickerActivity
2222
import fr.free.nrw.commons.UITestHelper.Companion.childAtPosition
2323
import fr.free.nrw.commons.auth.LoginActivity
2424
import org.hamcrest.CoreMatchers

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
android:name=".review.ReviewActivity"
172172
android:label="@string/title_activity_review" />
173173
<activity
174-
android:name=".LocationPicker.LocationPickerActivity"
174+
android:name=".locationpicker.LocationPickerActivity"
175175
android:label="Location Picker" />
176176

177177
<service

‎app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package fr.free.nrw.commons.di
33
import dagger.Module
44
import dagger.android.ContributesAndroidInjector
55
import fr.free.nrw.commons.AboutActivity
6-
import fr.free.nrw.commons.LocationPicker.LocationPickerActivity
6+
import fr.free.nrw.commons.locationpicker.LocationPickerActivity
77
import fr.free.nrw.commons.WelcomeActivity
88
import fr.free.nrw.commons.auth.LoginActivity
99
import fr.free.nrw.commons.auth.SignupActivity

‎app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPicker.kt‎ renamed to ‎app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPicker.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fr.free.nrw.commons.LocationPicker
1+
package fr.free.nrw.commons.locationpicker
22

33
import android.app.Activity
44
import android.content.Intent
@@ -32,7 +32,7 @@ object LocationPicker {
3232
/**
3333
* Gets and puts location in intent
3434
* @param position CameraPosition
35-
* @return LocationPicker.IntentBuilder
35+
* @return locationpicker.IntentBuilder
3636
*/
3737
fun defaultLocation(position: CameraPosition): IntentBuilder {
3838
intent.putExtra(LocationPickerConstants.MAP_CAMERA_POSITION, position)
@@ -42,7 +42,7 @@ object LocationPicker {
4242
/**
4343
* Gets and puts activity name in intent
4444
* @param activity activity key
45-
* @return LocationPicker.IntentBuilder
45+
* @return locationpicker.IntentBuilder
4646
*/
4747
fun activityKey(activity: String): IntentBuilder {
4848
intent.putExtra(LocationPickerConstants.ACTIVITY_KEY, activity)
@@ -52,7 +52,7 @@ object LocationPicker {
5252
/**
5353
* Gets and puts media in intent
5454
* @param media Media
55-
* @return LocationPicker.IntentBuilder
55+
* @return locationpicker.IntentBuilder
5656
*/
5757
fun media(media: Media): IntentBuilder {
5858
intent.putExtra(LocationPickerConstants.MEDIA, media)

‎app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.kt‎ renamed to ‎app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt‎

Lines changed: 61 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fr.free.nrw.commons.LocationPicker
1+
package fr.free.nrw.commons.locationpicker
22

33
import android.Manifest.permission
44
import android.annotation.SuppressLint
@@ -8,8 +8,7 @@ import android.graphics.Color
88
import android.graphics.Paint
99
import android.location.LocationManager
1010
import android.os.Bundle
11-
import android.preference.PreferenceManager
12-
import android.text.Html
11+
import androidx.preference.PreferenceManager
1312
import android.text.method.LinkMovementMethod
1413
import android.view.MotionEvent
1514
import android.view.View
@@ -23,6 +22,9 @@ import androidx.appcompat.widget.AppCompatTextView
2322
import androidx.constraintlayout.widget.ConstraintLayout
2423
import androidx.core.app.ActivityCompat
2524
import androidx.core.content.ContextCompat
25+
import androidx.core.content.IntentCompat
26+
import androidx.core.os.BundleCompat
27+
import androidx.core.text.HtmlCompat
2628
import com.google.android.material.floatingactionbutton.FloatingActionButton
2729
import fr.free.nrw.commons.CameraPosition
2830
import fr.free.nrw.commons.CommonsApplication
@@ -181,13 +183,25 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
181183
setContentView(R.layout.activity_location_picker)
182184

183185
if (savedInstanceState == null) {
184-
cameraPosition = intent.getParcelableExtra(LocationPickerConstants.MAP_CAMERA_POSITION)
186+
cameraPosition = IntentCompat.getParcelableExtra(
187+
intent,
188+
LocationPickerConstants.MAP_CAMERA_POSITION,
189+
CameraPosition::class.java
190+
)
185191
activity = intent.getStringExtra(LocationPickerConstants.ACTIVITY_KEY)
186-
media = intent.getParcelableExtra(LocationPickerConstants.MEDIA)
192+
media = IntentCompat.getParcelableExtra(
193+
intent,
194+
LocationPickerConstants.MEDIA,
195+
Media::class.java
196+
)
187197
} else {
188-
cameraPosition = savedInstanceState.getParcelable(CAMERA_POS)
198+
cameraPosition = BundleCompat.getParcelable(
199+
savedInstanceState,
200+
CAMERA_POS,
201+
CameraPosition::class.java
202+
)
189203
activity = savedInstanceState.getString(ACTIVITY)
190-
media = savedInstanceState.getParcelable("sMedia")
204+
media = BundleCompat.getParcelable(savedInstanceState, "sMedia", Media::class.java)
191205
}
192206

193207
bindViews()
@@ -270,7 +284,10 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
270284
* For showing credits
271285
*/
272286
private fun addCredits() {
273-
tvAttribution.text = Html.fromHtml(getString(R.string.map_attribution))
287+
tvAttribution.text = HtmlCompat.fromHtml(
288+
getString(R.string.map_attribution),
289+
HtmlCompat.FROM_HTML_MODE_LEGACY
290+
)
274291
tvAttribution.movementMethod = LinkMovementMethod.getInstance()
275292
}
276293

@@ -396,7 +413,11 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
396413
val position = when {
397414
//location metadata is available
398415
activity == "UploadActivity" && cameraPosition != null -> {
399-
fr.free.nrw.commons.location.LatLng(cameraPosition!!.latitude, cameraPosition!!.longitude, 0.0f)
416+
fr.free.nrw.commons.location.LatLng(
417+
cameraPosition!!.latitude,
418+
cameraPosition!!.longitude,
419+
0.0f
420+
)
400421
}
401422
//location metadata is not available
402423
mapView != null -> {
@@ -447,14 +468,18 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
447468
LAST_LOCATION,
448469
"${mapView?.mapCenter?.latitude},${mapView?.mapCenter?.longitude}"
449470
)
450-
applicationKvStore.putString(LAST_ZOOM, mapView?.zoomLevel?.toString()!!)
471+
applicationKvStore.putString(LAST_ZOOM, mapView?.zoomLevelDouble?.toString()!!)
451472
}
452473

453474
if (media == null) {
454475
val intent = Intent().apply {
455476
putExtra(
456477
LocationPickerConstants.MAP_CAMERA_POSITION,
457-
CameraPosition(mapView?.mapCenter?.latitude!!, mapView?.mapCenter?.longitude!!, 14.0)
478+
CameraPosition(
479+
mapView?.mapCenter?.latitude!!,
480+
mapView?.mapCenter?.longitude!!,
481+
14.0
482+
)
458483
)
459484
}
460485
setResult(RESULT_OK, intent)
@@ -556,8 +581,15 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
556581
)
557582
}
558583

559-
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
560-
if (requestCode == Constants.RequestCodes.LOCATION && grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
584+
override fun onRequestPermissionsResult(
585+
requestCode: Int,
586+
permissions: Array<out String>,
587+
grantResults: IntArray
588+
) {
589+
if (requestCode == Constants.RequestCodes.LOCATION &&
590+
grantResults.isNotEmpty() &&
591+
grantResults[0] == PackageManager.PERMISSION_GRANTED
592+
) {
561593
onLocationPermissionGranted()
562594
} else {
563595
onLocationPermissionDenied(getString(R.string.upload_map_location_access))
@@ -577,12 +609,18 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
577609

578610
override fun onLocationPermissionDenied(toastMessage: String) {
579611
val isDeniedBefore = store.getBoolean("isPermissionDenied", false)
580-
val showRationale = ActivityCompat.shouldShowRequestPermissionRationale(this, permission.ACCESS_FINE_LOCATION)
612+
val showRationale = ActivityCompat.shouldShowRequestPermissionRationale(
613+
this,
614+
permission.ACCESS_FINE_LOCATION
615+
)
581616

582617
if (!showRationale) {
583618
if (!locationPermissionsHelper.checkLocationPermission(this)) {
584619
if (isDeniedBefore) {
585-
locationPermissionsHelper.showAppSettingsDialog(this, R.string.upload_map_location_access)
620+
locationPermissionsHelper.showAppSettingsDialog(
621+
this,
622+
R.string.upload_map_location_access
623+
)
586624
} else {
587625
Toast.makeText(this, toastMessage, Toast.LENGTH_LONG).show()
588626
}
@@ -601,7 +639,10 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
601639
addMarkerAtGPSLocation()
602640
} else {
603641
addMarkerAtGPSLocation()
604-
locationPermissionsHelper.showLocationOffDialog(this, R.string.ask_to_turn_location_on_text)
642+
locationPermissionsHelper.showLocationOffDialog(
643+
this,
644+
R.string.ask_to_turn_location_on_text
645+
)
605646
}
606647
}
607648
}
@@ -652,7 +693,10 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
652693
Marker.ANCHOR_CENTER,
653694
Marker.ANCHOR_BOTTOM
654695
)
655-
icon = ContextCompat.getDrawable(this@LocationPickerActivity, R.drawable.current_location_marker)
696+
icon = ContextCompat.getDrawable(
697+
this@LocationPickerActivity,
698+
R.drawable.current_location_marker
699+
)
656700
title = "Your Location"
657701
textLabelFontSize = 24
658702
}

‎app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerConstants.kt‎ renamed to ‎app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerConstants.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fr.free.nrw.commons.LocationPicker
1+
package fr.free.nrw.commons.locationpicker
22

33
/**
44
* Constants need for location picking

‎app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerViewModel.kt‎ renamed to ‎app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fr.free.nrw.commons.LocationPicker
1+
package fr.free.nrw.commons.locationpicker
22

33
import android.app.Application
44
import androidx.lifecycle.AndroidViewModel

‎app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ import fr.free.nrw.commons.BuildConfig
7474
import fr.free.nrw.commons.CameraPosition
7575
import fr.free.nrw.commons.CommonsApplication
7676
import fr.free.nrw.commons.CommonsApplication.Companion.instance
77-
import fr.free.nrw.commons.LocationPicker.LocationPicker
77+
import fr.free.nrw.commons.locationpicker.LocationPicker
7878
import fr.free.nrw.commons.Media
7979
import fr.free.nrw.commons.MediaDataExtractor
8080
import fr.free.nrw.commons.R

‎app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import androidx.exifinterface.media.ExifInterface;
2626
import androidx.recyclerview.widget.LinearLayoutManager;
2727
import fr.free.nrw.commons.CameraPosition;
28-
import fr.free.nrw.commons.LocationPicker.LocationPicker;
28+
import fr.free.nrw.commons.locationpicker.LocationPicker;
2929
import fr.free.nrw.commons.R;
3030
import fr.free.nrw.commons.contributions.MainActivity;
3131
import fr.free.nrw.commons.databinding.FragmentUploadMediaDetailFragmentBinding;

‎app/src/main/res/layout/activity_location_picker.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
tools:context=".LocationPicker.LocationPickerActivity">
7+
tools:context=".locationpicker.LocationPickerActivity">
88

99
<com.google.android.material.appbar.AppBarLayout
1010
android:id="@+id/location_picker_app_bar_layout"

0 commit comments

Comments
 (0)