Skip to content

Commit 1cc54fe

Browse files
authored
fix: Use full title/content while generating patterns (#74)
2 parents 218fc54 + 1cee877 commit 1cc54fe

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

app/src/main/java/co/adityarajput/notifilter/views/components/SupportingText.kt

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,35 @@ import co.adityarajput.notifilter.viewmodels.UpsertFilterViewModel
1616
fun SupportingText(viewModel: UpsertFilterViewModel, isPrimaryPattern: Boolean) {
1717
if (viewModel.state.values.notification == null) return
1818

19-
val title = viewModel.state.values.notification!!.title.getFirst(20)
20-
val content = viewModel.state.values.notification!!.content.getFirst(20)
19+
val title = viewModel.state.values.notification!!.title
20+
val content = viewModel.state.values.notification!!.content
2121

22-
val target = when (viewModel.state.values.regexTarget) {
23-
RegexTarget.TITLE -> title
22+
val target = (title.getFirst(20) to content.getFirst(20)).let { (title, content) ->
23+
when (viewModel.state.values.regexTarget) {
24+
RegexTarget.TITLE -> title
2425

25-
RegexTarget.CONTENT -> content
26+
RegexTarget.CONTENT -> content
2627

27-
RegexTarget.OR -> "$title' ${stringResource(R.string.or)} '$content"
28+
RegexTarget.OR -> "$title' ${stringResource(R.string.or)} '$content"
2829

29-
RegexTarget.AND if (isPrimaryPattern) -> title
30+
RegexTarget.AND if (isPrimaryPattern) -> title
3031

31-
else -> content
32+
else -> content
33+
}
3234
}
33-
val pattern = when (viewModel.state.values.regexTarget) {
34-
RegexTarget.OR -> title.generateRegex() + "|" + content.generateRegex()
35-
else -> target.generateRegex()
35+
36+
val pattern = (title.generateRegex() to content.generateRegex()).let { (title, content) ->
37+
when (viewModel.state.values.regexTarget) {
38+
RegexTarget.TITLE -> title
39+
40+
RegexTarget.CONTENT -> content
41+
42+
RegexTarget.OR -> "$title|$content"
43+
44+
RegexTarget.AND if (isPrimaryPattern) -> title
45+
46+
else -> content
47+
}
3648
}
3749

3850
Text(

0 commit comments

Comments
 (0)