languageAdapter = new ArrayAdapter<>(AboutActivity.this,
- android.R.layout.simple_spinner_dropdown_item, sortedLocalizedNamesRef);
- final Spinner spinner = new Spinner(AboutActivity.this);
- spinner.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
- spinner.setAdapter(languageAdapter);
- spinner.setGravity(17);
- spinner.setPadding(50,0,0,0);
-
- Runnable positiveButtonRunnable = () -> {
- String langCode = CommonsApplication.getInstance().getLanguageLookUpTable().getCodes().get(spinner.getSelectedItemPosition());
- Utils.handleWebUrl(AboutActivity.this, Uri.parse(Urls.TRANSLATE_WIKI_URL + langCode));
- };
- DialogUtil.showAlertDialog(this,
- getString(R.string.about_translate_title),
- getString(R.string.about_translate_message),
- getString(R.string.about_translate_proceed),
- getString(R.string.about_translate_cancel),
- positiveButtonRunnable,
- () -> {},
- spinner
- );
- }
-
-}
diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.kt b/app/src/main/java/fr/free/nrw/commons/AboutActivity.kt
new file mode 100644
index 000000000..143f5e569
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.kt
@@ -0,0 +1,209 @@
+package fr.free.nrw.commons
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import android.widget.Spinner
+import fr.free.nrw.commons.CommonsApplication.Companion.instance
+import fr.free.nrw.commons.databinding.ActivityAboutBinding
+import fr.free.nrw.commons.theme.BaseActivity
+import fr.free.nrw.commons.utils.ConfigUtils.getVersionNameWithSha
+import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
+import java.util.Collections
+
+/**
+ * Represents about screen of this app
+ */
+class AboutActivity : BaseActivity() {
+ /*
+ This View Binding class is auto-generated for each xml file. The format is usually the name
+ of the file with PascalCasing (The underscore characters will be ignored).
+ More information is available at https://developer.android.com/topic/libraries/view-binding
+ */
+ private var binding: ActivityAboutBinding? = null
+
+ /**
+ * This method helps in the creation About screen
+ *
+ * @param savedInstanceState Data bundle
+ */
+ @SuppressLint("StringFormatInvalid") //TODO:
+ public override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ /*
+ Instead of just setting the view with the xml file. We need to use View Binding class.
+ */
+ binding = ActivityAboutBinding.inflate(layoutInflater)
+ val view: View = binding!!.root
+ setContentView(view)
+
+ setSupportActionBar(binding!!.toolbarBinding.toolbar)
+ supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+ val aboutText = getString(R.string.about_license)
+ /*
+ We can then access all the views by just using the id names like this.
+ camelCasing is used with underscore characters being ignored.
+ */
+ binding!!.aboutLicense.setHtmlText(aboutText)
+
+ @SuppressLint("StringFormatMatches") // TODO:
+ val improveText =
+ String.format(getString(R.string.about_improve), Urls.NEW_ISSUE_URL)
+ binding!!.aboutImprove.setHtmlText(improveText)
+ binding!!.aboutVersion.text = applicationContext.getVersionNameWithSha()
+
+ Utils.setUnderlinedText(
+ binding!!.aboutFaq, R.string.about_faq,
+ applicationContext
+ )
+ Utils.setUnderlinedText(
+ binding!!.aboutRateUs, R.string.about_rate_us,
+ applicationContext
+ )
+ Utils.setUnderlinedText(
+ binding!!.aboutUserGuide, R.string.user_guide,
+ applicationContext
+ )
+ Utils.setUnderlinedText(
+ binding!!.aboutPrivacyPolicy, R.string.about_privacy_policy,
+ applicationContext
+ )
+ Utils.setUnderlinedText(
+ binding!!.aboutTranslate, R.string.about_translate,
+ applicationContext
+ )
+ Utils.setUnderlinedText(
+ binding!!.aboutCredits, R.string.about_credits,
+ applicationContext
+ )
+
+ /*
+ To set listeners, we can create a separate method and use lambda syntax.
+ */
+ binding!!.facebookLaunchIcon.setOnClickListener(::launchFacebook)
+ binding!!.githubLaunchIcon.setOnClickListener(::launchGithub)
+ binding!!.websiteLaunchIcon.setOnClickListener(::launchWebsite)
+ binding!!.aboutRateUs.setOnClickListener(::launchRatings)
+ binding!!.aboutCredits.setOnClickListener(::launchCredits)
+ binding!!.aboutPrivacyPolicy.setOnClickListener(::launchPrivacyPolicy)
+ binding!!.aboutUserGuide.setOnClickListener(::launchUserGuide)
+ binding!!.aboutFaq.setOnClickListener(::launchFrequentlyAskedQuesions)
+ binding!!.aboutTranslate.setOnClickListener(::launchTranslate)
+ }
+
+ override fun onSupportNavigateUp(): Boolean {
+ onBackPressed()
+ return true
+ }
+
+ fun launchFacebook(view: View?) {
+ val intent: Intent
+ try {
+ intent = Intent(Intent.ACTION_VIEW, Uri.parse(Urls.FACEBOOK_APP_URL))
+ intent.setPackage(Urls.FACEBOOK_PACKAGE_NAME)
+ startActivity(intent)
+ } catch (e: Exception) {
+ Utils.handleWebUrl(this, Uri.parse(Urls.FACEBOOK_WEB_URL))
+ }
+ }
+
+ fun launchGithub(view: View?) {
+ val intent: Intent
+ try {
+ intent = Intent(Intent.ACTION_VIEW, Uri.parse(Urls.GITHUB_REPO_URL))
+ intent.setPackage(Urls.GITHUB_PACKAGE_NAME)
+ startActivity(intent)
+ } catch (e: Exception) {
+ Utils.handleWebUrl(this, Uri.parse(Urls.GITHUB_REPO_URL))
+ }
+ }
+
+ fun launchWebsite(view: View?) {
+ Utils.handleWebUrl(this, Uri.parse(Urls.WEBSITE_URL))
+ }
+
+ fun launchRatings(view: View?) {
+ Utils.rateApp(this)
+ }
+
+ fun launchCredits(view: View?) {
+ Utils.handleWebUrl(this, Uri.parse(Urls.CREDITS_URL))
+ }
+
+ fun launchUserGuide(view: View?) {
+ Utils.handleWebUrl(this, Uri.parse(Urls.USER_GUIDE_URL))
+ }
+
+ fun launchPrivacyPolicy(view: View?) {
+ Utils.handleWebUrl(this, Uri.parse(BuildConfig.PRIVACY_POLICY_URL))
+ }
+
+ fun launchFrequentlyAskedQuesions(view: View?) {
+ Utils.handleWebUrl(this, Uri.parse(Urls.FAQ_URL))
+ }
+
+ override fun onCreateOptionsMenu(menu: Menu): Boolean {
+ val inflater = menuInflater
+ inflater.inflate(R.menu.menu_about, menu)
+ return super.onCreateOptionsMenu(menu)
+ }
+
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ when (item.itemId) {
+ R.id.share_app_icon -> {
+ val shareText = String.format(
+ getString(R.string.share_text),
+ Urls.PLAY_STORE_URL_PREFIX + this.packageName
+ )
+ val sendIntent = Intent()
+ sendIntent.setAction(Intent.ACTION_SEND)
+ sendIntent.putExtra(Intent.EXTRA_TEXT, shareText)
+ sendIntent.setType("text/plain")
+ startActivity(Intent.createChooser(sendIntent, getString(R.string.share_via)))
+ return true
+ }
+
+ else -> return super.onOptionsItemSelected(item)
+ }
+ }
+
+ fun launchTranslate(view: View?) {
+ val sortedLocalizedNamesRef = instance.languageLookUpTable!!.getCanonicalNames()
+ Collections.sort(sortedLocalizedNamesRef)
+ val languageAdapter = ArrayAdapter(
+ this@AboutActivity,
+ android.R.layout.simple_spinner_dropdown_item, sortedLocalizedNamesRef
+ )
+ val spinner = Spinner(this@AboutActivity)
+ spinner.layoutParams =
+ LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT
+ )
+ spinner.adapter = languageAdapter
+ spinner.gravity = 17
+ spinner.setPadding(50, 0, 0, 0)
+
+ val positiveButtonRunnable = Runnable {
+ val langCode = instance.languageLookUpTable!!.getCodes()[spinner.selectedItemPosition]
+ Utils.handleWebUrl(this@AboutActivity, Uri.parse(Urls.TRANSLATE_WIKI_URL + langCode))
+ }
+ showAlertDialog(
+ this,
+ getString(R.string.about_translate_title),
+ getString(R.string.about_translate_message),
+ getString(R.string.about_translate_proceed),
+ getString(R.string.about_translate_cancel),
+ positiveButtonRunnable,
+ {},
+ spinner
+ )
+ }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
index cd9c6eed5..8d0f8b530 100644
--- a/app/src/main/java/fr/free/nrw/commons/Utils.java
+++ b/app/src/main/java/fr/free/nrw/commons/Utils.java
@@ -148,13 +148,27 @@ public class Utils {
}
/**
- * Util function to handle geo coordinates
- * It no longer depends on google maps and any app capable of handling the map intent can handle it
- * @param context
- * @param latLng
+ * Util function to handle geo coordinates. It no longer depends on google maps and any app
+ * capable of handling the map intent can handle it
+ *
+ * @param context The context for launching intent
+ * @param latLng The latitude and longitude of the location
*/
- public static void handleGeoCoordinates(Context context, LatLng latLng) {
- Intent mapIntent = new Intent(Intent.ACTION_VIEW, latLng.getGmmIntentUri());
+ public static void handleGeoCoordinates(final Context context, final LatLng latLng) {
+ handleGeoCoordinates(context, latLng, 16);
+ }
+
+ /**
+ * Util function to handle geo coordinates with specified zoom level. It no longer depends on
+ * google maps and any app capable of handling the map intent can handle it
+ *
+ * @param context The context for launching intent
+ * @param latLng The latitude and longitude of the location
+ * @param zoomLevel The zoom level
+ */
+ public static void handleGeoCoordinates(final Context context, final LatLng latLng,
+ final double zoomLevel) {
+ final Intent mapIntent = new Intent(Intent.ACTION_VIEW, latLng.getGmmIntentUri(zoomLevel));
if (mapIntent.resolveActivity(context.getPackageManager()) != null) {
context.startActivity(mapIntent);
} else {
diff --git a/app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt b/app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt
index 0583ae2f9..b7951adab 100644
--- a/app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt
@@ -28,6 +28,8 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.viewinterop.AndroidView
+import fr.free.nrw.commons.CommonsApplication
+import fr.free.nrw.commons.CommonsApplication.ActivityLogoutListener
import fr.free.nrw.commons.R
import fr.free.nrw.commons.di.ApplicationlessInjection
import fr.free.nrw.commons.wikidata.cookies.CommonsCookieJar
@@ -85,7 +87,12 @@ class SingleWebViewActivity : ComponentActivity() {
url = url,
successUrl = successUrl,
onSuccess = {
- // TODO Redirect the user to login screen like we do when the user logout's
+ //Redirect the user to login screen like we do when the user logout's
+ val app = applicationContext as CommonsApplication
+ app.clearApplicationData(
+ applicationContext,
+ ActivityLogoutListener(activity = this, ctx = applicationContext)
+ )
finish()
},
modifier = Modifier
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt
index fd90be95f..47147944c 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt
@@ -36,37 +36,35 @@ class CategoriesModel
* @return
*/
fun isSpammyCategory(item: String): Boolean {
- // Check for current and previous year to exclude these categories from removal
- val now = Calendar.getInstance()
- val curYear = now[Calendar.YEAR]
- val curYearInString = curYear.toString()
- val prevYear = curYear - 1
- val prevYearInString = prevYear.toString()
- Timber.d("Previous year: %s", prevYearInString)
-
- val mentionsDecade = item.matches(".*0s.*".toRegex())
- val recentDecade = item.matches(".*20[0-2]0s.*".toRegex())
- val spammyCategory =
- item.matches("(.*)needing(.*)".toRegex()) ||
- item.matches("(.*)taken on(.*)".toRegex())
// always skip irrelevant categories such as Media_needing_categories_as_of_16_June_2017(Issue #750)
+ val spammyCategory = item.matches("(.*)needing(.*)".toRegex())
+ || item.matches("(.*)taken on(.*)".toRegex())
+
+ // checks for
+ // dd/mm/yyyy or yy
+ // yyyy or yy/mm/dd
+ // yyyy or yy/mm
+ // mm/yyyy or yy
+ // for `yy` it is assumed that 20XX is implicit.
+ // with separators [., /, -]
+ val isIrrelevantCategory =
+ item.contains("""\d{1,2}[-/.]\d{1,2}[-/.]\d{2,4}|\d{2,4}[-/.]\d{1,2}[-/.]\d{1,2}|\d{2,4}[-/.]\d{1,2}|\d{1,2}[-/.]\d{2,4}""".toRegex())
+
+
if (spammyCategory) {
return true
}
- if (mentionsDecade) {
- // Check if the year in the form of XX(X)0s is recent/relevant, i.e. in the 2000s or 2010s/2020s as stated in Issue #1029
- // Example: "2020s" is OK, but "1920s" is not (and should be skipped)
- return !recentDecade
- } else {
- // If it is not an year in decade form (e.g. 19xxs/20xxs), then check if item contains a 4-digit year
- // anywhere within the string (.* is wildcard) (Issue #47)
- // And that item does not equal the current year or previous year
- return item.matches(".*(19|20)\\d{2}.*".toRegex()) &&
- !item.contains(curYearInString) &&
- !item.contains(prevYearInString)
+ if(isIrrelevantCategory){
+ return true
}
+
+ val hasYear = item.matches("(.*\\d{4}.*)".toRegex())
+ val validYearsRange = item.matches(".*(20[0-9]{2}).*".toRegex())
+
+ // finally if there's 4 digits year exists in XXXX it should only be in 20XX range.
+ return hasYear && !validYearsRange
}
/**
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
index 03027f287..047943721 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
@@ -207,6 +207,9 @@ public class MainActivity extends BaseActivity
private boolean loadFragment(Fragment fragment, boolean showBottom) {
//showBottom so that we do not show the bottom tray again when constructing
//from the saved instance state.
+
+ freeUpFragments();
+
if (fragment instanceof ContributionsFragment) {
if (activeFragment == ActiveFragment.CONTRIBUTIONS) {
// scroll to top if already on the Contributions tab
@@ -256,6 +259,31 @@ public class MainActivity extends BaseActivity
return false;
}
+ /**
+ * loadFragment() overload that supports passing extras to fragments
+ **/
+ private boolean loadFragment(Fragment fragment, boolean showBottom, Bundle args) {
+ if (fragment != null && args != null) {
+ fragment.setArguments(args);
+ }
+
+ return loadFragment(fragment, showBottom);
+ }
+
+ /**
+ * Old implementation of loadFragment() was causing memory leaks, due to MainActivity holding
+ * references to cleared fragments. This function frees up all fragment references.
+ *
+ * Called in loadFragment() before doing the actual loading.
+ **/
+ public void freeUpFragments() {
+ // free all fragments except contributionsFragment because several tests depend on it.
+ // hence, contributionsFragment is probably still a leak
+ nearbyParentFragment = null;
+ exploreFragment = null;
+ bookmarkFragment = null;
+ }
+
public void hideTabs() {
binding.fragmentMainNavTabLayout.setVisibility(View.GONE);
}
@@ -432,6 +460,42 @@ public class MainActivity extends BaseActivity
});
}
+ /**
+ * Launch the Explore fragment from Nearby fragment. This method is called when a user clicks
+ * the 'Show in Explore' option in the 3-dots menu in Nearby.
+ *
+ * @param zoom current zoom of Nearby map
+ * @param latitude current latitude of Nearby map
+ * @param longitude current longitude of Nearby map
+ **/
+ public void loadExploreMapFromNearby(double zoom, double latitude, double longitude) {
+ Bundle bundle = new Bundle();
+ bundle.putDouble("prev_zoom", zoom);
+ bundle.putDouble("prev_latitude", latitude);
+ bundle.putDouble("prev_longitude", longitude);
+
+ loadFragment(ExploreFragment.newInstance(), false, bundle);
+ setSelectedItemId(NavTab.EXPLORE.code());
+ }
+
+ /**
+ * Launch the Nearby fragment from Explore fragment. This method is called when a user clicks
+ * the 'Show in Nearby' option in the 3-dots menu in Explore.
+ *
+ * @param zoom current zoom of Explore map
+ * @param latitude current latitude of Explore map
+ * @param longitude current longitude of Explore map
+ **/
+ public void loadNearbyMapFromExplore(double zoom, double latitude, double longitude) {
+ Bundle bundle = new Bundle();
+ bundle.putDouble("prev_zoom", zoom);
+ bundle.putDouble("prev_latitude", latitude);
+ bundle.putDouble("prev_longitude", longitude);
+
+ loadFragment(NearbyParentFragment.newInstance(), false, bundle);
+ setSelectedItemId(NavTab.NEARBY.code());
+ }
+
@Override
protected void onResume() {
super.onResume();
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
index 74b937f97..ff623d496 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
@@ -24,6 +24,7 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.launch
import java.util.TreeMap
import kotlin.collections.ArrayList
@@ -103,6 +104,18 @@ class ImageAdapter(
*/
private var imagePositionAsPerIncreasingOrder = 0
+ /**
+ * Stores the number of images currently visible on the screen
+ */
+ private val _currentImagesCount = MutableStateFlow(0)
+ val currentImagesCount = _currentImagesCount
+
+ /**
+ * Stores whether images are being loaded or not
+ */
+ private val _isLoadingImages = MutableStateFlow(false)
+ val isLoadingImages = _isLoadingImages
+
/**
* Coroutine Dispatchers and Scope.
*/
@@ -184,8 +197,12 @@ class ImageAdapter(
// If the position is not already visited, that means the position is new then
// finds the next actionable image position from all images
if (!alreadyAddedPositions.contains(position)) {
- processThumbnailForActionedImage(holder, position, uploadingContributionList)
-
+ processThumbnailForActionedImage(
+ holder,
+ position,
+ uploadingContributionList
+ )
+ _isLoadingImages.value = false
// If the position is already visited, that means the image is already present
// inside map, so it will fetch the image from the map and load in the holder
} else {
@@ -231,6 +248,7 @@ class ImageAdapter(
position: Int,
uploadingContributionList: List,
) {
+ _isLoadingImages.value = true
val next =
imageLoader.nextActionableImage(
allImages,
@@ -252,6 +270,7 @@ class ImageAdapter(
actionableImagesMap[next] = allImages[next]
alreadyAddedPositions.add(imagePositionAsPerIncreasingOrder)
imagePositionAsPerIncreasingOrder++
+ _currentImagesCount.value = imagePositionAsPerIncreasingOrder
Glide
.with(holder.image)
.load(allImages[next].uri)
@@ -267,6 +286,7 @@ class ImageAdapter(
reachedEndOfFolder = true
notifyItemRemoved(position)
}
+ _isLoadingImages.value = false
}
/**
@@ -372,6 +392,7 @@ class ImageAdapter(
emptyMap: TreeMap,
uploadedImages: List = ArrayList(),
) {
+ _isLoadingImages.value = true
allImages = fixedImages
val oldImageList: ArrayList = images
val newImageList: ArrayList = ArrayList(newImages)
@@ -382,6 +403,7 @@ class ImageAdapter(
reachedEndOfFolder = false
selectedImages = ArrayList()
imagePositionAsPerIncreasingOrder = 0
+ _currentImagesCount.value = imagePositionAsPerIncreasingOrder
val diffResult =
DiffUtil.calculateDiff(
ImagesDiffCallback(oldImageList, newImageList),
@@ -441,6 +463,7 @@ class ImageAdapter(
val entry = iterator.next()
if (entry.value == image) {
imagePositionAsPerIncreasingOrder -= 1
+ _currentImagesCount.value = imagePositionAsPerIncreasingOrder
iterator.remove()
alreadyAddedPositions.removeAt(alreadyAddedPositions.size - 1)
notifyItemRemoved(index)
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 3912a4d12..39d0d545a 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
@@ -12,8 +12,12 @@ import android.widget.ProgressBar
import android.widget.Switch
import androidx.appcompat.app.AlertDialog
import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import fr.free.nrw.commons.contributions.Contribution
@@ -38,6 +42,10 @@ import fr.free.nrw.commons.theme.BaseActivity
import fr.free.nrw.commons.upload.FileProcessor
import fr.free.nrw.commons.upload.FileUtilsWrapper
import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
import java.util.TreeMap
import javax.inject.Inject
import kotlin.collections.ArrayList
@@ -80,6 +88,12 @@ class ImageFragment :
*/
var allImages: ArrayList = ArrayList()
+ /**
+ * Keeps track of switch state
+ */
+ private val _switchState = MutableStateFlow(false)
+ val switchState = _switchState.asStateFlow()
+
/**
* View model Factory.
*/
@@ -214,7 +228,11 @@ class ImageFragment :
switch = binding?.switchWidget
switch?.visibility = View.VISIBLE
- switch?.setOnCheckedChangeListener { _, isChecked -> onChangeSwitchState(isChecked) }
+ _switchState.value = switch?.isChecked ?: false
+ switch?.setOnCheckedChangeListener { _, isChecked ->
+ onChangeSwitchState(isChecked)
+ _switchState.value = isChecked
+ }
selectorRV = binding?.selectorRv
loader = binding?.loader
progressLayout = binding?.progressLayout
@@ -234,6 +252,28 @@ class ImageFragment :
return binding?.root
}
+ /**
+ * onViewCreated
+ * Updates empty text view visibility based on image count, switch state, and loading status.
+ */
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ viewLifecycleOwner.lifecycleScope.launch {
+ repeatOnLifecycle(Lifecycle.State.STARTED) {
+ combine(
+ imageAdapter.currentImagesCount,
+ switchState,
+ imageAdapter.isLoadingImages
+ ) { imageCount, isChecked, isLoadingImages ->
+ Triple(imageCount, isChecked, isLoadingImages)
+ }.collect { (imageCount, isChecked, isLoadingImages) ->
+ binding?.allImagesUploadedOrMarked?.isVisible =
+ !isLoadingImages && !isChecked && imageCount == 0 && (switch?.isVisible == true)
+ }
+ }
+ }
+ }
+
private fun onChangeSwitchState(checked: Boolean) {
if (checked) {
showAlreadyActionedImages = true
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.java
index d444148d4..223d028dc 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/ExploreFragment.java
@@ -1,5 +1,7 @@
package fr.free.nrw.commons.explore;
+import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_IDLE;
+
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -42,9 +44,13 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
@Named("default_preferences")
public JsonKvStore applicationKvStore;
- public void setScroll(boolean canScroll){
- if (binding != null)
- {
+ // Nearby map state (for if we came from Nearby fragment)
+ private double prevZoom;
+ private double prevLatitude;
+ private double prevLongitude;
+
+ public void setScroll(boolean canScroll) {
+ if (binding != null) {
binding.viewPager.setCanScroll(canScroll);
}
}
@@ -60,6 +66,7 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ loadNearbyMapData();
binding = FragmentExploreBinding.inflate(inflater, container, false);
viewPagerAdapter = new ViewPagerAdapter(getChildFragmentManager());
@@ -89,6 +96,11 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
});
setTabs();
setHasOptionsMenu(true);
+
+ // if we came from 'Show in Explore' in Nearby, jump to Map tab
+ if (isCameFromNearbyMap()) {
+ binding.viewPager.setCurrentItem(2);
+ }
return binding.getRoot();
}
@@ -108,6 +120,13 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
Bundle mapArguments = new Bundle();
mapArguments.putString("categoryName", EXPLORE_MAP);
+ // if we came from 'Show in Explore' in Nearby, pass on zoom and center to Explore map root
+ if (isCameFromNearbyMap()) {
+ mapArguments.putDouble("prev_zoom", prevZoom);
+ mapArguments.putDouble("prev_latitude", prevLatitude);
+ mapArguments.putDouble("prev_longitude", prevLongitude);
+ }
+
featuredRootFragment = new ExploreListRootFragment(featuredArguments);
mobileRootFragment = new ExploreListRootFragment(mobileArguments);
mapRootFragment = new ExploreMapRootFragment(mapArguments);
@@ -120,13 +139,35 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
fragmentList.add(mapRootFragment);
titleList.add(getString(R.string.explore_tab_title_map).toUpperCase(Locale.ROOT));
- ((MainActivity)getActivity()).showTabs();
+ ((MainActivity) getActivity()).showTabs();
((BaseActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
viewPagerAdapter.setTabData(fragmentList, titleList);
viewPagerAdapter.notifyDataSetChanged();
}
+ /**
+ * Fetch Nearby map camera data from fragment arguments if any.
+ */
+ public void loadNearbyMapData() {
+ // get fragment arguments
+ if (getArguments() != null) {
+ prevZoom = getArguments().getDouble("prev_zoom");
+ prevLatitude = getArguments().getDouble("prev_latitude");
+ prevLongitude = getArguments().getDouble("prev_longitude");
+ }
+ }
+
+ /**
+ * Checks if fragment arguments contain data from Nearby map. if present, then the user
+ * navigated from Nearby using 'Show in Explore'.
+ *
+ * @return true if user navigated from Nearby map
+ **/
+ public boolean isCameFromNearbyMap() {
+ return prevZoom != 0.0 || prevLatitude != 0.0 || prevLongitude != 0.0;
+ }
+
public boolean onBackPressed() {
if (binding.tabLayout.getSelectedTabPosition() == 0) {
if (featuredRootFragment.backPressed()) {
@@ -155,7 +196,38 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
*/
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.menu_search, menu);
+ // if logged in 'Show in Nearby' menu item is visible
+ if (applicationKvStore.getBoolean("login_skipped") == false) {
+ inflater.inflate(R.menu.explore_fragment_menu, menu);
+
+ MenuItem others = menu.findItem(R.id.list_item_show_in_nearby);
+
+ if (binding.viewPager.getCurrentItem() == 2) {
+ others.setVisible(true);
+ }
+
+ // if on Map tab, show all menu options, else only show search
+ binding.viewPager.addOnPageChangeListener(new OnPageChangeListener() {
+ @Override
+ public void onPageScrolled(int position, float positionOffset,
+ int positionOffsetPixels) {
+ }
+
+ @Override
+ public void onPageSelected(int position) {
+ others.setVisible((position == 2));
+ }
+
+ @Override
+ public void onPageScrollStateChanged(int state) {
+ if (state == SCROLL_STATE_IDLE && binding.viewPager.getCurrentItem() == 2) {
+ onPageSelected(2);
+ }
+ }
+ });
+ } else {
+ inflater.inflate(R.menu.menu_search, menu);
+ }
super.onCreateOptionsMenu(menu, inflater);
}
@@ -171,6 +243,9 @@ public class ExploreFragment extends CommonsDaggerSupportFragment {
case R.id.action_search:
ActivityUtils.startActivityWithFlags(getActivity(), SearchActivity.class);
return true;
+ case R.id.list_item_show_in_nearby:
+ mapRootFragment.loadNearbyMapFromExplore();
+ return true;
default:
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/ExploreMapRootFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/ExploreMapRootFragment.java
index 2653b4409..abf02758d 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/ExploreMapRootFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/ExploreMapRootFragment.java
@@ -39,10 +39,22 @@ public class ExploreMapRootFragment extends CommonsDaggerSupportFragment impleme
}
public ExploreMapRootFragment(Bundle bundle) {
+ // get fragment arguments
String title = bundle.getString("categoryName");
+ double zoom = bundle.getDouble("prev_zoom");
+ double latitude = bundle.getDouble("prev_latitude");
+ double longitude = bundle.getDouble("prev_longitude");
+
mapFragment = new ExploreMapFragment();
Bundle featuredArguments = new Bundle();
featuredArguments.putString("categoryName", title);
+
+ // if we came from 'Show in Explore' in Nearby, pass on zoom and center
+ if (zoom != 0.0 || latitude != 0.0 || longitude != 0.0) {
+ featuredArguments.putDouble("prev_zoom", zoom);
+ featuredArguments.putDouble("prev_latitude", latitude);
+ featuredArguments.putDouble("prev_longitude", longitude);
+ }
mapFragment.setArguments(featuredArguments);
}
@@ -198,7 +210,8 @@ public class ExploreMapRootFragment extends CommonsDaggerSupportFragment impleme
((MainActivity) getActivity()).showTabs();
return true;
- } if (mapFragment != null && mapFragment.isVisible()) {
+ }
+ if (mapFragment != null && mapFragment.isVisible()) {
if (mapFragment.backButtonClicked()) {
// Explore map fragment handled the event no further action required.
return true;
@@ -213,6 +226,10 @@ public class ExploreMapRootFragment extends CommonsDaggerSupportFragment impleme
return false;
}
+ public void loadNearbyMapFromExplore() {
+ mapFragment.loadNearbyMapFromExplore();
+ }
+
@Override
public void onDestroy() {
super.onDestroy();
diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
index fd1ea1f28..e64b96190 100644
--- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
@@ -38,6 +38,7 @@ import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
+import fr.free.nrw.commons.contributions.MainActivity;
import fr.free.nrw.commons.databinding.FragmentExploreMapBinding;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.explore.ExploreMapRootFragment;
@@ -115,6 +116,11 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
SystemThemeUtils systemThemeUtils;
LocationPermissionsHelper locationPermissionsHelper;
+ // Nearby map state (if we came from Nearby)
+ private double prevZoom;
+ private double prevLatitude;
+ private double prevLongitude;
+
private ExploreMapPresenter presenter;
public FragmentExploreMapBinding binding;
@@ -160,6 +166,7 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
ViewGroup container,
Bundle savedInstanceState
) {
+ loadNearbyMapData();
binding = FragmentExploreMapBinding.inflate(getLayoutInflater());
return binding.getRoot();
}
@@ -169,12 +176,14 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
super.onViewCreated(view, savedInstanceState);
setSearchThisAreaButtonVisibility(false);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- binding.tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution), Html.FROM_HTML_MODE_LEGACY));
+ binding.tvAttribution.setText(
+ Html.fromHtml(getString(R.string.map_attribution), Html.FROM_HTML_MODE_LEGACY));
} else {
binding.tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution)));
}
initNetworkBroadCastReceiver();
- locationPermissionsHelper = new LocationPermissionsHelper(getActivity(),locationManager,this);
+ locationPermissionsHelper = new LocationPermissionsHelper(getActivity(), locationManager,
+ this);
if (presenter == null) {
presenter = new ExploreMapPresenter(bookmarkLocationDao);
}
@@ -204,9 +213,14 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
scaleBarOverlay.setBackgroundPaint(barPaint);
scaleBarOverlay.enableScaleBar();
binding.mapView.getOverlays().add(scaleBarOverlay);
- binding.mapView.getZoomController().setVisibility(CustomZoomButtonsController.Visibility.NEVER);
+ binding.mapView.getZoomController()
+ .setVisibility(CustomZoomButtonsController.Visibility.NEVER);
binding.mapView.setMultiTouchControls(true);
- binding.mapView.getController().setZoom(ZOOM_LEVEL);
+
+ if (!isCameFromNearbyMap()) {
+ binding.mapView.getController().setZoom(ZOOM_LEVEL);
+ }
+
performMapReadyActions();
binding.mapView.getOverlays().add(new MapEventsOverlay(new MapEventsReceiver() {
@@ -295,7 +309,7 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
unregisterNetworkReceiver();
}
-
+
/**
* Unregisters the networkReceiver
*/
@@ -328,11 +342,51 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
isPermissionDenied = true;
}
lastKnownLocation = MapUtils.getDefaultLatLng();
- moveCameraToPosition(
- new GeoPoint(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()));
+
+ // if we came from 'Show in Explore' in Nearby, load Nearby map center and zoom
+ if (isCameFromNearbyMap()) {
+ moveCameraToPosition(
+ new GeoPoint(prevLatitude, prevLongitude),
+ prevZoom,
+ 1L
+ );
+ } else {
+ moveCameraToPosition(
+ new GeoPoint(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()));
+ }
presenter.onMapReady(exploreMapController);
}
+ /**
+ * Fetch Nearby map camera data from fragment arguments if any.
+ */
+ public void loadNearbyMapData() {
+ // get fragment arguments
+ if (getArguments() != null) {
+ prevZoom = getArguments().getDouble("prev_zoom");
+ prevLatitude = getArguments().getDouble("prev_latitude");
+ prevLongitude = getArguments().getDouble("prev_longitude");
+ }
+ }
+
+ /**
+ * Checks if fragment arguments contain data from Nearby map, indicating that the user navigated
+ * from Nearby using 'Show in Explore'.
+ *
+ * @return true if user navigated from Nearby map
+ **/
+ public boolean isCameFromNearbyMap() {
+ return prevZoom != 0.0 || prevLatitude != 0.0 || prevLongitude != 0.0;
+ }
+
+ public void loadNearbyMapFromExplore() {
+ ((MainActivity) getContext()).loadNearbyMapFromExplore(
+ binding.mapView.getZoomLevelDouble(),
+ binding.mapView.getMapCenter().getLatitude(),
+ binding.mapView.getMapCenter().getLongitude()
+ );
+ }
+
private void initViews() {
Timber.d("init views called");
initBottomSheets();
@@ -346,7 +400,8 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
*/
@SuppressLint("ClickableViewAccessibility")
private void initBottomSheets() {
- bottomSheetDetailsBehavior = BottomSheetBehavior.from(binding.bottomSheetDetailsBinding.getRoot());
+ bottomSheetDetailsBehavior = BottomSheetBehavior.from(
+ binding.bottomSheetDetailsBinding.getRoot());
bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
binding.bottomSheetDetailsBinding.getRoot().setVisibility(View.VISIBLE);
}
@@ -404,7 +459,8 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
if (currentLatLng == null) {
return;
}
- if (currentLatLng.equals(getLastMapFocus())) { // Means we are checking around current location
+ if (currentLatLng.equals(
+ getLastMapFocus())) { // Means we are checking around current location
nearbyPlacesInfoObservable = presenter.loadAttractionsFromLocation(currentLatLng,
getLastMapFocus(), true);
} else {
@@ -416,11 +472,12 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
.observeOn(AndroidSchedulers.mainThread())
.subscribe(explorePlacesInfo -> {
mediaList = explorePlacesInfo.mediaList;
- if(mediaList == null) {
+ if (mediaList == null) {
showResponseMessage(getString(R.string.no_pictures_in_this_area));
}
updateMapMarkers(explorePlacesInfo);
- lastMapFocus = new GeoPoint(currentLatLng.getLatitude(), currentLatLng.getLongitude());
+ lastMapFocus = new GeoPoint(currentLatLng.getLatitude(),
+ currentLatLng.getLongitude());
},
throwable -> {
Timber.d(throwable);
@@ -474,9 +531,9 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
locationManager.requestLocationUpdatesFromProvider(LocationManager.NETWORK_PROVIDER);
locationManager.requestLocationUpdatesFromProvider(LocationManager.GPS_PROVIDER);
setProgressBarVisibility(true);
- }
- else {
- locationPermissionsHelper.showLocationOffDialog(getActivity(), R.string.ask_to_turn_location_on_text);
+ } else {
+ locationPermissionsHelper.showLocationOffDialog(getActivity(),
+ R.string.ask_to_turn_location_on_text);
}
presenter.onMapReady(exploreMapController);
registerUnregisterLocationListener(false);
@@ -508,7 +565,8 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
recenterToUserLocation = true;
return;
}
- recenterMarkerToPosition(new GeoPoint(currentLatLng.getLatitude(), currentLatLng.getLongitude()));
+ recenterMarkerToPosition(
+ new GeoPoint(currentLatLng.getLatitude(), currentLatLng.getLongitude()));
binding.mapView.getController()
.animateTo(new GeoPoint(currentLatLng.getLatitude(), currentLatLng.getLongitude()));
if (lastMapFocus != null) {
@@ -545,10 +603,12 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
* @param place Place of clicked nearby marker
*/
private void passInfoToSheet(final Place place) {
- binding.bottomSheetDetailsBinding.directionsButton.setOnClickListener(view -> Utils.handleGeoCoordinates(getActivity(),
- place.getLocation()));
+ binding.bottomSheetDetailsBinding.directionsButton.setOnClickListener(
+ view -> Utils.handleGeoCoordinates(getActivity(),
+ place.getLocation(), binding.mapView.getZoomLevelDouble()));
- binding.bottomSheetDetailsBinding.commonsButton.setVisibility(place.hasCommonsLink() ? View.VISIBLE : View.GONE);
+ binding.bottomSheetDetailsBinding.commonsButton.setVisibility(
+ place.hasCommonsLink() ? View.VISIBLE : View.GONE);
binding.bottomSheetDetailsBinding.commonsButton.setOnClickListener(
view -> Utils.handleWebUrl(getContext(), place.siteLinks.getCommonsLink()));
@@ -562,7 +622,8 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
}
index++;
}
- binding.bottomSheetDetailsBinding.title.setText(place.name.substring(5, place.name.lastIndexOf(".")));
+ binding.bottomSheetDetailsBinding.title.setText(
+ place.name.substring(5, place.name.lastIndexOf(".")));
binding.bottomSheetDetailsBinding.category.setText(place.distance);
// Remove label since it is double information
String descriptionText = place.getLongDescription()
@@ -640,40 +701,43 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
* @param nearbyBaseMarker The NearbyBaseMarker object representing the marker to be added.
*/
private void addMarkerToMap(BaseMarker nearbyBaseMarker) {
- ArrayList items = new ArrayList<>();
- Bitmap icon = nearbyBaseMarker.getIcon();
- Drawable d = new BitmapDrawable(getResources(), icon);
- GeoPoint point = new GeoPoint(
- nearbyBaseMarker.getPlace().location.getLatitude(),
- nearbyBaseMarker.getPlace().location.getLongitude());
- OverlayItem item = new OverlayItem(nearbyBaseMarker.getPlace().name, null,
- point);
- item.setMarker(d);
- items.add(item);
- ItemizedOverlayWithFocus overlay = new ItemizedOverlayWithFocus(items,
- new OnItemGestureListener() {
- @Override
- public boolean onItemSingleTapUp(int index, OverlayItem item) {
- final Place place = nearbyBaseMarker.getPlace();
- if (clickedMarker != null) {
- removeMarker(clickedMarker);
- addMarkerToMap(clickedMarker);
- bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
- bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+ if (isAttachedToActivity()) {
+ ArrayList items = new ArrayList<>();
+ Bitmap icon = nearbyBaseMarker.getIcon();
+ Drawable d = new BitmapDrawable(getResources(), icon);
+ GeoPoint point = new GeoPoint(
+ nearbyBaseMarker.getPlace().location.getLatitude(),
+ nearbyBaseMarker.getPlace().location.getLongitude());
+ OverlayItem item = new OverlayItem(nearbyBaseMarker.getPlace().name, null,
+ point);
+ item.setMarker(d);
+ items.add(item);
+ ItemizedOverlayWithFocus overlay = new ItemizedOverlayWithFocus(items,
+ new OnItemGestureListener() {
+ @Override
+ public boolean onItemSingleTapUp(int index, OverlayItem item) {
+ final Place place = nearbyBaseMarker.getPlace();
+ if (clickedMarker != null) {
+ removeMarker(clickedMarker);
+ addMarkerToMap(clickedMarker);
+ bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+ bottomSheetDetailsBehavior.setState(
+ BottomSheetBehavior.STATE_COLLAPSED);
+ }
+ clickedMarker = nearbyBaseMarker;
+ passInfoToSheet(place);
+ return true;
}
- clickedMarker = nearbyBaseMarker;
- passInfoToSheet(place);
- return true;
- }
- @Override
- public boolean onItemLongPress(int index, OverlayItem item) {
- return false;
- }
- }, getContext());
+ @Override
+ public boolean onItemLongPress(int index, OverlayItem item) {
+ return false;
+ }
+ }, getContext());
- overlay.setFocusItemsOnTap(true);
- binding.mapView.getOverlays().add(overlay); // Add the overlay to the map
+ overlay.setFocusItemsOnTap(true);
+ binding.mapView.getOverlays().add(overlay); // Add the overlay to the map
+ }
}
/**
@@ -707,68 +771,72 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
*/
@Override
public void clearAllMarkers() {
- binding.mapView.getOverlayManager().clear();
- GeoPoint geoPoint = mapCenter;
- if (geoPoint != null) {
- List overlays = binding.mapView.getOverlays();
- ScaleDiskOverlay diskOverlay =
- new ScaleDiskOverlay(this.getContext(),
- geoPoint, 2000, GeoConstants.UnitOfMeasure.foot);
- Paint circlePaint = new Paint();
- circlePaint.setColor(Color.rgb(128, 128, 128));
- circlePaint.setStyle(Paint.Style.STROKE);
- circlePaint.setStrokeWidth(2f);
- diskOverlay.setCirclePaint2(circlePaint);
- Paint diskPaint = new Paint();
- diskPaint.setColor(Color.argb(40, 128, 128, 128));
- diskPaint.setStyle(Paint.Style.FILL_AND_STROKE);
- diskOverlay.setCirclePaint1(diskPaint);
- diskOverlay.setDisplaySizeMin(900);
- diskOverlay.setDisplaySizeMax(1700);
- binding.mapView.getOverlays().add(diskOverlay);
- org.osmdroid.views.overlay.Marker startMarker = new org.osmdroid.views.overlay.Marker(
- binding.mapView);
- startMarker.setPosition(geoPoint);
- startMarker.setAnchor(org.osmdroid.views.overlay.Marker.ANCHOR_CENTER,
- org.osmdroid.views.overlay.Marker.ANCHOR_BOTTOM);
- startMarker.setIcon(
- ContextCompat.getDrawable(this.getContext(), R.drawable.current_location_marker));
- startMarker.setTitle("Your Location");
- startMarker.setTextLabelFontSize(24);
- binding.mapView.getOverlays().add(startMarker);
- }
- ScaleBarOverlay scaleBarOverlay = new ScaleBarOverlay(binding.mapView);
- scaleBarOverlay.setScaleBarOffset(15, 25);
- Paint barPaint = new Paint();
- barPaint.setARGB(200, 255, 250, 250);
- scaleBarOverlay.setBackgroundPaint(barPaint);
- scaleBarOverlay.enableScaleBar();
- binding.mapView.getOverlays().add(scaleBarOverlay);
- binding.mapView.getOverlays().add(new MapEventsOverlay(new MapEventsReceiver() {
- @Override
- public boolean singleTapConfirmedHelper(GeoPoint p) {
- if (clickedMarker != null) {
- removeMarker(clickedMarker);
- addMarkerToMap(clickedMarker);
- binding.mapView.invalidate();
- } else {
- Timber.e("CLICKED MARKER IS NULL");
- }
- if (bottomSheetDetailsBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
- // Back should first hide the bottom sheet if it is expanded
- bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
- } else if (isDetailsBottomSheetVisible()) {
- hideBottomDetailsSheet();
- }
- return true;
+ if (isAttachedToActivity()) {
+ binding.mapView.getOverlayManager().clear();
+ GeoPoint geoPoint = mapCenter;
+ if (geoPoint != null) {
+ List overlays = binding.mapView.getOverlays();
+ ScaleDiskOverlay diskOverlay =
+ new ScaleDiskOverlay(this.getContext(),
+ geoPoint, 2000, GeoConstants.UnitOfMeasure.foot);
+ Paint circlePaint = new Paint();
+ circlePaint.setColor(Color.rgb(128, 128, 128));
+ circlePaint.setStyle(Paint.Style.STROKE);
+ circlePaint.setStrokeWidth(2f);
+ diskOverlay.setCirclePaint2(circlePaint);
+ Paint diskPaint = new Paint();
+ diskPaint.setColor(Color.argb(40, 128, 128, 128));
+ diskPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+ diskOverlay.setCirclePaint1(diskPaint);
+ diskOverlay.setDisplaySizeMin(900);
+ diskOverlay.setDisplaySizeMax(1700);
+ binding.mapView.getOverlays().add(diskOverlay);
+ org.osmdroid.views.overlay.Marker startMarker = new org.osmdroid.views.overlay.Marker(
+ binding.mapView);
+ startMarker.setPosition(geoPoint);
+ startMarker.setAnchor(org.osmdroid.views.overlay.Marker.ANCHOR_CENTER,
+ org.osmdroid.views.overlay.Marker.ANCHOR_BOTTOM);
+ startMarker.setIcon(
+ ContextCompat.getDrawable(this.getContext(),
+ R.drawable.current_location_marker));
+ startMarker.setTitle("Your Location");
+ startMarker.setTextLabelFontSize(24);
+ binding.mapView.getOverlays().add(startMarker);
}
+ ScaleBarOverlay scaleBarOverlay = new ScaleBarOverlay(binding.mapView);
+ scaleBarOverlay.setScaleBarOffset(15, 25);
+ Paint barPaint = new Paint();
+ barPaint.setARGB(200, 255, 250, 250);
+ scaleBarOverlay.setBackgroundPaint(barPaint);
+ scaleBarOverlay.enableScaleBar();
+ binding.mapView.getOverlays().add(scaleBarOverlay);
+ binding.mapView.getOverlays().add(new MapEventsOverlay(new MapEventsReceiver() {
+ @Override
+ public boolean singleTapConfirmedHelper(GeoPoint p) {
+ if (clickedMarker != null) {
+ removeMarker(clickedMarker);
+ addMarkerToMap(clickedMarker);
+ binding.mapView.invalidate();
+ } else {
+ Timber.e("CLICKED MARKER IS NULL");
+ }
+ if (bottomSheetDetailsBehavior.getState()
+ == BottomSheetBehavior.STATE_EXPANDED) {
+ // Back should first hide the bottom sheet if it is expanded
+ bottomSheetDetailsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+ } else if (isDetailsBottomSheetVisible()) {
+ hideBottomDetailsSheet();
+ }
+ return true;
+ }
- @Override
- public boolean longPressHelper(GeoPoint p) {
- return false;
- }
- }));
- binding.mapView.setMultiTouchControls(true);
+ @Override
+ public boolean longPressHelper(GeoPoint p) {
+ return false;
+ }
+ }));
+ binding.mapView.setMultiTouchControls(true);
+ }
}
/**
@@ -825,6 +893,18 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
binding.mapView.getController().animateTo(geoPoint);
}
+ /**
+ * Moves the camera of the map view to the specified GeoPoint at specified zoom level and speed
+ * using an animation.
+ *
+ * @param geoPoint The GeoPoint representing the new camera position for the map.
+ * @param zoom Zoom level of the map camera
+ * @param speed Speed of animation
+ */
+ private void moveCameraToPosition(GeoPoint geoPoint, double zoom, long speed) {
+ binding.mapView.getController().animateTo(geoPoint, zoom, speed);
+ }
+
@Override
public fr.free.nrw.commons.location.LatLng getLastMapFocus() {
return lastMapFocus == null ? getMapCenter() : new fr.free.nrw.commons.location.LatLng(
@@ -850,14 +930,17 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
-0.07483536015053005, 1f);
}
}
- moveCameraToPosition(new GeoPoint(latLnge.getLatitude(),latLnge.getLongitude()));
+ if (!isCameFromNearbyMap()) {
+ moveCameraToPosition(new GeoPoint(latLnge.getLatitude(), latLnge.getLongitude()));
+ }
return latLnge;
}
@Override
public fr.free.nrw.commons.location.LatLng getMapFocus() {
fr.free.nrw.commons.location.LatLng mapFocusedLatLng = new fr.free.nrw.commons.location.LatLng(
- binding.mapView.getMapCenter().getLatitude(), binding.mapView.getMapCenter().getLongitude(), 100);
+ binding.mapView.getMapCenter().getLatitude(),
+ binding.mapView.getMapCenter().getLongitude(), 100);
return mapFocusedLatLng;
}
@@ -910,9 +993,19 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
};
}
- @Override
- public void onLocationPermissionDenied(String toastMessage) {}
+ /**
+ * helper function to confirm that this fragment has been attached.
+ **/
+ public boolean isAttachedToActivity() {
+ boolean attached = isVisible() && getActivity() != null;
+ return attached;
+ }
@Override
- public void onLocationPermissionGranted() {}
+ public void onLocationPermissionDenied(String toastMessage) {
+ }
+
+ @Override
+ public void onLocationPermissionGranted() {
+ }
}
diff --git a/app/src/main/java/fr/free/nrw/commons/location/LatLng.kt b/app/src/main/java/fr/free/nrw/commons/location/LatLng.kt
index 7dd9a49ce..5ca75b38c 100644
--- a/app/src/main/java/fr/free/nrw/commons/location/LatLng.kt
+++ b/app/src/main/java/fr/free/nrw/commons/location/LatLng.kt
@@ -123,10 +123,13 @@ data class LatLng(
/**
* Gets a URI for a Google Maps intent at the location.
+ *
+ * @paraam zoom The zoom level
+ * @return URI for the intent
*/
- fun getGmmIntentUri(): Uri {
- return Uri.parse("geo:$latitude,$longitude?z=16")
- }
+ fun getGmmIntentUri(zoom: Double): Uri = Uri.parse(
+ "geo:$latitude,$longitude?q=$latitude,$longitude&z=${zoom}"
+ )
override fun writeToParcel(parcel: Parcel, flags: Int) {
parcel.writeDouble(latitude)
diff --git a/app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt b/app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt
index 080bc058d..2a7b7713b 100644
--- a/app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt
@@ -430,7 +430,11 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
else -> null
}
- position?.let { Utils.handleGeoCoordinates(this, it) }
+ position?.let {
+ mapView?.zoomLevelDouble?.let { zoomLevel ->
+ Utils.handleGeoCoordinates(this, it, zoomLevel)
+ } ?: Utils.handleGeoCoordinates(this, it)
+ }
}
/**
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
index 4c993fb80..d714b094a 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
@@ -650,10 +650,8 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
}
private fun onDepictionsLoaded(idAndCaptions: List) {
- binding.depictsLayout.visibility =
- if (idAndCaptions.isEmpty()) View.GONE else View.VISIBLE
- binding.depictionsEditButton.visibility =
- if (idAndCaptions.isEmpty()) View.GONE else View.VISIBLE
+ binding.depictsLayout.visibility = View.VISIBLE
+ binding.depictionsEditButton.visibility = View.VISIBLE
buildDepictionList(idAndCaptions)
}
@@ -863,8 +861,22 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
*/
private fun buildDepictionList(idAndCaptions: List) {
binding.mediaDetailDepictionContainer.removeAllViews()
+
+ // Create a mutable list from the original list
+ val mutableIdAndCaptions = idAndCaptions.toMutableList()
+
+ if (mutableIdAndCaptions.isEmpty()) {
+ // Create a placeholder IdAndCaptions object and add it to the list
+ mutableIdAndCaptions.add(
+ IdAndCaptions(
+ id = media?.pageId ?: "", // Use an empty string if media?.pageId is null
+ captions = mapOf(Locale.getDefault().language to getString(R.string.detail_panel_cats_none)) // Create a Map with the language as the key and the message as the value
+ )
+ )
+ }
+
val locale: String = Locale.getDefault().language
- for (idAndCaption: IdAndCaptions in idAndCaptions) {
+ for (idAndCaption: IdAndCaptions in mutableIdAndCaptions) {
binding.mediaDetailDepictionContainer.addView(
buildDepictLabel(
getDepictionCaption(idAndCaption, locale),
@@ -875,6 +887,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
}
}
+
private fun getDepictionCaption(idAndCaption: IdAndCaptions, locale: String): String? {
// Check if the Depiction Caption is available in user's locale
// if not then check for english, else show any available.
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
index f3224de7f..95f19f699 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
@@ -233,6 +233,11 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
private Place nearestPlace;
private volatile boolean stopQuery;
+ // Explore map data (for if we came from Explore)
+ private double prevZoom;
+ private double prevLatitude;
+ private double prevLongitude;
+
private final Handler searchHandler = new Handler();
private Runnable searchRunnable;
@@ -247,27 +252,28 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
private final ActivityResultLauncher galleryPickLauncherForResult =
registerForActivityResult(new StartActivityForResult(),
- result -> {
- controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {
- controller.onPictureReturnedFromGallery(result, requireActivity(), callbacks);
+ result -> {
+ controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {
+ controller.onPictureReturnedFromGallery(result, requireActivity(), callbacks);
+ });
});
- });
private final ActivityResultLauncher customSelectorLauncherForResult =
registerForActivityResult(new StartActivityForResult(),
- result -> {
- controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {
- controller.onPictureReturnedFromCustomSelector(result, requireActivity(), callbacks);
+ result -> {
+ controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {
+ controller.onPictureReturnedFromCustomSelector(result, requireActivity(),
+ callbacks);
+ });
});
- });
private final ActivityResultLauncher cameraPickLauncherForResult =
registerForActivityResult(new StartActivityForResult(),
- result -> {
- controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {
- controller.onPictureReturnedFromCamera(result, requireActivity(), callbacks);
+ result -> {
+ controller.handleActivityResultWithCallback(requireActivity(), callbacks -> {
+ controller.onPictureReturnedFromCamera(result, requireActivity(), callbacks);
+ });
});
- });
private ActivityResultLauncher inAppCameraLocationPermissionLauncher = registerForActivityResult(
new RequestMultiplePermissions(),
@@ -337,12 +343,15 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
@Override
public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
final Bundle savedInstanceState) {
+ loadExploreMapData();
+
binding = FragmentNearbyParentBinding.inflate(inflater, container, false);
view = binding.getRoot();
initNetworkBroadCastReceiver();
scope = LifecycleOwnerKt.getLifecycleScope(getViewLifecycleOwner());
- presenter = new NearbyParentFragmentPresenter(bookmarkLocationDao, placesRepository, nearbyController);
+ presenter = new NearbyParentFragmentPresenter(bookmarkLocationDao, placesRepository,
+ nearbyController);
progressDialog = new ProgressDialog(getActivity());
progressDialog.setCancelable(false);
progressDialog.setMessage("Saving in progress...");
@@ -359,6 +368,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
inflater.inflate(R.menu.nearby_fragment_menu, menu);
MenuItem refreshButton = menu.findItem(R.id.item_refresh);
MenuItem listMenu = menu.findItem(R.id.list_sheet);
+ MenuItem showInExploreButton = menu.findItem(R.id.list_item_show_in_explore);
MenuItem saveAsGPXButton = menu.findItem(R.id.list_item_gpx);
MenuItem saveAsKMLButton = menu.findItem(R.id.list_item_kml);
refreshButton.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@@ -379,6 +389,17 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
return false;
}
});
+ showInExploreButton.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(@NonNull MenuItem item) {
+ ((MainActivity) getContext()).loadExploreMapFromNearby(
+ binding.map.getZoomLevelDouble(),
+ binding.map.getMapCenter().getLatitude(),
+ binding.map.getMapCenter().getLongitude()
+ );
+ return false;
+ }
+ });
saveAsGPXButton.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
@@ -467,6 +488,14 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
binding.map.getOverlays().add(scaleBarOverlay);
binding.map.getZoomController().setVisibility(Visibility.NEVER);
binding.map.getController().setZoom(ZOOM_LEVEL);
+ // if we came from Explore map using 'Show in Nearby', load Explore map camera position
+ if (isCameFromExploreMap()) {
+ moveCameraToPosition(
+ new GeoPoint(prevLatitude, prevLongitude),
+ prevZoom,
+ 1L
+ );
+ }
binding.map.getOverlays().add(mapEventsOverlay);
binding.map.addMapListener(new MapListener() {
@@ -489,11 +518,14 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
}
initNearbyFilter();
addCheckBoxCallback();
- moveCameraToPosition(lastMapFocus);
+ if (!isCameFromExploreMap()) {
+ moveCameraToPosition(lastMapFocus);
+ }
initRvNearbyList();
onResume();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- binding.tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution), Html.FROM_HTML_MODE_LEGACY));
+ binding.tvAttribution.setText(
+ Html.fromHtml(getString(R.string.map_attribution), Html.FROM_HTML_MODE_LEGACY));
} else {
//noinspection deprecation
binding.tvAttribution.setText(Html.fromHtml(getString(R.string.map_attribution)));
@@ -545,6 +577,28 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
}
}
+ /**
+ * Fetch Explore map camera data from fragment arguments if any.
+ */
+ public void loadExploreMapData() {
+ // get fragment arguments
+ if (getArguments() != null) {
+ prevZoom = getArguments().getDouble("prev_zoom");
+ prevLatitude = getArguments().getDouble("prev_latitude");
+ prevLongitude = getArguments().getDouble("prev_longitude");
+ }
+ }
+
+ /**
+ * Checks if fragment arguments contain data from Explore map. if present, then the user
+ * navigated from Explore using 'Show in Nearby'.
+ *
+ * @return true if user navigated from Explore map
+ **/
+ public boolean isCameFromExploreMap() {
+ return prevZoom != 0.0 || prevLatitude != 0.0 || prevLongitude != 0.0;
+ }
+
/**
* Initialise background based on theme, this should be doe ideally via styles, that would need
* another refactor
@@ -625,7 +679,9 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
mapCenter = targetP;
binding.map.getController().setCenter(targetP);
recenterMarkerToPosition(targetP);
- moveCameraToPosition(targetP);
+ if (!isCameFromExploreMap()) {
+ moveCameraToPosition(targetP);
+ }
} else if (locationManager.isGPSProviderEnabled()
|| locationManager.isNetworkProviderEnabled()) {
locationManager.requestLocationUpdatesFromProvider(LocationManager.NETWORK_PROVIDER);
@@ -669,7 +725,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
} else {
lastKnownLocation = MapUtils.getDefaultLatLng();
}
- if (binding.map != null) {
+ if (binding.map != null && !isCameFromExploreMap()) {
moveCameraToPosition(
new GeoPoint(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()));
}
@@ -739,8 +795,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
}
/**
- * Determines the number of spans (columns) in the RecyclerView based on device orientation
- * and adapter item count.
+ * Determines the number of spans (columns) in the RecyclerView based on device orientation and
+ * adapter item count.
*
* @return The number of spans to be used in the RecyclerView.
*/
@@ -1175,7 +1231,6 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
/**
* Clears the Nearby local cache and then calls for pin details to be fetched afresh.
- *
*/
private void emptyCache() {
// reload the map once the cache is cleared
@@ -1338,7 +1393,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
}
/**
- * Fetches and updates the data for a specific place, then updates the corresponding marker on the map.
+ * Fetches and updates the data for a specific place, then updates the corresponding marker on
+ * the map.
*
* @param entity The entity ID of the place.
* @param place The Place object containing the initial place data.
@@ -1469,9 +1525,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
}
/**
- * Stops any ongoing queries and clears all disposables.
- * This method sets the stopQuery flag to true and clears the compositeDisposable
- * to prevent any further processing.
+ * Stops any ongoing queries and clears all disposables. This method sets the stopQuery flag to
+ * true and clears the compositeDisposable to prevent any further processing.
*/
@Override
public void stopQuery() {
@@ -1624,7 +1679,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
new Builder(getContext())
.setMessage(R.string.login_alert_message)
.setCancelable(false)
- .setNegativeButton(R.string.cancel, (dialog, which) -> {})
+ .setNegativeButton(R.string.cancel, (dialog, which) -> {
+ })
.setPositiveButton(R.string.login, (dialog, which) -> {
// logout of the app
BaseLogoutListener logoutListener = new BaseLogoutListener(getActivity());
@@ -1743,7 +1799,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
final boolean filterForPlaceState,
final boolean filterForAllNoneType) {
final boolean displayExists = false;
- final boolean displayNeedsPhoto= false;
+ final boolean displayNeedsPhoto = false;
final boolean displayWlm = false;
if (selectedLabels == null || selectedLabels.size() == 0) {
replaceMarkerOverlays(NearbyController.markerLabelList);
@@ -1903,8 +1959,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
/**
* Adds multiple markers representing places to the map and handles item gestures.
*
- * @param markerPlaceGroups The list of marker place groups containing the places and
- * their bookmarked status
+ * @param markerPlaceGroups The list of marker place groups containing the places and their
+ * bookmarked status
*/
@Override
public void replaceMarkerOverlays(final List markerPlaceGroups) {
@@ -1913,7 +1969,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
for (int i = markerPlaceGroups.size() - 1; i >= 0; i--) {
newMarkers.add(
convertToMarker(markerPlaceGroups.get(i).getPlace(),
- markerPlaceGroups.get(i).getIsBookmarked())
+ markerPlaceGroups.get(i).getIsBookmarked())
);
}
clearAllMarkers();
@@ -2103,7 +2159,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
if (binding.fabCamera.isShown()) {
Timber.d("Camera button tapped. Place: %s", selectedPlace.toString());
storeSharedPrefs(selectedPlace);
- controller.initiateCameraPick(getActivity(), inAppCameraLocationPermissionLauncher, cameraPickLauncherForResult);
+ controller.initiateCameraPick(getActivity(), inAppCameraLocationPermissionLauncher,
+ cameraPickLauncherForResult);
}
});
@@ -2121,7 +2178,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
if (binding.fabCustomGallery.isShown()) {
Timber.d("Gallery button tapped. Place: %s", selectedPlace.toString());
storeSharedPrefs(selectedPlace);
- controller.initiateCustomGalleryPickWithPermission(getActivity(), customSelectorLauncherForResult);
+ controller.initiateCustomGalleryPickWithPermission(getActivity(),
+ customSelectorLauncherForResult);
}
});
}
@@ -2296,6 +2354,18 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
binding.map.getController().animateTo(geoPoint);
}
+ /**
+ * Moves the camera of the map view to the specified GeoPoint at specified zoom level and speed
+ * using an animation.
+ *
+ * @param geoPoint The GeoPoint representing the new camera position for the map.
+ * @param zoom Zoom level of the map camera
+ * @param speed Speed of animation
+ */
+ private void moveCameraToPosition(GeoPoint geoPoint, double zoom, long speed) {
+ binding.map.getController().animateTo(geoPoint, zoom, speed);
+ }
+
@Override
public void onBottomSheetItemClick(@Nullable View view, int position) {
BottomSheetItem item = dataList.get(position);
@@ -2309,7 +2379,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
updateBookmarkButtonImage(selectedPlace);
break;
case R.drawable.ic_directions_black_24dp:
- Utils.handleGeoCoordinates(this.getContext(), selectedPlace.getLocation());
+ Utils.handleGeoCoordinates(this.getContext(), selectedPlace.getLocation(),
+ binding.map.getZoomLevelDouble());
break;
case R.drawable.ic_wikidata_logo_24dp:
Utils.handleWebUrl(this.getContext(), selectedPlace.siteLinks.getWikidataLink());
diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizController.kt b/app/src/main/java/fr/free/nrw/commons/quiz/QuizController.kt
index 3cb4f52a6..d9b6b7e52 100644
--- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizController.kt
+++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizController.kt
@@ -14,11 +14,15 @@ class QuizController {
private val quiz: ArrayList = ArrayList()
- private val URL_FOR_SELFIE = "https://i.imgur.com/0fMYcpM.jpg"
- private val URL_FOR_TAJ_MAHAL = "https://upload.wikimedia.org/wikipedia/commons/1/15/Taj_Mahal-03.jpg"
- private val URL_FOR_BLURRY_IMAGE = "https://i.imgur.com/Kepb5jR.jpg"
- private val URL_FOR_SCREENSHOT = "https://upload.wikimedia.org/wikipedia/commons/thumb/8/8b/Social_media_app_mockup_screenshot.svg/500px-Social_media_app_mockup_screenshot.svg.png"
- private val URL_FOR_EVENT = "https://upload.wikimedia.org/wikipedia/commons/5/51/HouseBuildingInNorthernVietnam.jpg"
+ companion object{
+
+ const val URL_FOR_SELFIE = "https://i.imgur.com/0fMYcpM.jpg"
+ const val URL_FOR_TAJ_MAHAL = "https://upload.wikimedia.org/wikipedia/commons/1/15/Taj_Mahal-03.jpg"
+ const val URL_FOR_BLURRY_IMAGE = "https://i.imgur.com/Kepb5jR.jpg"
+ const val URL_FOR_SCREENSHOT = "https://upload.wikimedia.org/wikipedia/commons/thumb/8/8b/Social_media_app_mockup_screenshot.svg/500px-Social_media_app_mockup_screenshot.svg.png"
+ const val URL_FOR_EVENT = "https://upload.wikimedia.org/wikipedia/commons/5/51/HouseBuildingInNorthernVietnam.jpg"
+ }
+
fun initialize(context: Context) {
val q1 = QuizQuestion(
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt
index 40eb24ed0..01a1005fe 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt
@@ -45,12 +45,12 @@ class ReviewActivity : BaseActivity() {
private var hasNonHiddenCategories = false
var media: Media? = null
- private val SAVED_MEDIA = "saved_media"
+ private val savedMedia = "saved_media"
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
media?.let {
- outState.putParcelable(SAVED_MEDIA, it)
+ outState.putParcelable(savedMedia, it)
}
}
@@ -90,8 +90,8 @@ class ReviewActivity : BaseActivity() {
PorterDuff.Mode.SRC_IN
)
- if (savedInstanceState?.getParcelable(SAVED_MEDIA) != null) {
- updateImage(savedInstanceState.getParcelable(SAVED_MEDIA)!!)
+ if (savedInstanceState?.getParcelable(savedMedia) != null) {
+ updateImage(savedInstanceState.getParcelable(savedMedia)!!)
setUpMediaDetailOnOrientation()
} else {
runRandomizer()
@@ -188,7 +188,7 @@ class ReviewActivity : BaseActivity() {
return
}
- binding.reviewImageView.setImageURI(media.imageUrl)
+ binding.reviewImageView.setImageURI(media.thumbUrl)
reviewController.onImageRefreshed(media) // filename is updated
compositeDisposable.add(
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.kt
index f6da76bba..2bc333505 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.kt
@@ -31,7 +31,7 @@ class ReviewImageFragment : CommonsDaggerSupportFragment() {
lateinit var sessionManager: SessionManager
// Constant variable used to store user's key name for onSaveInstanceState method
- private val SAVED_USER = "saved_user"
+ private val savedUser = "saved_user"
// Variable that stores the value of user
private var user: String? = null
@@ -129,7 +129,7 @@ class ReviewImageFragment : CommonsDaggerSupportFragment() {
question = getString(R.string.review_thanks)
user = reviewActivity.reviewController.firstRevision?.user()
- ?: savedInstanceState?.getString(SAVED_USER)
+ ?: savedInstanceState?.getString(savedUser)
//if the user is null because of whatsoever reason, review will not be sent anyways
if (!user.isNullOrEmpty()) {
@@ -172,7 +172,7 @@ class ReviewImageFragment : CommonsDaggerSupportFragment() {
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
//Save user name when configuration changes happen
- outState.putString(SAVED_USER, user)
+ outState.putString(savedUser, user)
}
private val reviewCallback: ReviewController.ReviewCallback
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 2f293937c..161927d03 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
@@ -33,6 +33,7 @@ import com.karumi.dexter.MultiplePermissionsReport
import com.karumi.dexter.PermissionToken
import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
+import fr.free.nrw.commons.BuildConfig.MOBILE_META_URL
import fr.free.nrw.commons.R
import fr.free.nrw.commons.Utils
import fr.free.nrw.commons.activity.SingleWebViewActivity
@@ -85,7 +86,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
private var languageHistoryListView: ListView? = null
private lateinit var inAppCameraLocationPermissionLauncher: ActivityResultLauncher>
- private val GET_CONTENT_PICKER_HELP_URL = "https://commons-app.github.io/docs.html#get-content"
private val cameraPickLauncherForResult: ActivityResultLauncher =
registerForActivityResult(StartActivityForResult()) { result ->
@@ -271,6 +271,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
findPreference("managed_exif_tags")?.isEnabled = false
findPreference("openDocumentPhotoPickerPref")?.isEnabled = false
findPreference("inAppCameraLocationPref")?.isEnabled = false
+ findPreference("vanishAccount")?.isEnabled = false
}
}
@@ -511,6 +512,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
@Suppress("LongLine")
companion object {
+ const val GET_CONTENT_PICKER_HELP_URL = "https://commons-app.github.io/docs.html#get-content"
private const val VANISH_ACCOUNT_URL = "https://meta.m.wikimedia.org/wiki/Special:Contact/accountvanishapps"
private const val VANISH_ACCOUNT_SUCCESS_URL = "https://meta.m.wikimedia.org/wiki/Special:GlobalVanishRequest/vanished"
/**
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.kt b/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.kt
index ba9dc147c..fca10be1e 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.kt
@@ -10,7 +10,6 @@ import fr.free.nrw.commons.utils.ImageUtils.IMAGE_KEEP
import fr.free.nrw.commons.utils.ImageUtils.IMAGE_OK
import fr.free.nrw.commons.utils.ImageUtilsWrapper
import io.reactivex.Single
-import io.reactivex.functions.Function
import io.reactivex.schedulers.Schedulers
import org.apache.commons.lang3.StringUtils
import timber.log.Timber
@@ -26,7 +25,7 @@ class ImageProcessingService @Inject constructor(
private val fileUtilsWrapper: FileUtilsWrapper,
private val imageUtilsWrapper: ImageUtilsWrapper,
private val readFBMD: ReadFBMD,
- private val EXIFReader: EXIFReader,
+ private val exifReader: EXIFReader,
private val mediaClient: MediaClient
) {
/**
@@ -94,7 +93,7 @@ class ImageProcessingService @Inject constructor(
* the presence of some basic Exif metadata.
*/
private fun checkEXIF(filepath: String): Single =
- EXIFReader.processMetadata(filepath)
+ exifReader.processMetadata(filepath)
/**
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt
index daf158fc1..df3b33bf6 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt
+++ b/app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.kt
@@ -16,6 +16,9 @@ import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import fr.free.nrw.commons.R
import fr.free.nrw.commons.upload.UploadActivity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
object PermissionUtils {
@@ -130,7 +133,7 @@ object PermissionUtils {
vararg permissions: String
) {
if (hasPartialAccess(activity)) {
- Thread(onPermissionGranted).start()
+ CoroutineScope(Dispatchers.Main).launch { onPermissionGranted.run() }
return
}
checkPermissionsAndPerformAction(
@@ -166,13 +169,15 @@ object PermissionUtils {
rationaleMessage: Int,
vararg permissions: String
) {
+ val scope = CoroutineScope(Dispatchers.Main)
+
Dexter.withActivity(activity)
.withPermissions(*permissions)
.withListener(object : MultiplePermissionsListener {
override fun onPermissionsChecked(report: MultiplePermissionsReport) {
when {
report.areAllPermissionsGranted() || hasPartialAccess(activity) ->
- Thread(onPermissionGranted).start()
+ scope.launch { onPermissionGranted.run() }
report.isAnyPermissionPermanentlyDenied -> {
DialogUtil.showAlertDialog(
activity,
@@ -189,7 +194,7 @@ object PermissionUtils {
null, null
)
}
- else -> Thread(onPermissionDenied).start()
+ else -> scope.launch { onPermissionDenied?.run() }
}
}
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/SwipableCardView.kt b/app/src/main/java/fr/free/nrw/commons/utils/SwipableCardView.kt
index 5a8261c24..bde575386 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/SwipableCardView.kt
+++ b/app/src/main/java/fr/free/nrw/commons/utils/SwipableCardView.kt
@@ -21,9 +21,14 @@ abstract class SwipableCardView @JvmOverloads constructor(
defStyleAttr: Int = 0
) : CardView(context, attrs, defStyleAttr) {
+
+ companion object{
+ const val MINIMUM_THRESHOLD_FOR_SWIPE = 100f
+ }
+
private var x1 = 0f
private var x2 = 0f
- private val MINIMUM_THRESHOLD_FOR_SWIPE = 100f
+
init {
interceptOnTouchListener()
diff --git a/app/src/main/res/layout/fragment_custom_selector.xml b/app/src/main/res/layout/fragment_custom_selector.xml
index bbc4c0a07..03381fd24 100644
--- a/app/src/main/res/layout/fragment_custom_selector.xml
+++ b/app/src/main/res/layout/fragment_custom_selector.xml
@@ -49,6 +49,20 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/nearby_fragment_menu.xml b/app/src/main/res/menu/nearby_fragment_menu.xml
index fe049cde4..e7c23ed89 100644
--- a/app/src/main/res/menu/nearby_fragment_menu.xml
+++ b/app/src/main/res/menu/nearby_fragment_menu.xml
@@ -12,6 +12,12 @@
android:icon="@drawable/ic_list_white_24dp"
/>
+ - خطأ في جلب المعالم القريبة.