Skip to content

Commit 4ad1fd9

Browse files
aleksey-saenkoaleksey-saenko
committed
Minor UI fixes.
1 parent aa902c6 commit 4ad1fd9

File tree

12 files changed

+56
-35
lines changed

12 files changed

+56
-35
lines changed

‎core/strings/src/main/res/values-cs/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<string name="cancel_selected">Zrušit vybrané</string>
147147
<string name="delete_selected">Odstranit vybrané</string>
148148
<string name="queue">Fronta</string>
149-
<string name="status_colon">Stav: %s</string>
149+
<string name="format_status">Stav: %s</string>
150150
<string name="enqueued">Ve frontě</string>
151151
<string name="track_found">Skladba nalezena</string>
152152
<string name="idle">Nečinný</string>
@@ -156,11 +156,11 @@
156156
<string name="show_lyrics">Zobrazit texty</string>
157157
<string name="show_more_info">Zobrazit více informací</string>
158158
<string name="track_info">Informace o skladbě</string>
159-
<string name="date_of_last_recognition">Datum posledního rozpoznávání: %n%s</string>
159+
<string name="format_date_of_last_recognition">Datum posledního rozpoznávání: %n%s</string>
160160
<string name="track_not_found_message">Něco se pokazilo, skladba možná byla odebrána nebo nesprávně upravena</string>
161161
<string name="track_not_found">Skladba nebyla nalezena</string>
162162
<string name="loading">Načítání</string>
163-
<string name="ver">"verze %s"</string>
163+
<string name="format_version">Verze %s</string>
164164
<string name="music_recognizing_app">Aplikace pro rozpoznávání hudby</string>
165165
<string name="powered_by_audd">Poháněno službou AudD®</string>
166166
<string name="github_repository">Repozitář GitHub</string>

‎core/strings/src/main/res/values-ru/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<string name="cancel_selected">Отменить выбранные</string>
147147
<string name="delete_selected">Удалить выбранные</string>
148148
<string name="queue">Очередь</string>
149-
<string name="status_colon">Статус: %s</string>
149+
<string name="format_status">Статус: %s</string>
150150
<string name="enqueued">В очереди</string>
151151
<string name="track_found">Трек найден</string>
152152
<string name="idle">Простаивает</string>
@@ -156,11 +156,11 @@
156156
<string name="show_lyrics">Показать текст песни</string>
157157
<string name="show_more_info">Показать доп. инфо</string>
158158
<string name="track_info">Доп. инфо о треке</string>
159-
<string name="date_of_last_recognition">Дата последнего распознавания:%n%s</string>
159+
<string name="format_date_of_last_recognition">Дата последнего распознавания:%n%s</string>
160160
<string name="track_not_found_message">Что-то пошло не так, возможно, трек был удален или неправильно изменен</string>
161161
<string name="track_not_found">Трек не найден</string>
162162
<string name="loading">Загрузка</string>
163-
<string name="ver">верcия %s</string>
163+
<string name="format_version">Верcия %s</string>
164164
<string name="music_recognizing_app">Приложение для распознавания музыки</string>
165165
<string name="powered_by_audd">Работает с помощью сервиса AudD®</string>
166166
<string name="github_repository">Репозиторий GitHub</string>

‎core/strings/src/main/res/values-sk/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<string name="cancel_selected">Zrušiť označené</string>
142142
<string name="delete_selected">Zmazať označené</string>
143143
<string name="queue">Fronta</string>
144-
<string name="status_colon">Stav: %s</string>
144+
<string name="format_status">Stav: %s</string>
145145
<string name="enqueued">Zaradené do poradia</string>
146146
<string name="track_found">Stopa nájdená</string>
147147
<string name="idle">Nečinný</string>
@@ -151,11 +151,11 @@
151151
<string name="show_lyrics">Zobraziť text</string>
152152
<string name="show_more_info">Zobraziť viac informácií</string>
153153
<string name="track_info">Informácie o pesničke</string>
154-
<string name="date_of_last_recognition">Dátum posledného rozpoznania:%n%s</string>
154+
<string name="format_date_of_last_recognition">Dátum posledného rozpoznania:%n%s</string>
155155
<string name="track_not_found_message">Niečo sa pokazilo, stopa mohla byť odstránená alebo nesprávne upravená</string>
156156
<string name="track_not_found">Skladba sa nenašla</string>
157157
<string name="loading">Načítavam</string>
158-
<string name="ver">"version %s"</string>
158+
<string name="format_version">Version %s</string>
159159
<string name="music_recognizing_app">Aplikácia na rozpoznávanie hudby</string>
160160
<string name="powered_by_audd">Poháňaný AudD®</string>
161161
<string name="github_repository">GitHub repozitár</string>

