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

Part of issue #5996: Clean final IDE warnings (parameter name alignment, remove redundant toggle)

Browse source
This commit is contained in:
Eric 2025-10-25 23:15:23 +11:00
parent d27bff3d26
commit 836c24f7c1
1 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.kt
View file

@ -84,7 +84,8 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
private var rotateBackward: Animation? = null private var rotateBackward: Animation? = null
private var isFabOpen = false private var isFabOpen = false
private lateinit var inAppCameraLocationPermissionLauncher: ActivityResultLauncher<Array<String>> private lateinit var inAppCameraLocationPermissionLauncher:
ActivityResultLauncher<Array<String>>
@VisibleForTesting @VisibleForTesting
var rvContributionsList: RecyclerView? = null var rvContributionsList: RecyclerView? = null
@ -156,7 +157,8 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
controller?.locationPermissionCallback?.onLocationPermissionGranted() controller?.locationPermissionCallback?.onLocationPermissionGranted()
} else { } else {
activity?.let { currentActivity -> activity?.let { currentActivity ->
if (currentActivity.shouldShowRequestPermissionRationale(permission.ACCESS_FINE_LOCATION)) { if (currentActivity.shouldShowRequestPermissionRationale(
permission.ACCESS_FINE_LOCATION)) {
controller?.handleShowRationaleFlowCameraLocation( controller?.handleShowRationaleFlowCameraLocation(
currentActivity, currentActivity,
inAppCameraLocationPermissionLauncher, // Pass launcher inAppCameraLocationPermissionLauncher, // Pass launcher
@ -164,7 +166,8 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
) )
} else { } else {
controller?.locationPermissionCallback?.onLocationPermissionDenied( controller?.locationPermissionCallback?.onLocationPermissionDenied(
currentActivity.getString(R.string.in_app_camera_location_permission_denied) currentActivity.getString(
R.string.in_app_camera_location_permission_denied)
) )
} }
} }
@ -232,7 +235,10 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
} }
private fun initAdapter() { private fun initAdapter() {
adapter = ContributionsListAdapter(this, mediaClient!!, mediaDataExtractor!!, compositeDisposable) adapter = ContributionsListAdapter(this,
mediaClient!!,
mediaDataExtractor!!,
compositeDisposable)
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@ -307,7 +313,7 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean { override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
if (e.action == MotionEvent.ACTION_DOWN) { if (e.action == MotionEvent.ACTION_DOWN) {
if (isFabOpen) { if (isFabOpen) {
animateFAB(isFabOpen) animateFAB(true)
} }
} }
return false return false
@ -339,14 +345,20 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
} }
private fun getSpanCount(orientation: Int): Int { private fun getSpanCount(orientation: Int): Int {
return if (orientation == Configuration.ORIENTATION_LANDSCAPE) spanCountLandscape else spanCountPortrait return if (orientation == Configuration.ORIENTATION_LANDSCAPE)
spanCountLandscape
else
spanCountPortrait
} }
override fun onConfigurationChanged(newConfig: Configuration) { override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig) super.onConfigurationChanged(newConfig)
// check orientation // check orientation
binding!!.fabLayout.orientation = binding!!.fabLayout.orientation =
if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) LinearLayout.HORIZONTAL else LinearLayout.VERTICAL if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
LinearLayout.HORIZONTAL
else
LinearLayout.VERTICAL
rvContributionsList rvContributionsList
?.setLayoutManager( ?.setLayoutManager(
GridLayoutManager(context, getSpanCount(newConfig.orientation)) GridLayoutManager(context, getSpanCount(newConfig.orientation))
@ -429,9 +441,9 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
/** /**
* Shows welcome message if user has no contributions yet i.e. new user. * Shows welcome message if user has no contributions yet i.e. new user.
*/ */
override fun showWelcomeTip(shouldShow: Boolean) { override fun showWelcomeTip(numberOfUploads: Boolean) {
binding!!.noContributionsYet.visibility = binding!!.noContributionsYet.visibility =
if (shouldShow) View.VISIBLE else View.GONE if (numberOfUploads) View.VISIBLE else View.GONE
} }
/** /**
@ -464,9 +476,9 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
} }
} }
override fun openMediaDetail(position: Int, isWikipediaButtonDisplayed: Boolean) { override fun openMediaDetail(contribution: Int, isWikipediaPageExists: Boolean) {
if (null != callback) { //Just being safe, ideally they won't be called when detached if (null != callback) { //Just being safe, ideally they won't be called when detached
callback!!.showDetail(position, isWikipediaButtonDisplayed) callback!!.showDetail(contribution, isWikipediaPageExists)
} }
} }
@ -496,13 +508,15 @@ class ContributionsListFragment : CommonsDaggerSupportFragment(), ContributionsL
val fragmentManager = this.parentFragmentManager val fragmentManager = this.parentFragmentManager
val fragment = newInstance(contribution) val fragment = newInstance(contribution)
fragment.callback = fragment.callback =
WikipediaInstructionsDialogFragment.Callback { contribution: Contribution?, copyWikicode: Boolean -> WikipediaInstructionsDialogFragment.Callback {
contribution: Contribution?,
copyWikicode: Boolean ->
onConfirmClicked( onConfirmClicked(
contribution, contribution,
copyWikicode copyWikicode
) )
} }
fragment.show(fragmentManager!!, "WikimediaFragment") fragment.show(fragmentManager, "WikimediaFragment")
} }