diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt index 72d836b5..7b46fc49 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt @@ -42,7 +42,7 @@ fun AppInfoHeader( modifier: Modifier = Modifier, versionCode: String, appSize: String, - appDev: String, + repoHost: String, mainAction: ActionState?, possibleActions: Set, onSource: () -> Unit = { }, @@ -64,7 +64,7 @@ fun AppInfoHeader( HeaderExtra( versionCode = versionCode, appSize = appSize, - appDev = appDev, + repoHost = repoHost, onSource = onSource, onSourceLong = onSourceLong ) @@ -158,7 +158,7 @@ fun HeaderExtra( modifier: Modifier = Modifier, versionCode: String, appSize: String, - appDev: String, + repoHost: String, onSource: () -> Unit, onSourceLong: () -> Unit ) { @@ -181,7 +181,7 @@ fun HeaderExtra( HeaderExtrasCard( modifier = Modifier.weight(1f), title = stringResource(id = R.string.source_code), - text = appDev, + text = repoHost, onClick = onSource, onLongClick = onSourceLong ) diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt index d1414460..fc23c76f 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt @@ -88,6 +88,8 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import java.net.URI +import java.util.* // TODO clean up and replace dropped functions from AppDetailFragment class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks { @@ -422,7 +424,10 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks { AppInfoHeader( versionCode = product.versionCode.toString(), appSize = product.displayRelease?.size?.formatSize().orEmpty(), - appDev = product.author.name.replaceFirstChar { it.titlecase() }, + repoHost = "@${ + URI(product.source).host.removePrefix("www.") + .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } + }", mainAction = mainAction, possibleActions = actions?.filter { it != mainAction }?.toSet() ?: emptySet(),