‎core/strings/src/main/res/values/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<string name="cancel_selected">Cancel selected</string>
156156
<string name="delete_selected">Delete selected</string>
157157
<string name="queue">Queue</string>
158-
<string name="status_colon">Status: %s</string>
158+
<string name="format_status">Status: %s</string>
159159
<string name="enqueued">Enqueued</string>
160160
<string name="track_found">Track found</string>
161161
<string name="idle">Idle</string>
@@ -165,11 +165,11 @@
165165
<string name="show_lyrics">Show lyrics</string>
166166
<string name="show_more_info">Show more info</string>
167167
<string name="track_info">Track info</string>
168-
<string name="date_of_last_recognition">Date of last recognition:%n%s</string>
168+
<string name="format_date_of_last_recognition">Date of last recognition:%n%s</string>
169169
<string name="track_not_found_message">Something went wrong, the track may have been removed or modified incorrectly</string>
170170
<string name="track_not_found">The track not found</string>
171171
<string name="loading">Loading</string>
172-
<string name="ver">"version %s"</string>
172+
<string name="format_version">Version %s</string>
173173
<string name="music_recognizing_app">Music recognition application</string>
174174
<string name="powered_by_audd">Powered by AudD® service</string>
175175
<string name="github_repository">GitHub repository</string>

‎fastlane/metadata/android/en-US/changelogs/5.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* Added Czech translation (thanks to Fjuro)
22
* Added optional in-app vibrations (can be enabled via preferences)
3-
* Fixed a bug with broken link to music service when the related app is installed
3+
* Fixed a bug with broken link to music service when the related app is installed
4+
* Minor UI fixes

‎fastlane/metadata/android/ru/changelogs/5.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* Добавлен чешский перевод (спасибо Fjuro)
22
* Добавлена настройка вибраций
3-
* Исправлен баг с неработающей ссылкой на музыкальный сервис, если приложение сервиса установленно
3+
* Исправлен баг с неработающей ссылкой на музыкальный сервис, если приложение сервиса установленно
4+
* Незначительные исправления интерфейса

‎feature/onboarding/src/main/java/com/mrsep/musicrecognizer/feature/onboarding/presentation/TokenPage.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,9 @@ internal fun TokenPage(
157157
)
158158

