From fd67890406bce7ea8e212fb3ecfaa3113584f1d9 Mon Sep 17 00:00:00 2001 From: Thejas Elandassery Date: Thu, 18 Apr 2024 19:00:00 +0530 Subject: [PATCH] Added aprreciation text when pictures in album have been either uploaded or marked as not for upload." --- .../customselector/ui/selector/ImageFragment.kt | 8 ++++++++ app/src/main/res/layout/fragment_custom_selector.xml | 12 ++++++++++++ app/src/main/res/values/strings.xml | 3 +++ 3 files changed, 23 insertions(+) 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 842531dd2..81c132523 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,6 +9,7 @@ import android.view.View import android.view.ViewGroup import android.widget.ProgressBar import android.widget.Switch +import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.Observer @@ -70,6 +71,7 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat private var loader: ProgressBar? = null private var switch: Switch? = null lateinit var filteredImages: ArrayList + private var appreciationText : TextView? = null /** * Stores all images @@ -203,6 +205,7 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat handleResult(it) }) + appreciationText = binding?.appreciationText switch = binding?.switchWidget switch?.visibility = View.VISIBLE switch?.setOnCheckedChangeListener { _, isChecked -> onChangeSwitchState(isChecked) } @@ -228,6 +231,7 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat private fun onChangeSwitchState(checked: Boolean) { if (checked) { showAlreadyActionedImages = true + appreciationText?.visibility = View.GONE val sharedPreferences: SharedPreferences = requireContext().getSharedPreferences(CUSTOM_SELECTOR_PREFERENCE_KEY, MODE_PRIVATE) val editor = sharedPreferences.edit() @@ -281,6 +285,10 @@ class ImageFragment : CommonsDaggerSupportFragment(), RefreshUIListener, PassDat } else { binding?.emptyText?.let { it.visibility = View.VISIBLE + if (!showAlreadyActionedImages) { + appreciationText?.visibility = View.VISIBLE + + } } selectorRV?.let { it.visibility = View.GONE diff --git a/app/src/main/res/layout/fragment_custom_selector.xml b/app/src/main/res/layout/fragment_custom_selector.xml index bbc4c0a07..cdd03ca64 100644 --- a/app/src/main/res/layout/fragment_custom_selector.xml +++ b/app/src/main/res/layout/fragment_custom_selector.xml @@ -18,6 +18,18 @@ android:padding="@dimen/dimen_10" android:checked="true" /> + + + Marking as not for upload Unmarking as not for upload Show already actioned pictures + Good Job! \n All pictures have been either uploaded or marked as not for upload + + Hiding already actioned pictures No more images found This image is already uploaded