From 6aeb3c07ccbfa9be374e1338a3b603e272788b6e Mon Sep 17 00:00:00 2001
From: samimshoaib01 <samimshoaib01@gmail.com>
Date: Sat, 12 Apr 2025 21:05:42 +0530
Subject: [PATCH 1/3] ui: make recenter FAB theme-aware using Material
 attributes (#6281)

---
 app/src/main/res/layout/fragment_explore_map.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_explore_map.xml b/app/src/main/res/layout/fragment_explore_map.xml
index e2d628dab..ad0b40b82 100644
--- a/app/src/main/res/layout/fragment_explore_map.xml
+++ b/app/src/main/res/layout/fragment_explore_map.xml
@@ -26,10 +26,11 @@
       android:clickable="true"
       android:focusable="true"
       android:visibility="visible"
-      app:backgroundTint="@color/main_background_light"
+      app:backgroundTint="?attr/colorSurface"
       app:elevation="@dimen/dimen_6"
       app:fabSize="normal"
       app:srcCompat="@drawable/ic_my_location_black_24dp"
+      app:tint="?attr/colorOnSurface"
       app:useCompatPadding="true" />
 
     <View

From 4bacac1f8b41538fb5cd6abb50773b6dbdffa963 Mon Sep 17 00:00:00 2001
From: Prinuel <78011576+Prinuel@users.noreply.github.com>
Date: Sun, 13 Apr 2025 06:39:14 +0100
Subject: [PATCH 2/3]  BookmarkLocationsFragment.kt:fix android studio warnings
 for this file, : Eliminated three unused imports, and changed calls to
 object: FilePicker.HandleActivityResult to use lamda (#6283)

Co-authored-by: bethel-m <bethelcletus87@gmail.com>
---
 .../locations/BookmarkLocationsFragment.kt    | 42 +++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.kt b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.kt
index 4ab21462c..f10e02ebc 100644
--- a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.kt
@@ -1,7 +1,6 @@
 package fr.free.nrw.commons.bookmarks.locations
 
 import android.Manifest.permission
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -9,15 +8,12 @@ import android.view.ViewGroup
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.android.support.DaggerFragment
 import fr.free.nrw.commons.R
 import fr.free.nrw.commons.contributions.ContributionController
 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.fragments.CommonPlaceClickActions
 import fr.free.nrw.commons.nearby.fragments.PlaceAdapter
@@ -41,33 +37,27 @@ class BookmarkLocationsFragment : DaggerFragment() {
     private val cameraPickLauncherForResult =
         registerForActivityResult(StartActivityForResult()) { result ->
             contributionController.handleActivityResultWithCallback(
-                requireActivity(),
-                object: FilePicker.HandleActivityResult {
-                    override fun onHandleActivityResult(callbacks: FilePicker.Callbacks) {
-                        contributionController.onPictureReturnedFromCamera(
-                            result,
-                            requireActivity(),
-                            callbacks
-                        )
-                    }
-                }
-            )
+                requireActivity()
+            ) { callbacks ->
+                contributionController.onPictureReturnedFromCamera(
+                    result,
+                    requireActivity(),
+                    callbacks
+                )
+            }
         }
 
     private val galleryPickLauncherForResult =
         registerForActivityResult(StartActivityForResult()) { result ->
             contributionController.handleActivityResultWithCallback(
-                requireActivity(),
-                object: FilePicker.HandleActivityResult {
-                    override fun onHandleActivityResult(callbacks: FilePicker.Callbacks) {
-                        contributionController.onPictureReturnedFromGallery(
-                            result,
-                            requireActivity(),
-                            callbacks
-                        )
-                    }
-                }
-            )
+                requireActivity()
+            ) { callbacks ->
+                contributionController.onPictureReturnedFromGallery(
+                    result,
+                    requireActivity(),
+                    callbacks
+                )
+            }
         }
 
     companion object {

From 5b5aeead88e8437f8cfa23ce33bcfe8aaaf569d0 Mon Sep 17 00:00:00 2001
From: Ritika Pahwa <83745993+RitikaPahwa4444@users.noreply.github.com>
Date: Sun, 13 Apr 2025 13:09:19 +0530
Subject: [PATCH 3/3]  Bump up version code to 1050

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 41b3d85de..133d39b6e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -212,8 +212,8 @@ android {
     defaultConfig {
         //applicationId 'fr.free.nrw.commons'
 
-        versionCode 1049
-        versionName '5.2.0'
+        versionCode 1050
+        versionName '5.3.0'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 21