mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-11-03 08:13:55 +01:00
Compare commits
2 commits
6aeb3c07cc
...
5b5aeead88
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b5aeead88 | ||
|
|
4bacac1f8b |
2 changed files with 18 additions and 28 deletions
|
|
@ -212,8 +212,8 @@ android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
//applicationId 'fr.free.nrw.commons'
|
//applicationId 'fr.free.nrw.commons'
|
||||||
|
|
||||||
versionCode 1049
|
versionCode 1050
|
||||||
versionName '5.2.0'
|
versionName '5.3.0'
|
||||||
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
|
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
|
||||||
|
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
package fr.free.nrw.commons.bookmarks.locations
|
package fr.free.nrw.commons.bookmarks.locations
|
||||||
|
|
||||||
import android.Manifest.permission
|
import android.Manifest.permission
|
||||||
import android.annotation.SuppressLint
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
|
@ -9,15 +8,12 @@ import android.view.ViewGroup
|
||||||
import androidx.activity.result.ActivityResultLauncher
|
import androidx.activity.result.ActivityResultLauncher
|
||||||
import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
|
import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
|
||||||
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
|
import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
|
||||||
import androidx.lifecycle.Lifecycle
|
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.lifecycle.repeatOnLifecycle
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import dagger.android.support.DaggerFragment
|
import dagger.android.support.DaggerFragment
|
||||||
import fr.free.nrw.commons.R
|
import fr.free.nrw.commons.R
|
||||||
import fr.free.nrw.commons.contributions.ContributionController
|
import fr.free.nrw.commons.contributions.ContributionController
|
||||||
import fr.free.nrw.commons.databinding.FragmentBookmarksLocationsBinding
|
import fr.free.nrw.commons.databinding.FragmentBookmarksLocationsBinding
|
||||||
import fr.free.nrw.commons.filepicker.FilePicker
|
|
||||||
import fr.free.nrw.commons.nearby.Place
|
import fr.free.nrw.commons.nearby.Place
|
||||||
import fr.free.nrw.commons.nearby.fragments.CommonPlaceClickActions
|
import fr.free.nrw.commons.nearby.fragments.CommonPlaceClickActions
|
||||||
import fr.free.nrw.commons.nearby.fragments.PlaceAdapter
|
import fr.free.nrw.commons.nearby.fragments.PlaceAdapter
|
||||||
|
|
@ -41,33 +37,27 @@ class BookmarkLocationsFragment : DaggerFragment() {
|
||||||
private val cameraPickLauncherForResult =
|
private val cameraPickLauncherForResult =
|
||||||
registerForActivityResult(StartActivityForResult()) { result ->
|
registerForActivityResult(StartActivityForResult()) { result ->
|
||||||
contributionController.handleActivityResultWithCallback(
|
contributionController.handleActivityResultWithCallback(
|
||||||
requireActivity(),
|
requireActivity()
|
||||||
object: FilePicker.HandleActivityResult {
|
) { callbacks ->
|
||||||
override fun onHandleActivityResult(callbacks: FilePicker.Callbacks) {
|
contributionController.onPictureReturnedFromCamera(
|
||||||
contributionController.onPictureReturnedFromCamera(
|
result,
|
||||||
result,
|
requireActivity(),
|
||||||
requireActivity(),
|
callbacks
|
||||||
callbacks
|
)
|
||||||
)
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private val galleryPickLauncherForResult =
|
private val galleryPickLauncherForResult =
|
||||||
registerForActivityResult(StartActivityForResult()) { result ->
|
registerForActivityResult(StartActivityForResult()) { result ->
|
||||||
contributionController.handleActivityResultWithCallback(
|
contributionController.handleActivityResultWithCallback(
|
||||||
requireActivity(),
|
requireActivity()
|
||||||
object: FilePicker.HandleActivityResult {
|
) { callbacks ->
|
||||||
override fun onHandleActivityResult(callbacks: FilePicker.Callbacks) {
|
contributionController.onPictureReturnedFromGallery(
|
||||||
contributionController.onPictureReturnedFromGallery(
|
result,
|
||||||
result,
|
requireActivity(),
|
||||||
requireActivity(),
|
callbacks
|
||||||
callbacks
|
)
|
||||||
)
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue