From b5b5d8a8e4ea13656595f872ad38ffb88d68ccf8 Mon Sep 17 00:00:00 2001 From: Xinyu Yang Date: Sat, 18 Oct 2025 13:31:49 +1100 Subject: [PATCH 1/4] =?UTF-8?q?I=20didn=E2=80=99t=20look=20at=20the=20code?= =?UTF-8?q?=20carefully=20before=20and=20directly=20modified=20the=20conte?= =?UTF-8?q?nts=20of=20strings.xml.=20After=20reviewing=20it,=20I=20found?= =?UTF-8?q?=20that=20the=20issue=20was=20actually=20in=20WikidataItemDetai?= =?UTF-8?q?lsActivity.kt,=20where=20the=20wrong=20label=20was=20selected.?= =?UTF-8?q?=20After=20correcting=20this,=20there=20should=20no=20longer=20?= =?UTF-8?q?be=20any=20problems.=20(#6524)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: frank --- .../commons/explore/depictions/WikidataItemDetailsActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.kt b/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.kt index 32af67e95..d025fdfe1 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/explore/depictions/WikidataItemDetailsActivity.kt @@ -112,8 +112,8 @@ class WikidataItemDetailsActivity : BaseActivity(), MediaDetailProvider, Categor viewPagerAdapter!!.setTabs( R.string.title_for_media to depictionImagesListFragment!!, - R.string.title_for_subcategories to childDepictionsFragment, - R.string.title_for_parent_categories to parentDepictionsFragment + R.string.title_for_child_classes to childDepictionsFragment, + R.string.title_for_parent_classes to parentDepictionsFragment ) binding!!.viewPager.offscreenPageLimit = 2 viewPagerAdapter!!.notifyDataSetChanged() From 29b6d0f8fe35fc13c23f9be65353ab25e9ace709 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Sat, 18 Oct 2025 00:43:37 -0400 Subject: [PATCH 2/4] Replace Switch with SwitchMaterial (#6522) Lint recommended replacing Switch with SwitchMaterial. This was a very simple replacement, and I tested it in the custom selector, where it is used, and it works as it worked previously. --- .../nrw/commons/customselector/ui/selector/ImageFragment.kt | 4 ++-- app/src/main/res/layout/fragment_custom_selector.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt index db250dea9..a5182fe62 100644 --- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt @@ -9,7 +9,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ProgressBar -import android.widget.Switch import androidx.appcompat.app.AlertDialog import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.isVisible @@ -20,6 +19,7 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.switchmaterial.SwitchMaterial import fr.free.nrw.commons.contributions.Contribution import fr.free.nrw.commons.contributions.ContributionDao import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao @@ -82,7 +82,7 @@ class ImageFragment : */ private var selectorRV: RecyclerView? = null private var loader: ProgressBar? = null - private var switch: Switch? = null + private var switch: SwitchMaterial? = null lateinit var filteredImages: ArrayList /** diff --git a/app/src/main/res/layout/fragment_custom_selector.xml b/app/src/main/res/layout/fragment_custom_selector.xml index b016b6605..f1f95035b 100644 --- a/app/src/main/res/layout/fragment_custom_selector.xml +++ b/app/src/main/res/layout/fragment_custom_selector.xml @@ -6,7 +6,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/mainBackground"> - Date: Sat, 18 Oct 2025 00:45:35 -0400 Subject: [PATCH 3/4] Fix lint warning about Timber (#6521) Change trivial string formatting and function calls for Timber logging. This resolves all the lint warnings in the Android/Lint/Correctness/Messages group. --- .../java/fr/free/nrw/commons/contributions/MainActivity.kt | 2 +- .../main/java/fr/free/nrw/commons/profile/ProfileActivity.kt | 3 ++- app/src/main/java/fr/free/nrw/commons/utils/LocationUtils.kt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt index ac7068cc7..d481017b2 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt @@ -324,7 +324,7 @@ after opening the app. ) .subscribeOn(Schedulers.io()) .blockingGet() - Timber.d("Resuming " + stuckUploads.size + " uploads...") + Timber.d("Resuming %d uploads...", stuckUploads.size) if (!stuckUploads.isEmpty()) { for (contribution in stuckUploads) { contribution.state = Contribution.STATE_QUEUED diff --git a/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.kt b/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.kt index c368d6cd4..8567d37ae 100644 --- a/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.kt @@ -27,6 +27,7 @@ import java.io.File import java.io.FileOutputStream import java.util.Locale import javax.inject.Inject +import timber.log.Timber /** * This activity will set two tabs, achievements and @@ -122,7 +123,7 @@ class ProfileActivity : BaseActivity() { val rootView = window.decorView.findViewById(android.R.id.content) val screenShot = getScreenShot(rootView) if (screenShot == null) { - Log.e("ERROR", "ScreenShot is null") + Timber.e("ScreenShot is null") return false } showAlert(screenShot) diff --git a/app/src/main/java/fr/free/nrw/commons/utils/LocationUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/LocationUtils.kt index 1fbd87581..cef137f43 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/LocationUtils.kt +++ b/app/src/main/java/fr/free/nrw/commons/utils/LocationUtils.kt @@ -37,7 +37,7 @@ object LocationUtils { latLng = LatLng(latLngArray[1].trim().toDouble(), latLngArray[0].trim().toDouble(), 1f) } catch (e: Exception) { - Timber.e("Error while parsing user entered lat long: %s", e) + Timber.e(e, "Error while parsing user entered lat long") } return latLng From 3a55583460d3294efc7ae2000616d1cb4ec6ad68 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Sat, 18 Oct 2025 00:51:46 -0400 Subject: [PATCH 4/4] Disable linting for icon hiding code in preferences (#6519) --- .../java/fr/free/nrw/commons/settings/SettingsFragment.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt index 387dd4672..c38ed1ecb 100644 --- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt @@ -1,6 +1,7 @@ package fr.free.nrw.commons.settings import android.Manifest.permission +import android.annotation.SuppressLint import android.app.Activity import android.app.Dialog import android.content.Context.MODE_PRIVATE @@ -303,6 +304,11 @@ class SettingsFragment : PreferenceFragmentCompat() { ) } + // Remove the space for icons in the settings menu. + // This uses an internal API that shouldn't be used in app code, + // but it appears to be the most robust way to do this at the moment, + // disable the warning. + @SuppressLint("RestrictedApi") override fun onCreateAdapter(preferenceScreen: PreferenceScreen): Adapter { return object : PreferenceGroupAdapter(preferenceScreen) {