From 1679a879b87a129be146605cda2e01e3bf37dac1 Mon Sep 17 00:00:00 2001 From: Nicolas Raoul Date: Wed, 26 Feb 2025 18:00:48 +0900 Subject: [PATCH 1/4] Removed Explore, Peer review, because we are at risk of being removed from Google Play tomorrow --- .../java/fr/free/nrw/commons/auth/LoginActivity.kt | 2 +- .../free/nrw/commons/contributions/MainActivity.kt | 14 +++++++------- .../nrw/commons/navtab/MoreBottomSheetFragment.kt | 4 ++-- .../main/java/fr/free/nrw/commons/navtab/NavTab.kt | 10 +++++----- app/src/main/res/layout/activity_login.xml | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt index 75c4ac26dd..4e2b9199f9 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt @@ -86,7 +86,7 @@ class LoginActivity : AccountAuthenticatorActivity() { loginPassword.addTextChangedListener(textWatcher) loginTwoFactor.addTextChangedListener(textWatcher) - skipLogin.setOnClickListener { skipLogin() } +// skipLogin.setOnClickListener { skipLogin() } forgotPassword.setOnClickListener { forgotPassword() } aboutPrivacyPolicy.setOnClickListener { onPrivacyPolicyClicked() } signUpButton.setOnClickListener { signUp() } 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 a615673931..ccba5064e4 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 @@ -478,13 +478,13 @@ after opening the app. * @param longitude current longitude of Nearby map */ fun loadExploreMapFromNearby(zoom: Double, latitude: Double, longitude: Double) { - val bundle = 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()) +// val bundle = 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()) } /** diff --git a/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt b/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt index 3f7a196fe6..5a551cb013 100644 --- a/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt @@ -67,9 +67,9 @@ class MoreBottomSheetFragment : BottomSheetDialogFragment() { ): View? { binding = FragmentMoreBottomSheetBinding.inflate(inflater, container, false) - if (store.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED)) { +// if (store.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED)) { binding?.morePeerReview?.visibility = View.GONE - } +// } binding?.apply { moreLogout.setOnClickListener { onLogoutClicked() } diff --git a/app/src/main/java/fr/free/nrw/commons/navtab/NavTab.kt b/app/src/main/java/fr/free/nrw/commons/navtab/NavTab.kt index 4573fccadb..fe94ae6b06 100644 --- a/app/src/main/java/fr/free/nrw/commons/navtab/NavTab.kt +++ b/app/src/main/java/fr/free/nrw/commons/navtab/NavTab.kt @@ -29,11 +29,11 @@ enum class NavTab( return NearbyParentFragment.newInstance() } }, - EXPLORE(R.string.navigation_item_explore, R.drawable.ic_globe) { - override fun newInstance(): Fragment { - return ExploreFragment.newInstance() - } - }, +// EXPLORE(R.string.navigation_item_explore, R.drawable.ic_globe) { +// override fun newInstance(): Fragment { +// return ExploreFragment.newInstance() +// } +// }, BOOKMARKS(R.string.bookmarks, R.drawable.ic_round_star_border_24px) { override fun newInstance(): Fragment { return BookmarkFragment.newInstance() diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 7cfd761a7b..f3710c502b 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -207,7 +207,7 @@ android:text="@string/forgot_password" android:visibility="visible" /> - + android:visibility="visible" />--> From 03943ee29eeb5f8ffb7fff4f2e20dc98018736ff Mon Sep 17 00:00:00 2001 From: Nicolas Raoul Date: Wed, 26 Feb 2025 18:12:03 +0900 Subject: [PATCH 2/4] Bumped to 5.1.3 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dbb5458bd9..96fcf1ac15 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -212,8 +212,8 @@ android { defaultConfig { //applicationId 'fr.free.nrw.commons' - versionCode 1043 - versionName '5.1.2' + versionCode 1044 + versionName '5.1.3' setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName()) minSdkVersion 21 From c924817b840a02f3645ff224792261f5f0d77a13 Mon Sep 17 00:00:00 2001 From: Nicolas Raoul Date: Thu, 27 Feb 2025 19:08:12 +0900 Subject: [PATCH 3/4] Using 1046, as 1044 and 1045 are taken already --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 96fcf1ac15..6890177e89 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -212,7 +212,7 @@ android { defaultConfig { //applicationId 'fr.free.nrw.commons' - versionCode 1044 + versionCode 1046 versionName '5.1.3' setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName()) From de44968a7508c22defcff1ef09c38fdeb174f0ff Mon Sep 17 00:00:00 2001 From: Ritika Pahwa <83745993+RitikaPahwa4444@users.noreply.github.com> Date: Sat, 8 Mar 2025 18:11:38 +0530 Subject: [PATCH 4/4] Enable Peer review (#6244) Bump up version code and name --- app/build.gradle | 4 ++-- .../fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6890177e89..989ae87477 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -212,8 +212,8 @@ android { defaultConfig { //applicationId 'fr.free.nrw.commons' - versionCode 1046 - versionName '5.1.3' + versionCode 1047 + versionName '5.1.4' setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName()) minSdkVersion 21 diff --git a/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt b/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt index 5a551cb013..3f7a196fe6 100644 --- a/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt @@ -67,9 +67,9 @@ class MoreBottomSheetFragment : BottomSheetDialogFragment() { ): View? { binding = FragmentMoreBottomSheetBinding.inflate(inflater, container, false) -// if (store.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED)) { + if (store.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED)) { binding?.morePeerReview?.visibility = View.GONE -// } + } binding?.apply { moreLogout.setOnClickListener { onLogoutClicked() }