From 2182b7161ee6ee07dc3933da52be3a519070f890 Mon Sep 17 00:00:00 2001 From: Xilin Jia <6257601+XilinJia@users.noreply.github.com> Date: Sat, 4 Jan 2025 12:58:59 +0100 Subject: [PATCH] 7.2.2 commit --- .../kotlin/ac/mdiq/podcini/ui/compose/EpisodesVM.kt | 10 +++++----- .../mdiq/podcini/ui/fragment/SubscriptionsFragment.kt | 10 +++++----- changelog.md | 1 + fastlane/metadata/android/en-US/changelogs/3020335.txt | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/ac/mdiq/podcini/ui/compose/EpisodesVM.kt b/app/src/main/kotlin/ac/mdiq/podcini/ui/compose/EpisodesVM.kt index 1a2cf13f..0978829e 100644 --- a/app/src/main/kotlin/ac/mdiq/podcini/ui/compose/EpisodesVM.kt +++ b/app/src/main/kotlin/ac/mdiq/podcini/ui/compose/EpisodesVM.kt @@ -1007,7 +1007,7 @@ fun EpisodesFilterDialog(filter: EpisodeFilter? = null, filtersDisabled: Mutable else if (item.values[1].filterId in filter.properties) selectedIndex = 1 } } - Text(stringResource(item.nameRes) + " :", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.headlineSmall, color = textColor, modifier = Modifier.padding(end = 10.dp)) + Text(stringResource(item.nameRes) + " :", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleLarge , color = textColor, modifier = Modifier.padding(end = 10.dp)) Spacer(Modifier.weight(0.3f)) OutlinedButton( modifier = Modifier.padding(0.dp), border = BorderStroke(2.dp, if (selectedIndex != 0) textColor else Color.Green), @@ -1047,12 +1047,12 @@ fun EpisodesFilterDialog(filter: EpisodeFilter? = null, filtersDisabled: Mutable val selectedList = remember { MutableList(item.values.size) { mutableStateOf(false)} } var expandRow by remember { mutableStateOf(false) } Row { - Text(stringResource(item.nameRes) + ".. :", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.headlineSmall, color = textColor, + Text(stringResource(item.nameRes) + ".. :", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleLarge , color = textColor, modifier = Modifier.clickable { expandRow = !expandRow }) var lowerSelected by remember { mutableStateOf(false) } var higherSelected by remember { mutableStateOf(false) } Spacer(Modifier.weight(1f)) - if (expandRow) Text("<<<", color = if (lowerSelected) Color.Green else buttonColor, style = MaterialTheme.typography.headlineSmall, modifier = Modifier.clickable { + if (expandRow) Text("<<<", color = if (lowerSelected) Color.Green else buttonColor, style = MaterialTheme.typography.titleLarge , modifier = Modifier.clickable { val hIndex = selectedList.indexOfLast { it.value } if (hIndex < 0) return@clickable if (!lowerSelected) for (i in 0..hIndex) selectedList[i].value = true @@ -1068,7 +1068,7 @@ fun EpisodesFilterDialog(filter: EpisodeFilter? = null, filtersDisabled: Mutable onFilterChanged(filterValues) }) Spacer(Modifier.weight(1f)) - if (expandRow) Text("X", color = buttonColor, style = MaterialTheme.typography.headlineSmall, modifier = Modifier.clickable { + if (expandRow) Text("X", color = buttonColor, style = MaterialTheme.typography.titleLarge , modifier = Modifier.clickable { lowerSelected = false higherSelected = false for (i in item.values.indices) { @@ -1078,7 +1078,7 @@ fun EpisodesFilterDialog(filter: EpisodeFilter? = null, filtersDisabled: Mutable onFilterChanged(filterValues) }) Spacer(Modifier.weight(1f)) - if (expandRow) Text(">>>", color = if (higherSelected) Color.Green else buttonColor, style = MaterialTheme.typography.headlineSmall, modifier = Modifier.clickable { + if (expandRow) Text(">>>", color = if (higherSelected) Color.Green else buttonColor, style = MaterialTheme.typography.titleLarge , modifier = Modifier.clickable { val lIndex = selectedList.indexOfFirst { it.value } if (lIndex < 0) return@clickable if (!higherSelected) { diff --git a/app/src/main/kotlin/ac/mdiq/podcini/ui/fragment/SubscriptionsFragment.kt b/app/src/main/kotlin/ac/mdiq/podcini/ui/fragment/SubscriptionsFragment.kt index 13b51d65..295fe427 100644 --- a/app/src/main/kotlin/ac/mdiq/podcini/ui/fragment/SubscriptionsFragment.kt +++ b/app/src/main/kotlin/ac/mdiq/podcini/ui/fragment/SubscriptionsFragment.kt @@ -1287,7 +1287,7 @@ class SubscriptionsFragment : Fragment() { else if (item.values[1].filterId in filter.properties) selectedIndex = 1 } } - Text(stringResource(item.nameRes) + " :", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.headlineSmall, color = textColor, modifier = Modifier.padding(end = 10.dp)) + Text(stringResource(item.nameRes) + " :", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleLarge , color = textColor, modifier = Modifier.padding(end = 10.dp)) Spacer(Modifier.weight(0.3f)) OutlinedButton(modifier = Modifier.padding(0.dp).heightIn(min = 20.dp).widthIn(min = 20.dp), border = BorderStroke(2.dp, if (selectedIndex != 0) textColor else Color.Green), @@ -1327,11 +1327,11 @@ class SubscriptionsFragment : Fragment() { val selectedList = remember { MutableList(item.values.size) { mutableStateOf(false)} } var expandRow by remember { mutableStateOf(false) } Row { - Text(stringResource(item.nameRes) + ".. :", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.headlineSmall, color = textColor, modifier = Modifier.clickable { expandRow = !expandRow }) + Text(stringResource(item.nameRes) + ".. :", fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleLarge , color = textColor, modifier = Modifier.clickable { expandRow = !expandRow }) var lowerSelected by remember { mutableStateOf(false) } var higherSelected by remember { mutableStateOf(false) } Spacer(Modifier.weight(1f)) - if (expandRow) Text("<<<", color = if (lowerSelected) Color.Green else textColor, style = MaterialTheme.typography.headlineSmall, modifier = Modifier.clickable { + if (expandRow) Text("<<<", color = if (lowerSelected) Color.Green else textColor, style = MaterialTheme.typography.titleLarge , modifier = Modifier.clickable { val hIndex = selectedList.indexOfLast { it.value } if (hIndex < 0) return@clickable if (!lowerSelected) { @@ -1348,7 +1348,7 @@ class SubscriptionsFragment : Fragment() { onFilterChanged(filterValues) }) Spacer(Modifier.weight(1f)) - if (expandRow) Text("X", color = textColor, style = MaterialTheme.typography.headlineSmall, modifier = Modifier.clickable { + if (expandRow) Text("X", color = textColor, style = MaterialTheme.typography.titleLarge , modifier = Modifier.clickable { lowerSelected = false higherSelected = false for (i in item.values.indices) { @@ -1358,7 +1358,7 @@ class SubscriptionsFragment : Fragment() { onFilterChanged(filterValues) }) Spacer(Modifier.weight(1f)) - if (expandRow) Text(">>>", color = if (higherSelected) Color.Green else textColor, style = MaterialTheme.typography.headlineSmall, modifier = Modifier.clickable { + if (expandRow) Text(">>>", color = if (higherSelected) Color.Green else textColor, style = MaterialTheme.typography.titleLarge , modifier = Modifier.clickable { val lIndex = selectedList.indexOfFirst { it.value } if (lIndex < 0) return@clickable if (!higherSelected) { diff --git a/changelog.md b/changelog.md index 8bda515e..506c5aa7 100644 --- a/changelog.md +++ b/changelog.md @@ -7,6 +7,7 @@ * enhanced episodes lists progressive loading * avoided crash when playing unreleased youtube media * added some error messages in streaming Youtube media +* reduced font size a bit in episodes and subscriptions filter dialogs * encapsulated variables in some fragments # 7.2.1 diff --git a/fastlane/metadata/android/en-US/changelogs/3020335.txt b/fastlane/metadata/android/en-US/changelogs/3020335.txt index 0517bb4d..5a6c9308 100644 --- a/fastlane/metadata/android/en-US/changelogs/3020335.txt +++ b/fastlane/metadata/android/en-US/changelogs/3020335.txt @@ -7,4 +7,5 @@ * enhanced episodes lists progressive loading * avoided crash when playing unreleased youtube media * added some error messages in streaming Youtube media +* reduced font size a bit in episodes and subscriptions filter dialogs * encapsulated variables in some fragments