mckero/Look4Sat-mckero
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 20 Wiki Activity

fix(roaming,settings): theme colors for night mode; unclamp cards; brand title and APK name

Browse Source 
Three detail fixes plus branding, per user review:

1. Night mode visibility (roaming page): hardcoded reference blues
   (#01DDFF/#0BACF1) collapse to black under the red ColorMatrix
   filter (R channel only), making the page unreadable. Replace ALL
   colors with MaterialTheme.colorScheme (background/surface/
   surfaceVariant/onSurface/onSurfaceVariant/primary/error). GPS
   status dots become themed circles (primary/error) so they survive
   the red filter; red marker keeps the original pnt drawable.

2. Settings cards unclamped:
   - OtherCard: fixed height(268.dp) squeezed the last toggle row
     (spacing 42/42/42/15px on device); drop the fixed height.
   - CardCredits: same 268dp + SpaceBetween overflowed, gluing the
     last thanks entry to the warranty line; drop fixed height, use
     spacedBy(8.dp) and insert 24dp before the warranty text.

3. Branding:
   - Settings top title: "Look4Sat v%s" -> "Look4Sat Pro v%s" (en/tr);
     title Text no longer marquees and wraps instead (heightIn(min=48)).
   - APK asset name: look4sat-<ver>.apk -> Look4Sat-Pro-<ver>.apk.
   - What's-new dialog (pass_whatsnew_message) rewritten in all three
     locales (en/zh/tr) with this release's changes; zh gets its own
     localized title "Look4Sat Pro 更新内容".

Verified: roaming/settings/passes/app compile, 11 unit tests pass.
This commit is contained in:
mckero committed 2026-08-03 15:46:21 +00:00
1 parent d456bdf4b5
commit c19209655b
7 files changed
+63 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/release.yml
+1 -1
View File
@@ -40,7 +40,7 @@ jobs:
echo "${{ secrets.KEY_STORE }}" | base64 -d > keystore.jks echo "${{ secrets.KEY_STORE }}" | base64 -d > keystore.jks
APK=$(find app/build/outputs/apk/release -name "*.apk" | head -1) APK=$(find app/build/outputs/apk/release -name "*.apk" | head -1)
VERSION=${TAG_NAME#v} VERSION=${TAG_NAME#v}
SIGNED_APK="app/build/outputs/apk/release/look4sat-${VERSION}.apk" SIGNED_APK="app/build/outputs/apk/release/Look4Sat-Pro-${VERSION}.apk"
BUILD_TOOLS=$(ls -d ${ANDROID_HOME}/build-tools/*/ | sort -V | tail -1) BUILD_TOOLS=$(ls -d ${ANDROID_HOME}/build-tools/*/ | sort -V | tail -1)
${BUILD_TOOLS}apksigner sign \ ${BUILD_TOOLS}apksigner sign \
--ks keystore.jks \ --ks keystore.jks \
.gitignore
+1 -2
View File
@@ -39,8 +39,7 @@ captures/
.idea/ .idea/
# Keystore files # Keystore files
# Uncomment the following line if you do not want to check your keystore files in. *.jks
#*.jks
/*.properties /*.properties
/keystore.properties /keystore.properties
/app/keystore.jks /app/keystore.jks
core/presentation/src/main/res/values-tr/strings.xml
+6 -6
View File
@@ -51,11 +51,11 @@
\n\nDoğru tahminler alabilmek için veritabanını en az haftada bir güncelleyin.</string> \n\nDoğru tahminler alabilmek için veritabanını en az haftada bir güncelleyin.</string>
<string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string> <string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string>
<string name="pass_whatsnew_message" translatable="false"> <string name="pass_whatsnew_message" translatable="false">
* Switched to short-form commands in NetworkReporter, by theojalba * Roaming sayfası QTH定位器 2.0'dan birebir taşındı: 8 haneli konum, 3x3 ızgara, kırmızı işaret, canlı GPS
\n* Added CAT radio control for full-duplex SAT operation, by jcmerg \n\n* İçeriğin sistem durum/gezinme çubuklarıyla çakışması düzeltildi; ızgara sütunları referans düzenle eşleşiyor
\n* Added normalized time for passes AOS/LOS, fixed refresh state bug \n\n* Roaming sayfası renkleri uygulama temasını takip eder - kırmızı gece modunda tamamen görünür
\n* Added multiple performance tweaks, improved passes calculation \n\n* Ayarlar: sıkışan anahtar satırları ve teşekkür aralığı düzeltildi
\n* Fixed UTC pass time problem mentioned in issue #201 \n\n* Uygulama adı artık Look4Sat Pro
</string> </string>
<!-- Radar screen --> <!-- Radar screen -->
@@ -103,7 +103,7 @@
<string name="map_visible">Görünür</string> <string name="map_visible">Görünür</string>
<!-- Settings screen --> <!-- Settings screen -->
<string name="prefs_app_title" translatable="false">Look4Sat v%s</string> <string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
<string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string> <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
<string name="prefs_donate_title">Bağış yap</string> <string name="prefs_donate_title">Bağış yap</string>
<string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string> <string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
core/presentation/src/main/res/values-zh/strings.xml
+8
View File
@@ -39,6 +39,14 @@
<string name="pass_error_message">没有即将过境的卫星</string> <string name="pass_error_message">没有即将过境的卫星</string>
<string name="pass_welcome_title">欢迎来到 Look4Sat\!</string> <string name="pass_welcome_title">欢迎来到 Look4Sat\!</string>
<string name="pass_welcome_message">请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库，以确保预测结果的准确性</string> <string name="pass_welcome_message">请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库，以确保预测结果的准确性</string>
<string name="pass_whatsnew_title">Look4Sat Pro 更新内容</string>
<string name="pass_whatsnew_message">
* 漫游页完整移植 QTH定位器 2.0：8 位网格、3x3 九宫格、红点查表定位、实时 GPS
\n\n* 修复内容被系统状态栏/导航栏遮挡；九宫格列宽与原版一致
\n\n* 漫游页配色跟随应用主题，红色夜间模式下清晰可见
\n\n* 设置：修复开关行挤压与感谢列表间距
\n\n* 应用名现为 Look4Sat Pro
</string>
<!-- Radar screen --> <!-- Radar screen -->
<string name="radar_back">后退</string> <string name="radar_back">后退</string>
core/presentation/src/main/res/values/strings.xml
+6 -3
View File
@@ -53,8 +53,11 @@
\n\nPlease update the database at least weekly to get accurate predictions.</string> \n\nPlease update the database at least weekly to get accurate predictions.</string>
<string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string> <string name="pass_whatsnew_title" translatable="false">What\'s new in Look4Sat</string>
<string name="pass_whatsnew_message" translatable="false"> <string name="pass_whatsnew_message" translatable="false">
* Added required tweaks to support Android 17 (API 37) * Roaming page ported verbatim from QTH定位器 2.0: 8-char locator, 3x3 grid, red marker lookup, live GPS
\n\n* Added ACCESS_LOCAL_NETWORK permission check to support network data output \n\n* Fixed content overlapping the system status/navigation bars; grid columns now match the reference layout
\n\n* Roaming page colors follow the app theme - fully visible in red night mode
\n\n* Settings: fixed squeezed toggle rows and credits spacing
\n\n* App name is now Look4Sat Pro
</string> </string>
<!-- Radar screen --> <!-- Radar screen -->
@@ -112,7 +115,7 @@
<string name="map_visible">Visible</string> <string name="map_visible">Visible</string>
<!-- Settings screen --> <!-- Settings screen -->
<string name="prefs_app_title" translatable="false">Look4Sat v%s</string> <string name="prefs_app_title" translatable="false">Look4Sat Pro v%s</string>
<string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string> <string name="prefs_app_url" translatable="false">https://play.google.com/store/apps/details?id=com.rtbishop.look4sat</string>
<string name="prefs_donate_title">Donate</string> <string name="prefs_donate_title">Donate</string>
<string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string> <string name="prefs_donate_url" translatable="false">https://ko-fi.com/rt_bishop</string>
feature/roaming/src/main/java/com/rtbishop/look4sat/feature/roaming/RoamingScreen.kt
+33 -31
View File
@@ -31,6 +31,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@@ -45,6 +46,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.layout.windowInsetsPadding
@@ -144,7 +146,7 @@ fun RoamingScreen() {
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.background(Color(0xFFF2F2F2)) .background(MaterialTheme.colorScheme.background)
.windowInsetsPadding(WindowInsets.systemBars) .windowInsetsPadding(WindowInsets.systemBars)
) { ) {
// relativeLayout7: 顶部 GPS 状态条, 25dp 高, holo_blue_bright // relativeLayout7: 顶部 GPS 状态条, 25dp 高, holo_blue_bright
@@ -153,45 +155,45 @@ fun RoamingScreen() {
.fillMaxWidth() .fillMaxWidth()
.padding(2.dp) .padding(2.dp)
.height(25.dp) .height(25.dp)
.background(Color(0xFF01DDFF)) .background(MaterialTheme.colorScheme.surfaceVariant)
) { ) {
Row(modifier = Modifier.fillMaxSize(), verticalAlignment = Alignment.CenterVertically) { Row(modifier = Modifier.fillMaxSize(), verticalAlignment = Alignment.CenterVertically) {
// tvTitleGPS: "GPS" 14sp 黑, 左 8dp // tvTitleGPS: "GPS" 14sp 黑, 左 8dp
Text( Text(
text = "GPS", text = "GPS",
fontSize = 14.sp, fontSize = 14.sp,
color = Color.Black, color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(start = 8.dp) modifier = Modifier.padding(start = 8.dp)
) )
// imGps: toRightOf tvTitleGPS + marginLeft 15dp (成品 main.xml) // imGps: toRightOf tvTitleGPS + marginLeft 15dp (成品 main.xml)
Spacer(modifier = Modifier.width(15.dp)) Spacer(modifier = Modifier.width(15.dp))
// imGps: 绿点 (15dp) // imGps: 绿点 (15dp, 主题色 primary -> 夜间滤镜下可见)
if (state.gpsOn) { if (state.gpsOn) {
Image( Box(
painter = painterResource(R.drawable.roam_gps_green), modifier = Modifier
contentDescription = null, .size(15.dp)
modifier = Modifier.size(15.dp) .background(MaterialTheme.colorScheme.primary, CircleShape)
) )
} }
// imGpsOff: 红点叠层 (15dp) // imGpsOff: 红点叠层 (15dp, 主题色 error)
if (state.gpsOff) { if (state.gpsOff) {
Image( Box(
painter = painterResource(R.drawable.roam_gps_red), modifier = Modifier
contentDescription = null, .size(15.dp)
modifier = Modifier.size(15.dp) .background(MaterialTheme.colorScheme.error, CircleShape)
) )
} }
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
// tvDate: 14sp 黑, 居中 // tvDate: 14sp 黑, 居中
if (state.showDate) { if (state.showDate) {
Text(text = state.date.ifEmpty { dateText }, fontSize = 14.sp, color = Color.Black) Text(text = state.date.ifEmpty { dateText }, fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant)
} }
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
// tvTime: 14sp 黑, 右对齐 // tvTime: 14sp 黑, 右对齐
Text( Text(
text = state.time, text = state.time,
fontSize = 14.sp, fontSize = 14.sp,
color = Color.Black, color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(end = 8.dp) modifier = Modifier.padding(end = 8.dp)
) )
} }
@@ -201,12 +203,12 @@ fun RoamingScreen() {
Box( Box(
modifier = Modifier modifier = Modifier
.align(Alignment.Center) .align(Alignment.Center)
.background(Color(0xFAF8F54A)) .background(MaterialTheme.colorScheme.primary)
.clickable { context.startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)) } .clickable { context.startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)) }
.padding(horizontal = 5.dp), .padding(horizontal = 5.dp),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
Text(text = "设置启用GPS", fontSize = 14.sp, color = Color.Black) Text(text = "设置启用GPS", fontSize = 14.sp, color = MaterialTheme.colorScheme.onPrimary)
} }
} }
} }
@@ -215,19 +217,19 @@ fun RoamingScreen() {
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 2.dp) .padding(horizontal = 2.dp)
.background(Color(0xFF01DDFF)) .background(MaterialTheme.colorScheme.surfaceVariant)
) { ) {
// 纬度行: tvLati 16sp 黑 左 8dp | tvLat 右对齐 3dp // 纬度行: tvLati 16sp 黑 左 8dp | tvLat 右对齐 3dp
Row(modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp), verticalAlignment = Alignment.CenterVertically) { Row(modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp), verticalAlignment = Alignment.CenterVertically) {
Text(text = state.latLabel, fontSize = 16.sp, color = Color.Black, modifier = Modifier.padding(start = 8.dp)) Text(text = state.latLabel, fontSize = 16.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 8.dp))
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
Text(text = state.latValue, fontSize = 14.sp, color = Color.Black, modifier = Modifier.padding(end = 3.dp)) Text(text = state.latValue, fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(end = 3.dp))
} }
// 经度行 // 经度行
Row(modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp), verticalAlignment = Alignment.CenterVertically) { Row(modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp), verticalAlignment = Alignment.CenterVertically) {
Text(text = state.lonLabel, fontSize = 16.sp, color = Color.Black, modifier = Modifier.padding(start = 8.dp)) Text(text = state.lonLabel, fontSize = 16.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(start = 8.dp))
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
Text(text = state.lonValue, fontSize = 14.sp, color = Color.Black, modifier = Modifier.padding(end = 3.dp)) Text(text = state.lonValue, fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(end = 3.dp))
} }
} }
// relativeLayout6: 定位码区, 43sp bold 黑居中 // relativeLayout6: 定位码区, 43sp bold 黑居中
@@ -235,13 +237,13 @@ fun RoamingScreen() {
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(2.dp) .padding(2.dp)
.background(Color(0xFF01DDFF)) .background(MaterialTheme.colorScheme.surfaceVariant)
) { ) {
Text( Text(
text = state.loc, text = state.loc,
fontSize = 43.sp, fontSize = 43.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = Color.Black, color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
) )
@@ -249,7 +251,7 @@ fun RoamingScreen() {
if (state.showProgress) { if (state.showProgress) {
CircularProgressIndicator( CircularProgressIndicator(
modifier = Modifier.size(24.dp).align(Alignment.Center), modifier = Modifier.size(24.dp).align(Alignment.Center),
color = Color.Black, color = MaterialTheme.colorScheme.onSurfaceVariant,
strokeWidth = 2.dp strokeWidth = 2.dp
) )
} }
@@ -259,7 +261,7 @@ fun RoamingScreen() {
text = "请稍等，加载可能需要几分钟的时间。", text = "请稍等，加载可能需要几分钟的时间。",
fontSize = 16.sp, fontSize = 16.sp,
fontStyle = androidx.compose.ui.text.font.FontStyle.Italic, fontStyle = androidx.compose.ui.text.font.FontStyle.Italic,
color = Color.Black, color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.align(Alignment.TopCenter).padding(top = 2.dp) modifier = Modifier.align(Alignment.TopCenter).padding(top = 2.dp)
) )
} }
@@ -284,7 +286,7 @@ fun RoamingScreen() {
.align(Alignment.TopCenter) .align(Alignment.TopCenter)
.offset(y = 2.dp) .offset(y = 2.dp)
.size(width = 200.dp, height = 200.dp) .size(width = 200.dp, height = 200.dp)
.background(Color(0xFF01DDFF)) .background(MaterialTheme.colorScheme.surfaceVariant)
) { ) {
// iv: 红点 10x10dp, top|left, leftMargin/topMargin 查表绝对定位 // iv: 红点 10x10dp, top|left, leftMargin/topMargin 查表绝对定位
Image( Image(
@@ -300,7 +302,7 @@ fun RoamingScreen() {
text = state.grids[4], text = state.grids[4],
fontSize = 30.sp, fontSize = 30.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = Color.White, color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
modifier = Modifier modifier = Modifier
.size(width = 100.dp, height = 80.dp) .size(width = 100.dp, height = 80.dp)
@@ -320,7 +322,7 @@ fun RoamingScreen() {
Text( Text(
text = "制作：US1PM 汉化：BA7LCE", text = "制作：US1PM 汉化：BA7LCE",
fontSize = 10.sp, fontSize = 10.sp,
color = Color.Black, color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp) modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp)
) )
@@ -333,14 +335,14 @@ private fun GridCell(text: String, modifier: Modifier) {
Box( Box(
modifier = modifier modifier = modifier
.padding(2.dp) .padding(2.dp)
.background(Color(0xFF0BACF1)), .background(MaterialTheme.colorScheme.surface),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
Text( Text(
text = text, text = text,
fontSize = 14.sp, fontSize = 14.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = Color.Black, color = MaterialTheme.colorScheme.onSurface,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
} }
feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsScreen.kt
+8 -12
View File
@@ -29,6 +29,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.GridCells
@@ -486,9 +487,7 @@ private fun OtherCardPreview() = MainTheme {
@Composable @Composable
private fun OtherCard(settings: OtherSettings, onAction: (SettingsAction) -> Unit) { private fun OtherCard(settings: OtherSettings, onAction: (SettingsAction) -> Unit) {
ElevatedCard( ElevatedCard(
modifier = Modifier modifier = Modifier.fillMaxWidth()
.fillMaxWidth()
.height(268.dp)
) { ) {
Column( Column(
modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
@@ -561,15 +560,11 @@ private fun CardCreditsPreview() = MainTheme { CardCredits() }
@Composable @Composable
private fun CardCredits(modifier: Modifier = Modifier) { private fun CardCredits(modifier: Modifier = Modifier) {
ElevatedCard( ElevatedCard(
modifier = modifier modifier = modifier.fillMaxWidth()
.fillMaxWidth()
.height(268.dp)
) { ) {
Column( Column(
verticalArrangement = Arrangement.SpaceBetween, verticalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
.padding(horizontal = 8.dp, vertical = 4.dp)
.fillMaxHeight()
) { ) {
Text( Text(
text = stringResource(id = R.string.prefs_outro_title), text = stringResource(id = R.string.prefs_outro_title),
@@ -578,6 +573,8 @@ private fun CardCredits(modifier: Modifier = Modifier) {
Text( Text(
text = stringResource(id = R.string.prefs_outro_thanks) text = stringResource(id = R.string.prefs_outro_thanks)
) )
// 感谢列表与保修声明之间保留约两行间距 (用户要求)
Spacer(modifier = Modifier.height(24.dp))
Text( Text(
text = stringResource(id = R.string.prefs_outro_license), text = stringResource(id = R.string.prefs_outro_license),
color = MaterialTheme.colorScheme.primary color = MaterialTheme.colorScheme.primary
@@ -593,7 +590,7 @@ private fun TopCard(onClick: () -> Unit, modifier: Modifier = Modifier, version:
horizontalArrangement = Arrangement.spacedBy(12.dp), horizontalArrangement = Arrangement.spacedBy(12.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = Modifier modifier = Modifier
.height(48.dp) .heightIn(min = 48.dp)
.clickable { onClick() }) { .clickable { onClick() }) {
Spacer(Modifier) Spacer(Modifier)
Icon( Icon(
@@ -608,7 +605,6 @@ private fun TopCard(onClick: () -> Unit, modifier: Modifier = Modifier, version:
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.padding(end = 6.dp) .padding(end = 6.dp)
.infiniteMarquee()
) )
} }
} }