Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ android {
applicationId = "co.adityarajput.notifilter"
minSdk = 29
targetSdk = 36
versionCode = 2
versionName = "1.0.1"
versionCode = 3
versionName = "1.0.2"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/java/co/adityarajput/notifilter/views/Navigator.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.navigation.NavOptions
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import co.adityarajput.notifilter.utils.hasNotificationListenerPermission
import co.adityarajput.notifilter.views.screens.AboutScreen
import co.adityarajput.notifilter.views.screens.FiltersScreen
import co.adityarajput.notifilter.views.screens.NotificationsScreen
import co.adityarajput.notifilter.views.screens.PermissionScreen
Expand All @@ -30,13 +31,20 @@ fun Navigator(controller: NavHostController) {
)
}
}
composable(Routes.FILTERS.name) { FiltersScreen({ controller.navigate(Routes.NOTIFICATIONS.name) }) }
composable(Routes.FILTERS.name) {
FiltersScreen(
{ controller.navigate(Routes.NOTIFICATIONS.name) },
{ controller.navigate(Routes.ABOUT.name) },
)
}
composable(Routes.NOTIFICATIONS.name) { NotificationsScreen({ controller.popBackStack() }) }
composable(Routes.ABOUT.name) { AboutScreen({ controller.popBackStack() }) }
}
}

