From 88eedc3506722bda6f154b8d118ca44f7456fb76 Mon Sep 17 00:00:00 2001 From: Nicolas Raoul Date: Wed, 26 Feb 2025 18:03:24 +0900 Subject: [PATCH] Revert previous commit, wrong branch This reverts commit aa84dedd6490ad64a14a646b56666a72a404628e. --- .../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 4e2b9199f..75c4ac26d 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 ccba5064e..a61567393 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 5a551cb01..3f7a196fe 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 fe94ae6b0..4573fccad 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 f3710c502..7cfd761a7 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" />