159159
FlowRow(
160-
modifier = Modifier.padding(top = 24.dp),
161-
horizontalArrangement = Arrangement.Center
160+
modifier = Modifier.padding(top = 20.dp),
161+
horizontalArrangement = Arrangement.Center,
162+
verticalArrangement = Arrangement.spacedBy(16.dp)
162163
) {
163164
OutlinedButton(
164165
onClick = onTokenSkip,

‎feature/onboarding/src/main/java/com/mrsep/musicrecognizer/feature/onboarding/presentation/WelcomePage.kt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
package com.mrsep.musicrecognizer.feature.onboarding.presentation
22

33
import androidx.compose.foundation.layout.*
4-
import androidx.compose.material3.Icon
54
import androidx.compose.material3.MaterialTheme
65
import androidx.compose.material3.Text
76
import androidx.compose.runtime.Composable
87
import androidx.compose.ui.Alignment
98
import androidx.compose.ui.Modifier
10-
import androidx.compose.ui.res.painterResource
119
import androidx.compose.ui.res.stringResource
1210
import androidx.compose.ui.text.style.TextAlign
1311
import androidx.compose.ui.unit.dp
1412
import com.mrsep.musicrecognizer.core.strings.R as StringsR
15-
import com.mrsep.musicrecognizer.core.ui.R as UiR
1613

1714
@Composable
1815
internal fun WelcomePage(
@@ -25,17 +22,13 @@ internal fun WelcomePage(
2522
) {
2623
Text(
2724
text = stringResource(StringsR.string.welcome),
25+
textAlign = TextAlign.Center,
2826
style = MaterialTheme.typography.headlineLarge
2927
)
30-
// Icon(
31-
// painter = painterResource(UiR.drawable.baseline_album_24),
32-
// contentDescription = null,
33-
// modifier = Modifier.padding(top = 24.dp).size(160.dp)
34-
// )
3528
Text(
3629
text = stringResource(StringsR.string.onboarding_welcome_message),
37-
style = MaterialTheme.typography.bodyLarge,
3830
textAlign = TextAlign.Center,
31+
style = MaterialTheme.typography.bodyLarge,
3932
modifier = Modifier
4033
.widthIn(max = 488.dp)
4134
.padding(top = 24.dp)

‎feature/preferences/src/main/java/com/mrsep/musicrecognizer/feature/preferences/presentation/RequiredServicesDialog.kt

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,49 +113,70 @@ internal fun RequiredServicesDialog(
113113
checked = dialogState.spotifyCheckBox,
114114
onCheckedChange = { dialogState.spotifyCheckBox = it }
115115
)
116-
Text(text = stringResource(StringsR.string.spotify))
116+
Text(
117+
text = stringResource(StringsR.string.spotify),
118+
style = MaterialTheme.typography.titleMedium
119+
)
117120
}
118121
Row(verticalAlignment = Alignment.CenterVertically) {
119122
Checkbox(
120123
checked = dialogState.youtubeCheckBox,
121124
onCheckedChange = { dialogState.youtubeCheckBox = it }
122125
)
123-
Text(text = stringResource(StringsR.string.youtube))
126+
Text(
127+
text = stringResource(StringsR.string.youtube),
128+
style = MaterialTheme.typography.titleMedium
129+
)
124130
}
125131
Row(verticalAlignment = Alignment.CenterVertically) {
126132
Checkbox(
127133
checked = dialogState.soundCloudCheckBox,
128134
onCheckedChange = { dialogState.soundCloudCheckBox = it }
129135
)
130-
Text(text = stringResource(StringsR.string.soundcloud))
136+
Text(
137+
text = stringResource(StringsR.string.soundcloud),
138+
style = MaterialTheme.typography.titleMedium
139+
)
131140
}
132141
Row(verticalAlignment = Alignment.CenterVertically) {
133142
Checkbox(
134143
checked = dialogState.appleMusicCheckBox,
135144
onCheckedChange = { dialogState.appleMusicCheckBox = it }
136145
)
137-
Text(text = stringResource(StringsR.string.apple_music))
146+
Text(
147+
text = stringResource(StringsR.string.apple_music),
148+
style = MaterialTheme.typography.titleMedium
149+
)
138150
}
139151
Row(verticalAlignment = Alignment.CenterVertically) {
140152
Checkbox(
141153
checked = dialogState.deezerCheckBox,
142154
onCheckedChange = { dialogState.deezerCheckBox = it }
143155
)
144-
Text(text = stringResource(StringsR.string.deezer))
156+
Text(
157+
text = stringResource(StringsR.string.deezer),
158+
style = MaterialTheme.typography.titleMedium
159+
)
145160
}
146161
Row(verticalAlignment = Alignment.CenterVertically) {
147162
Checkbox(
148163
checked = dialogState.napsterCheckBox,
149164
onCheckedChange = { dialogState.napsterCheckBox = it }
150165
)
151-
Text(text = stringResource(StringsR.string.napster))
166+
Text(
167+
text = stringResource(StringsR.string.napster),
168+
style = MaterialTheme.typography.titleMedium
169+
)
152170
}
153171
Row(verticalAlignment = Alignment.CenterVertically) {
154172
Checkbox(
155173
checked = dialogState.musicBrainzCheckBox,
156174
onCheckedChange = { dialogState.musicBrainzCheckBox = it }
157175
)
158-
Text(text = stringResource(StringsR.string.musicbrainz))
176+
Text(
177+
text = stringResource(StringsR.string.musicbrainz),
178+
style = MaterialTheme.typography.titleMedium
179+
)
159180
}
160181
}
161182
},

‎feature/preferences/src/main/java/com/mrsep/musicrecognizer/feature/preferences/presentation/about/AboutScreen.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.ui.Alignment
1515
import androidx.compose.ui.Modifier
1616
import androidx.compose.ui.platform.LocalContext
1717
import androidx.compose.ui.res.stringResource
18+
import androidx.compose.ui.text.style.TextAlign
1819
import androidx.compose.ui.unit.dp
1920
import coil.compose.AsyncImage
2021
import com.mrsep.musicrecognizer.core.common.util.getAppVersion
@@ -64,15 +65,18 @@ internal fun AboutScreen(
6465
modifier = Modifier.padding(top = 24.dp)
6566
)
6667
Text(
67-
text = stringResource(StringsR.string.ver, version),
68+
text = stringResource(StringsR.string.format_version, version),
69+
textAlign = TextAlign.Center,
6870
modifier = Modifier.padding(top = 8.dp)
6971
)
7072
Text(
7173
text = stringResource(StringsR.string.music_recognizing_app),
74+
textAlign = TextAlign.Center,
7275
modifier = Modifier.padding(top = 8.dp)
7376
)
7477
Text(
7578
text = stringResource(StringsR.string.powered_by_audd),
79+
textAlign = TextAlign.Center,
7680
modifier = Modifier.padding(top = 8.dp)
7781
)
7882

‎feature/recognition/src/main/java/com/mrsep/musicrecognizer/feature/recognition/presentation/queuescreen/LazyColumnEnqueuedItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,5 +358,5 @@ private fun getStatusMessage(enqueuedWithStatus: EnqueuedRecognitionWithStatus):
358358
ScheduledJobStatus.ENQUEUED -> stringResource(StringsR.string.enqueued)
359359
ScheduledJobStatus.RUNNING -> stringResource(StringsR.string.running)
360360
}
361-
return stringResource(StringsR.string.status_colon, statusDescription)
361+
return stringResource(StringsR.string.format_status, statusDescription)
362362
}

‎feature/track/src/main/java/com/mrsep/musicrecognizer/feature/track/presentation/track/TrackExtrasDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ internal fun TrackExtrasDialog(
2929
text = {
3030
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
3131
Text(
32-
text = stringResource(StringsR.string.date_of_last_recognition, lastRecognitionDate)
32+
text = stringResource(StringsR.string.format_date_of_last_recognition, lastRecognitionDate)
3333
)
3434
}
3535
}

0 commit comments

Comments
 (0)