Skip to content

Commit

Permalink
7.2.2 commit
Browse files Browse the repository at this point in the history
  • Loading branch information
XilinJia committed Jan 4, 2025
1 parent f83dd59 commit 2182b71
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
10 changes: 5 additions & 5 deletions app/src/main/kotlin/ac/mdiq/podcini/ui/compose/EpisodesVM.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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
Expand All @@ -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) {
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/3020335.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 2182b71

Please sign in to comment.