enum class Routes() {
PERMISSION,
FILTERS,
NOTIFICATIONS,
ABOUT,
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import co.adityarajput.notifilter.views.icons.NotificationsOff
fun AppBar(
title: String,
canNavigateBack: Boolean,
navigateUp: () -> Unit = {},
leadingIconOnClick: () -> Unit = {},
actions: @Composable RowScope.() -> Unit = {},
) {
TopAppBar(
Expand All @@ -35,18 +35,16 @@ fun AppBar(
containerColor = MaterialTheme.colorScheme.primary,
),
navigationIcon = {
if (canNavigateBack) {
IconButton(onClick = navigateUp) {
IconButton(leadingIconOnClick) {
if (canNavigateBack) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = "Back button"
Icons.AutoMirrored.Filled.ArrowBack,
stringResource(R.string.alttext_back_button)
)
}
} else {
IconButton(onClick = { }) {
} else {
Icon(
imageVector = NotificationsOff,
contentDescription = "App logo"
NotificationsOff,
stringResource(R.string.alttext_app_logo)
)
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
package co.adityarajput.notifilter.views.screens

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.*
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import co.adityarajput.notifilter.R
import co.adityarajput.notifilter.views.Theme
import co.adityarajput.notifilter.views.components.AppBar
import co.adityarajput.notifilter.views.icons.NotificationsOff

@Composable
fun AboutScreen(goBack: () -> Unit) {
Scaffold(topBar = { AppBar(stringResource(R.string.about), true, goBack) }) { paddingValues ->
Box(
Modifier
.fillMaxSize()
.padding(paddingValues),
) {
Column(
Modifier
.fillMaxSize()
.padding(dimensionResource(R.dimen.padding_small)),
Arrangement.Top,
Alignment.CenterHorizontally,
) {
AboutCard {
Box(
Modifier
.padding(top = dimensionResource(R.dimen.padding_large))
.align(Alignment.CenterHorizontally),
Alignment.Center,
) {
Box(
Modifier
.size(80.dp)
.background(MaterialTheme.colorScheme.primary, shape = CircleShape),
Alignment.Center,
) {
Icon(
NotificationsOff,
stringResource(R.string.alttext_app_logo),
Modifier.size(50.dp),
)
}
}
Text(
buildAnnotatedString {
withStyle(
SpanStyle(
MaterialTheme.colorScheme.primary,
fontWeight = FontWeight.Bold,
)
) { append(stringResource(R.string.app_name)) }
append(stringResource(R.string.app_description))
},
Modifier.padding(dimensionResource(R.dimen.padding_large)),
style = MaterialTheme.typography.bodyLarge,
)
}
AboutCard {
Text(
AnnotatedString.fromHtml(stringResource(R.string.app_permissions)),
Modifier.padding(dimensionResource(R.dimen.padding_large)),
style = MaterialTheme.typography.bodyMedium,
)
}
AboutCard {
Text(
AnnotatedString.fromHtml(
stringResource(R.string.app_links),
TextLinkStyles(
SpanStyle(
MaterialTheme.colorScheme.primary,
textDecoration = TextDecoration.Underline,
),
),
),
Modifier.padding(dimensionResource(R.dimen.padding_large)),
style = MaterialTheme.typography.bodyMedium,
)
}
Spacer(Modifier.weight(1f))
Box(
Modifier
.fillMaxWidth()
.align(Alignment.CenterHorizontally),
contentAlignment = Alignment.Center
) {
Text(
AnnotatedString.fromHtml(
stringResource(R.string.dev_credit),
TextLinkStyles(
SpanStyle(
MaterialTheme.colorScheme.primary,
textDecoration = TextDecoration.Underline,
),
),
),
Modifier.padding(dimensionResource(R.dimen.padding_large)),
style = MaterialTheme.typography.bodyLarge,
)
}
}
}
}
}

@Composable
private fun AboutCard(content: @Composable ColumnScope.() -> Unit) {
Card(
Modifier
.fillMaxWidth()
.padding(dimensionResource(R.dimen.padding_small))
) { content() }
}

@Preview
@Composable
private fun AboutScreenPreview() = Theme { AboutScreen {} }
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
Expand All @@ -34,6 +33,7 @@ import java.lang.Integer.min
@Composable
fun FiltersScreen(
goToNotificationsScreen: () -> Unit,
goToAboutScreen: () -> Unit,
viewModel: FiltersViewModel = viewModel(factory = Provider.Factory),
) {
val filtersState = viewModel.filtersState.collectAsState()
Expand All @@ -49,7 +49,8 @@ fun FiltersScreen(
AppBar(
stringResource(R.string.app_name),
false,
actions = {
goToAboutScreen,
{
IconButton(goToNotificationsScreen) {
Icon(
History,
Expand Down Expand Up @@ -219,7 +220,7 @@ private fun AddFilterDialog(
stringResource(R.string.regexr_link),
TextLinkStyles(
SpanStyle(
Color(0xFF70ACFF),
MaterialTheme.colorScheme.primary,
textDecoration = TextDecoration.Underline,
)
)
Expand Down Expand Up @@ -272,7 +273,7 @@ private fun DeleteFilterDialog(
AlertDialog(
hideDialog,
title = { Text(stringResource(R.string.delete_filter)) },
text = { Text("Are you sure you want to delete this filter?") },
text = { Text(stringResource(R.string.delete_confirmation)) },
confirmButton = {
TextButton(
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ fun PermissionScreen(goToFiltersScreen: () -> Unit = {}) {
},
Modifier.padding(dimensionResource(R.dimen.padding_large)),
colors = ButtonDefaults.buttonColors(contentColor = MaterialTheme.colorScheme.onPrimaryContainer),
) { Text("Grant notification access") }
) { Text(stringResource(R.string.grant_permission)) }
} else {
Text(stringResource(R.string.onboarding_info_2))
Button(
Expand All @@ -76,8 +76,8 @@ fun PermissionScreen(goToFiltersScreen: () -> Unit = {}) {
},
Modifier.padding(top = dimensionResource(R.dimen.padding_large)),
colors = ButtonDefaults.buttonColors(contentColor = MaterialTheme.colorScheme.onPrimaryContainer),
) { Text("Disable optimization") }
TextButton(goToFiltersScreen) { Text("Skip") }
) { Text(stringResource(R.string.disable_optimization)) }
TextButton(goToFiltersScreen) { Text(stringResource(R.string.skip)) }
}
}
}
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,20 @@
<string name="add">Add</string>
<string name="cancel">Cancel</string>
<string name="delete_filter">Delete filter</string>
<string name="delete_confirmation">Are you sure you want to delete this filter?</string>
<string name="delete">Delete</string>
<string name="block_history">Block History</string>
<string name="no_notifications">No notifications blocked yet.</string>
<string name="onboarding_info_1">NotiFilter runs a low-impact background service that listens to all notifications and dismisses them based on your filters.\n\nNo data is sent off-device; NotiFilter doesn\'t have access to the internet.</string>
<string name="grant_permission">Grant permission</string>
<string name="onboarding_info_2">On some devices, the \'battery optimization\' feature leads to delayed notification dismissal, so you may still experience the initial disruption.</string>
<string name="disable_optimization">Disable optimization</string>
<string name="skip">Skip</string>
<string name="about">About</string>
<string name="app_description">" listens to all device notifications and quietly dismisses the ones that match your filters."</string>
<string name="app_links"><![CDATA[Licensed under <a href=\"https://github.com/BURG3R5/NotiFilter/blob/master/LICENSE\">GPLv3</a><br/>Source code available on <a href=\"https://github.com/BURG3R5/NotiFilter\">GitHub</a>]]></string>
<string name="app_permissions"><![CDATA[Permissions used: <ul><li>BIND_NOTIFICATION_LISTENER_SERVICE - to listen and react to notifications</li><li>QUERY_ALL_PACKAGES - to search through installed apps while adding filters</li><li>REQUEST_IGNORE_BATTERY_OPTIMIZATIONS (optional) - to prevent app from being killed in the background</li></ul>]]></string>
<string name="dev_credit"><![CDATA[Developed by <a href=\"https://github.com/BURG3R5/\">BURG3R5</a>]]></string>
<string name="alttext_app_logo">App logo</string>
<string name="alttext_back_button">Back button</string>
</resources>