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

Make "File usages" items clickable with correct URLs #6307 (#6405)
Some checks failed
Android CI / Run tests and generate APK (push) Has been cancelled
Details

Browse source 
* Fix: URL generation for GlobalFileUsage in FileUsagesUiModel.kt for issue #6307

* Add clickable functionality to 'Usages on Other Wikis' in FileUsagesContainer for issue #6307

---------

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
This commit is contained in:
VoidRaven 2025-09-02 13:33:28 +05:30 • committed by GitHub
parent dd96c64182
commit e2c8f85a5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/fr/free/nrw/commons/fileusages/FileUsagesUiModel.kt
View file

@ -1,7 +1,10 @@
package fr.free.nrw.commons.fileusages
import android.net.Uri
import timber.log.Timber
/**
* Show where file is being used on Commons and oher wikis.
* shows where file is being used on Commons and other wikis.
*/
data class FileUsagesUiModel(
val title: String,
@ -9,10 +12,37 @@ data class FileUsagesUiModel(
)
fun FileUsage.toUiModel(): FileUsagesUiModel {
return FileUsagesUiModel(title = title, link = "https://commons.wikimedia.org/wiki/$title")
return FileUsagesUiModel(
title = title,
link = "https://commons.wikimedia.org/wiki/${Uri.encode(title.replace(" ", "_"))}"
)
}
fun GlobalFileUsage.toUiModel(): FileUsagesUiModel {
// link is associated with sub items under wiki group (which is not used ATM)
return FileUsagesUiModel(title = wiki, link = null)
}
Timber.d("GlobalFileUsage: wiki=%s, title=%s", wiki, title)
// handles the empty or invalid wiki/title
if (wiki.isEmpty() || title.isEmpty()) {
Timber.w("Invalid GlobalFileUsage: wiki=%s, title=%s", wiki, title)
return FileUsagesUiModel(title = title, link = null)
}
// determines the domain
val domain = when {
wiki.contains(".") -> wiki // Already a full domain like "en.wikipedia.org"
wiki == "commonswiki" -> "commons.wikimedia.org"
wiki.endsWith("wiki") -> {
val code = wiki.removeSuffix("wiki")
"$code.wikipedia.org"
}
else -> "$wiki.wikipedia.org" // fallback for codes like "en"
}
val normalizedTitle = Uri.encode(title.replace(" ", "_"))
// construct full URL
val url = "https://$domain/wiki/$normalizedTitle"
Timber.d("Generated URL for GlobalFileUsage: %s", url)
return FileUsagesUiModel(title = title, link = url)
}

38
app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
View file

@ -2128,22 +2128,17 @@ fun FileUsagesContainer(
val uriHandle = LocalUriHandler.current
Column(modifier = modifier) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween
) {
Text(
text = stringResource(R.string.usages_on_commons_heading),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleSmall
)
IconButton(onClick = {
isCommonsListExpanded = !isCommonsListExpanded
}) {
IconButton(onClick = { isCommonsListExpanded = !isCommonsListExpanded }) {
Icon(
imageVector = if (isCommonsListExpanded) Icons.Default.KeyboardArrowUp
else Icons.Default.KeyboardArrowDown,
@ -2157,11 +2152,8 @@ fun FileUsagesContainer(
MediaDetailViewModel.FileUsagesContainerState.Loading -> {
LinearProgressIndicator()
}
is MediaDetailViewModel.FileUsagesContainerState.Success -> {
val data = commonsContainerState.data
if (data.isNullOrEmpty()) {
ListItem(headlineContent = {
Text(
@ -2181,7 +2173,7 @@ fun FileUsagesContainer(
headlineContent = {
Text(
modifier = Modifier.clickable {
uriHandle.openUri(usage.link!!)
usage.link?.let { uriHandle.openUri(it) }
},
text = usage.title,
style = MaterialTheme.typography.titleSmall.copy(
@ -2189,11 +2181,11 @@ fun FileUsagesContainer(
textDecoration = TextDecoration.Underline
)
)
})
}
)
}
}
}
is MediaDetailViewModel.FileUsagesContainerState.Error -> {
ListItem(headlineContent = {
Text(
@ -2203,12 +2195,10 @@ fun FileUsagesContainer(
)
})
}
MediaDetailViewModel.FileUsagesContainerState.Initial -> {}
}
}
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
@ -2219,10 +2209,7 @@ fun FileUsagesContainer(
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleSmall
)
IconButton(onClick = {
isOtherWikisListExpanded = !isOtherWikisListExpanded
}) {
IconButton(onClick = { isOtherWikisListExpanded = !isOtherWikisListExpanded }) {
Icon(
imageVector = if (isOtherWikisListExpanded) Icons.Default.KeyboardArrowUp
else Icons.Default.KeyboardArrowDown,
@ -2236,11 +2223,8 @@ fun FileUsagesContainer(
MediaDetailViewModel.FileUsagesContainerState.Loading -> {
LinearProgressIndicator()
}
is MediaDetailViewModel.FileUsagesContainerState.Success -> {
val data = globalContainerState.data
if (data.isNullOrEmpty()) {
ListItem(headlineContent = {
Text(
@ -2259,16 +2243,20 @@ fun FileUsagesContainer(
},
headlineContent = {
Text(
modifier = Modifier.clickable {
usage.link?.let { uriHandle.openUri(it) }
},
text = usage.title,
style = MaterialTheme.typography.titleSmall.copy(
color = Color(0xFF5A6AEC),
textDecoration = TextDecoration.Underline
)
)
})
}
)
}
}
}
is MediaDetailViewModel.FileUsagesContainerState.Error -> {
ListItem(headlineContent = {
Text(
@ -2278,10 +2266,8 @@ fun FileUsagesContainer(
)
})
}
MediaDetailViewModel.FileUsagesContainerState.Initial -> {}
}
}
}
}
}