mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into main

Browse source
This commit is contained in:
Khushbu Khemchandani 2025-04-14 02:50:23 +05:30 • committed by GitHub
commit 210e58a140
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -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

42
app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.kt
View file

@ -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 {

3
app/src/main/res/layout/fragment_explore_map.xml
View file

@ -26,10 +26,11 @@
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:visibility="visible" android:visibility="visible"
app:backgroundTint="@color/main_background_light" app:backgroundTint="?attr/colorSurface"
app:elevation="@dimen/dimen_6" app:elevation="@dimen/dimen_6"
app:fabSize="normal" app:fabSize="normal"
app:srcCompat="@drawable/ic_my_location_black_24dp" app:srcCompat="@drawable/ic_my_location_black_24dp"
app:tint="?attr/colorOnSurface"
app:useCompatPadding="true" /> app:useCompatPadding="true" />
<View <View