Skip to content

Commit 88eedc3

Browse files
committed
Revert previous commit, wrong branch
This reverts commit aa84ded.
1 parent aa84ded commit 88eedc3

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
8686
loginPassword.addTextChangedListener(textWatcher)
8787
loginTwoFactor.addTextChangedListener(textWatcher)
8888

89-
// skipLogin.setOnClickListener { skipLogin() }
89+
skipLogin.setOnClickListener { skipLogin() }
9090
forgotPassword.setOnClickListener { forgotPassword() }
9191
aboutPrivacyPolicy.setOnClickListener { onPrivacyPolicyClicked() }
9292
signUpButton.setOnClickListener { signUp() }

app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -478,13 +478,13 @@ after opening the app.
478478
* @param longitude current longitude of Nearby map
479479
*/
480480
fun loadExploreMapFromNearby(zoom: Double, latitude: Double, longitude: Double) {
481-
// val bundle = Bundle()
482-
// bundle.putDouble("prev_zoom", zoom)
483-
// bundle.putDouble("prev_latitude", latitude)
484-
// bundle.putDouble("prev_longitude", longitude)
485-
//
486-
// loadFragment(ExploreFragment.newInstance(), false, bundle)
487-
// setSelectedItemId(NavTab.EXPLORE.code())
481+
val bundle = Bundle()
482+
bundle.putDouble("prev_zoom", zoom)
483+
bundle.putDouble("prev_latitude", latitude)
484+
bundle.putDouble("prev_longitude", longitude)
485+
486+
loadFragment(ExploreFragment.newInstance(), false, bundle)
487+
setSelectedItemId(NavTab.EXPLORE.code())
488488
}
489489

490490
/**

app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ class MoreBottomSheetFragment : BottomSheetDialogFragment() {
6767
): View? {
6868
binding = FragmentMoreBottomSheetBinding.inflate(inflater, container, false)
6969

70-
// if (store.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED)) {
70+
if (store.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED)) {
7171
binding?.morePeerReview?.visibility = View.GONE
72-
// }
72+
}
7373

7474
binding?.apply {
7575
moreLogout.setOnClickListener { onLogoutClicked() }

app/src/main/java/fr/free/nrw/commons/navtab/NavTab.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ enum class NavTab(
2929
return NearbyParentFragment.newInstance()
3030
}
3131
},
32-
// EXPLORE(R.string.navigation_item_explore, R.drawable.ic_globe) {
33-
// override fun newInstance(): Fragment {
34-
// return ExploreFragment.newInstance()
35-
// }
36-
// },
32+
EXPLORE(R.string.navigation_item_explore, R.drawable.ic_globe) {
33+
override fun newInstance(): Fragment {
34+
return ExploreFragment.newInstance()
35+
}
36+
},
3737
BOOKMARKS(R.string.bookmarks, R.drawable.ic_round_star_border_24px) {
3838
override fun newInstance(): Fragment {
3939
return BookmarkFragment.newInstance()

app/src/main/res/layout/activity_login.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,15 @@
207207
android:text="@string/forgot_password"
208208
android:visibility="visible" />
209209

210-
<!-- <fr.free.nrw.commons.ui.widget.HtmlTextView
210+
<fr.free.nrw.commons.ui.widget.HtmlTextView
211211
android:id="@+id/skip_login"
212212
android:layout_width="match_parent"
213213
android:layout_height="wrap_content"
214214
android:layout_below="@id/forgot_password"
215215
android:layout_marginBottom="@dimen/standard_gap"
216216
android:gravity="center_horizontal"
217217
android:text="@string/skip_login"
218-
android:visibility="visible" />-->
218+
android:visibility="visible" />
219219

220220
</RelativeLayout>
221221

0 commit comments

Comments
 (0)