mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert previous commit, wrong branch

Browse source 
This reverts commit aa84dedd64.
This commit is contained in:
Nicolas Raoul 2025-02-26 18:03:24 +09:00
parent aa84dedd64
commit 88eedc3506
5 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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() }

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

@ -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())
}
/**

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

@ -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() }

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

@ -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()

4
app/src/main/res/layout/activity_login.xml
View file

@ -207,7 +207,7 @@
android:text="@string/forgot_password"
android:visibility="visible" />
<!-- <fr.free.nrw.commons.ui.widget.HtmlTextView
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/skip_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -215,7 +215,7 @@
android:layout_marginBottom="@dimen/standard_gap"
android:gravity="center_horizontal"
android:text="@string/skip_login"
android:visibility="visible" />-->
android:visibility="visible" />
</RelativeLayout>