diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/AboutScreen.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/AboutScreen.kt index fdb1b7b19..459e68aaf 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/screens/AboutScreen.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/screens/AboutScreen.kt @@ -83,6 +83,9 @@ import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.clearAndSetSemantics +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.role import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp @@ -130,7 +133,6 @@ private val CoreMaintainer = Contributor( avatarUrl = "https://avatars.githubusercontent.com/u/26845343?v=4", iconRes = R.drawable.round_developer_board_24, githubUrl = "https://github.com/theovilardo", - telegramUrl = "https://t.me/thevelopersupport", ) private val PinnedCommunityMembers = listOf( @@ -497,6 +499,7 @@ private fun AboutHeroCard( ) { val heroShape = AbsoluteSmoothCornerShape(30.dp, 60) val haptic = LocalHapticFeedback.current + val context = LocalContext.current Surface( modifier = modifier, @@ -578,6 +581,82 @@ private fun AboutHeroCard( Spacer(modifier = Modifier.height(12.dp)) CommunitySignalsRow() + + Spacer(modifier = Modifier.height(12.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + SocialChip( + label = stringResource(R.string.about_github_label), + subtitle = stringResource(R.string.about_github_subtitle), + iconRes = R.drawable.github, + contentDescription = stringResource(R.string.about_cd_open_github_repo), + onClick = { openUrl(context, "https://github.com/theovilardo/PixelPlayer") }, + modifier = Modifier.weight(1f), + ) + SocialChip( + label = stringResource(R.string.about_telegram_label), + subtitle = stringResource(R.string.about_telegram_subtitle), + iconRes = R.drawable.telegram, + contentDescription = stringResource(R.string.about_cd_join_telegram), + onClick = { openUrl(context, "https://t.me/thevelopersupport") }, + modifier = Modifier.weight(1f), + ) + } + } + } + } +} + +@Composable +private fun SocialChip( + label: String, + subtitle: String, + @DrawableRes iconRes: Int, + contentDescription: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, +) { + Surface( + onClick = onClick, + modifier = modifier + .height(52.dp) + .clearAndSetSemantics { + this.contentDescription = contentDescription + this.role = Role.Button + }, + shape = AbsoluteSmoothCornerShape(14.dp, 60), + color = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.92f), + tonalElevation = 1.dp, + ) { + Row( + modifier = Modifier.padding(horizontal = 12.dp), + horizontalArrangement = Arrangement.Start, + verticalAlignment = Alignment.CenterVertically, + ) { + Icon( + painter = painterResource(iconRes), + contentDescription = null, + modifier = Modifier.size(20.dp), + tint = MaterialTheme.colorScheme.primary, + ) + Spacer(modifier = Modifier.width(10.dp)) + Column( + verticalArrangement = Arrangement.Center + ) { + Text( + text = label, + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onSurface, + ) + Text( + text = subtitle, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) } } } diff --git a/app/src/main/java/com/theveloper/pixelplay/presentation/telegram/dashboard/TelegramDashboardScreen.kt b/app/src/main/java/com/theveloper/pixelplay/presentation/telegram/dashboard/TelegramDashboardScreen.kt index e239280b8..3f97e6fda 100644 --- a/app/src/main/java/com/theveloper/pixelplay/presentation/telegram/dashboard/TelegramDashboardScreen.kt +++ b/app/src/main/java/com/theveloper/pixelplay/presentation/telegram/dashboard/TelegramDashboardScreen.kt @@ -348,15 +348,20 @@ fun TelegramDashboardScreen( ) }, confirmButton = { - TextButton(onClick = { - viewModel.removeChannel(channel.chatId) - channelPendingRemoval = null - }) { + FilledTonalButton( + onClick = { + viewModel.removeChannel(channel.chatId) + channelPendingRemoval = null + }, + colors = androidx.compose.material3.ButtonDefaults.filledTonalButtonColors( + containerColor = MaterialTheme.colorScheme.errorContainer, + contentColor = MaterialTheme.colorScheme.onErrorContainer + ) + ) { Text( text = stringResource(R.string.telegram_remove_channel_confirm_action), fontFamily = GoogleSansRounded, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.error + fontWeight = FontWeight.SemiBold ) } }, @@ -427,8 +432,7 @@ private fun ExpressiveChannelItem( Column( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 16.dp, vertical = 14.dp), - verticalArrangement = Arrangement.spacedBy(14.dp) + .padding(horizontal = 16.dp, vertical = 14.dp) ) { // ── Channel header row ────────────────────────────────────── Row( @@ -486,6 +490,8 @@ private fun ExpressiveChannelItem( } } + Spacer(modifier = Modifier.height(14.dp)) + // ── Meta pills ────────────────────────────────────────────── FlowRow( horizontalArrangement = Arrangement.spacedBy(8.dp), @@ -515,6 +521,8 @@ private fun ExpressiveChannelItem( } } + Spacer(modifier = Modifier.height(14.dp)) + // ── Action buttons ────────────────────────────────────────── Row( modifier = Modifier.fillMaxWidth(), @@ -593,6 +601,7 @@ private fun ExpressiveChannelItem( modifier = Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(0.dp) ) { + Spacer(modifier = Modifier.height(14.dp)) HorizontalDivider( modifier = Modifier.padding(vertical = 4.dp), color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f) diff --git a/app/src/main/res/values-ar/strings_settings.xml b/app/src/main/res/values-ar/strings_settings.xml index 78d187b68..6e3958ad4 100644 --- a/app/src/main/res/values-ar/strings_settings.xml +++ b/app/src/main/res/values-ar/strings_settings.xml @@ -297,4 +297,10 @@ وحدات عدد %1$d · إصدار %2$s · إصدار المخطط البرمجي %3$d Korean (الكورية) Norwegian (النرويجية بوكمول) + GitHub + مستودع الكود + تليجرام + الدعم + فتح مستودع GitHub + الانضمام إلى مجتمع تليجرام diff --git a/app/src/main/res/values-de/strings_settings.xml b/app/src/main/res/values-de/strings_settings.xml index 69f37192e..e77d6dd5d 100644 --- a/app/src/main/res/values-de/strings_settings.xml +++ b/app/src/main/res/values-de/strings_settings.xml @@ -633,6 +633,12 @@ Open-Source-Mitwirkende Aktuelle Mitwirkenden-Liste von GitHub. %1$d Beiträge + GitHub + Repository + Telegram + Support + GitHub-Repository öffnen + Der Telegram-Community beitreten GitHub-Profil öffnen Telegram öffnen Avatar von %1$s diff --git a/app/src/main/res/values-es/strings_settings.xml b/app/src/main/res/values-es/strings_settings.xml index b66c4aa60..f39e8bb03 100644 --- a/app/src/main/res/values-es/strings_settings.xml +++ b/app/src/main/res/values-es/strings_settings.xml @@ -633,6 +633,12 @@ Colaboradores de código abierto Lista de colaboradores en vivo desde GitHub. %1$d contrib. + GitHub + Repositorio + Telegram + Soporte + Abrir repositorio de GitHub + Unirse a la comunidad de Telegram Abrir perfil de GitHub Abrir Telegram Avatar de %1$s diff --git a/app/src/main/res/values-fr/strings_settings.xml b/app/src/main/res/values-fr/strings_settings.xml index 13f14c868..8c306031b 100644 --- a/app/src/main/res/values-fr/strings_settings.xml +++ b/app/src/main/res/values-fr/strings_settings.xml @@ -629,6 +629,12 @@ Contributeurs open source Liste des contributeurs en direct de GitHub. %1$d contrib. + GitHub + Dépôt + Telegram + Support + Ouvrir le dépôt GitHub + Rejoindre la communauté Telegram Ouvrir le profil GitHub Ouvrir Telegram Avatar de %1$s diff --git a/app/src/main/res/values-in/strings_settings.xml b/app/src/main/res/values-in/strings_settings.xml index 6aab6877b..09e2d508c 100644 --- a/app/src/main/res/values-in/strings_settings.xml +++ b/app/src/main/res/values-in/strings_settings.xml @@ -629,6 +629,12 @@ Kontributor open source Daftar kontributor langsung dari GitHub. %1$d kontrib. + GitHub + Repositori + Telegram + Dukungan + Buka repositori GitHub + Bergabung dengan komunitas Telegram Buka profil GitHub Buka Telegram Avatar %1$s diff --git a/app/src/main/res/values-it/strings_settings.xml b/app/src/main/res/values-it/strings_settings.xml index 234a0e911..41b7de815 100644 --- a/app/src/main/res/values-it/strings_settings.xml +++ b/app/src/main/res/values-it/strings_settings.xml @@ -633,6 +633,12 @@ Contributori open source Lista contributori live da GitHub. %1$d contrib. + GitHub + Repository + Telegram + Supporto + Apri repository GitHub + Unisciti alla community di Telegram Apri profilo GitHub Apri Telegram Avatar di %1$s diff --git a/app/src/main/res/values-ko/strings_settings.xml b/app/src/main/res/values-ko/strings_settings.xml index bcc63f057..4c28f7c23 100644 --- a/app/src/main/res/values-ko/strings_settings.xml +++ b/app/src/main/res/values-ko/strings_settings.xml @@ -633,6 +633,12 @@ 오픈 소스 기여자 GitHub의 실시간 기여자 목록입니다. 기여 %1$d회 + GitHub + 저장소 + Telegram + 지원 + GitHub 저장소 열기 + Telegram 커뮤니티 가입 GitHub 프로필 열기 Telegram 열기 %1$s 아바타 diff --git a/app/src/main/res/values-nb/strings_settings.xml b/app/src/main/res/values-nb/strings_settings.xml index fd101cb66..b6812bd47 100644 --- a/app/src/main/res/values-nb/strings_settings.xml +++ b/app/src/main/res/values-nb/strings_settings.xml @@ -633,6 +633,12 @@ Bidragsytere til åpen kildekode Live bidragsyterliste fra GitHub. %1$d bidrag. + GitHub + Kodelager + Telegram + Støtte + Åpne GitHub-kodelager + Bli med i Telegram-samfunnet Åpne GitHub-profil Åpne Telegram Avatar av %1$s diff --git a/app/src/main/res/values-ru/strings_settings.xml b/app/src/main/res/values-ru/strings_settings.xml index 997331e07..75182d311 100644 --- a/app/src/main/res/values-ru/strings_settings.xml +++ b/app/src/main/res/values-ru/strings_settings.xml @@ -633,6 +633,12 @@ Участники open source Актуальный список участников с GitHub. %1$d вклад. + GitHub + Репозиторий + Telegram + Поддержка + Открыть репозиторий GitHub + Присоединиться к сообществу Telegram Открыть профиль GitHub Открыть Telegram Аватар %1$s diff --git a/app/src/main/res/values-tr/strings_settings.xml b/app/src/main/res/values-tr/strings_settings.xml index 1f4dc593c..3fc129112 100644 --- a/app/src/main/res/values-tr/strings_settings.xml +++ b/app/src/main/res/values-tr/strings_settings.xml @@ -633,6 +633,12 @@ Açık kaynak katkıda bulunanlar GitHub\'dan canlı katkıda bulunanlar listesi. %1$d katkı + GitHub + Depo + Telegram + Destek + GitHub deposunu aç + Telegram topluluğuna katıl GitHub profilini aç Telegram\'ı aç %1$s avatarı diff --git a/app/src/main/res/values-zh-rCN/strings_settings.xml b/app/src/main/res/values-zh-rCN/strings_settings.xml index 0822b25e0..d54bde659 100644 --- a/app/src/main/res/values-zh-rCN/strings_settings.xml +++ b/app/src/main/res/values-zh-rCN/strings_settings.xml @@ -633,6 +633,12 @@ 开源贡献者 来自 GitHub 的实时贡献者名单。 %1$d 次贡献 + GitHub + 代码仓库 + Telegram + 支持 + 打开 GitHub 仓库 + 加入 Telegram 社区 打开 GitHub 个人资料 打开 Telegram %1$s 的头像 diff --git a/app/src/main/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml index 298046dec..b99b40174 100644 --- a/app/src/main/res/values/strings_settings.xml +++ b/app/src/main/res/values/strings_settings.xml @@ -633,6 +633,12 @@ Open source contributors Live contributor list from GitHub. %1$d contrib. + GitHub + Repository + Telegram + Support + Open GitHub repository + Join Telegram community Open GitHub profile Open Telegram Avatar of %1$s