Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(NotificationCard): rewrite & consistent usage #1426

Merged
merged 8 commits into from
Nov 1, 2023
Merged

feat(NotificationCard): rewrite & consistent usage #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b8531b
feat: major notification card improvements
Ushie Oct 25, 2023
4395b86
refactor: notification card overloads
Ushie Oct 25, 2023
04b3443
refactor: use notification card for update notification
Ushie Oct 24, 2023
5944acf
feat: improve notification card colors
Ushie Oct 24, 2023
8b8ac99
fix(NotificationCard): primaryAction does nothing
Ushie Oct 24, 2023
9a7258f
fix: cut off battery optimization string
Ushie Oct 24, 2023
1d12788
Merge branch 'compose-dev' into feat/notification-card
Ushie Nov 1, 2023
fdb6d6c
change colors back to error and onError
Ushie Nov 1, 2023
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
156 changes: 134 additions & 22 deletions app/src/main/java/app/revanced/manager/ui/component/NotificationCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,171 @@
package app.revanced.manager.ui.component

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Close
import androidx.compose.material3.Card
import androidx.compose.material3.CardColors
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import app.revanced.manager.R

@Composable
fun NotificationCard(
color: Color,
isWarning: Boolean = false,
title: String? = null,
text: String,
icon: ImageVector,
actions: (@Composable () -> Unit)?
) {
NotificationCardInstance(isWarning = isWarning) {
Column(
modifier = Modifier.padding(if (title != null) 20.dp else 16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp)
) {
if (title != null) {
Icon(
modifier = Modifier.size(36.dp),
imageVector = icon,
contentDescription = null,
tint = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
Column(
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
Text(
text = title,
style = MaterialTheme.typography.titleLarge,
color = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
Text(
text = text,
style = MaterialTheme.typography.bodyMedium,
color = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
}
} else {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
Icon(
modifier = Modifier.size(24.dp),
imageVector = icon,
contentDescription = null,
tint = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
Text(
text = text,
style = MaterialTheme.typography.bodyMedium,
color = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
actions?.invoke()
}
}
}

@Composable
fun NotificationCard(
isWarning: Boolean = false,
title: String? = null,
text: String,
content: (@Composable () -> Unit)? = null,
icon: ImageVector,
onDismiss: (() -> Unit)? = null,
primaryAction: (() -> Unit)? = null
) {
Card(
colors = CardDefaults.cardColors(containerColor = color),
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(28.dp))
) {
NotificationCardInstance(isWarning = isWarning, onClick = primaryAction) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(
16.dp,
Alignment.Start
)
horizontalArrangement = Arrangement.spacedBy(16.dp),
) {
Icon(
modifier = Modifier.size(if (title != null) 36.dp else 24.dp),
imageVector = icon,
contentDescription = null,
tint = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
Text(
modifier = if (content != null) Modifier.width(220.dp) else Modifier,
text = text,
style = MaterialTheme.typography.bodyMedium
)
content?.invoke()
if (title != null) {
Column(
modifier = Modifier.weight(1f),
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
Text(
text = title,
style = MaterialTheme.typography.titleLarge,
color = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
Text(
text = text,
style = MaterialTheme.typography.bodyMedium,
color = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
}
} else {
Text(
modifier = Modifier.weight(1f),
text = text,
style = MaterialTheme.typography.bodyMedium,
color = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
}
if (onDismiss != null) {
IconButton(onClick = onDismiss) {
Icon(
imageVector = Icons.Outlined.Close,
contentDescription = stringResource(R.string.close),
tint = if (isWarning) MaterialTheme.colorScheme.onError else MaterialTheme.colorScheme.onPrimaryContainer
)
}
}
}
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun NotificationCardInstance(
isWarning: Boolean = false,
onClick: (() -> Unit)? = null,
content: (@Composable () -> Unit),
) {
if (onClick != null) {
Card(
onClick = onClick,
colors = CardDefaults.cardColors(containerColor = (if (isWarning) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primaryContainer)),
modifier = Modifier
.fillMaxWidth()
.padding(16.dp)
.clip(RoundedCornerShape(24.dp))
) {
content.invoke()
}
} else {
Card(
colors = CardDefaults.cardColors(containerColor = (if (isWarning) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primaryContainer)),
modifier = Modifier
.fillMaxWidth()
.padding(16.dp)
.clip(RoundedCornerShape(24.dp))
) {
content.invoke()
}
}
}
13 changes: 3 additions & 10 deletions app/src/main/java/app/revanced/manager/ui/component/bundle/BundlePatchesDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,10 @@ fun BundlePatchesDialog(
item {
AnimatedVisibility(visible = informationCardVisible) {
NotificationCard(
color = MaterialTheme.colorScheme.secondaryContainer,
icon = Icons.Outlined.Lightbulb,
text = stringResource(R.string.tap_on_patches)
) {
IconButton(onClick = { informationCardVisible = false }) {
Icon(
imageVector = Icons.Outlined.Close,
contentDescription = stringResource(R.string.close),
)
}
}
text = stringResource(R.string.tap_on_patches),
onDismiss = { informationCardVisible = false }
)
}
}

Expand Down
22 changes: 9 additions & 13 deletions app/src/main/java/app/revanced/manager/ui/screen/InstalledAppsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ package app.revanced.manager.ui.screen

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
Expand All @@ -18,7 +16,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
Expand All @@ -40,16 +37,15 @@ fun InstalledAppsScreen(
val installedApps by viewModel.apps.collectAsStateWithLifecycle(initialValue = null)

Column {
if (!Aapt.supportsDevice())
Box(modifier = Modifier.padding(16.dp)) {
NotificationCard(
color = MaterialTheme.colorScheme.errorContainer,
icon = Icons.Outlined.WarningAmber,
text = stringResource(
R.string.unsupported_architecture_warning
),
)
}
if (!Aapt.supportsDevice()) {
NotificationCard(
isWarning = true,
icon = Icons.Outlined.WarningAmber,
text = stringResource(
R.string.unsupported_architecture_warning
),
)
}

LazyColumn(
modifier = Modifier.fillMaxSize(),
Expand Down
43 changes: 8 additions & 35 deletions app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,14 @@ import android.net.Uri
import android.os.PowerManager
import android.provider.Settings
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.BatteryAlert
Expand All @@ -29,14 +25,13 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import app.revanced.manager.R
import app.revanced.manager.ui.component.AppTopBar
import app.revanced.manager.ui.component.NotificationCard
import app.revanced.manager.ui.destination.SettingsDestination
import app.revanced.manager.ui.screen.settings.*
import app.revanced.manager.ui.screen.settings.update.ManagerUpdateChangelog
Expand Down Expand Up @@ -161,40 +156,18 @@ fun SettingsScreen(
.verticalScroll(rememberScrollState())
) {
AnimatedVisibility(visible = showBatteryButton) {
Card(
onClick = {
NotificationCard(
isWarning = true,
icon = Icons.Default.BatteryAlert,
text = stringResource(R.string.battery_optimization_notification),
primaryAction = {
context.startActivity(Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS).apply {
data = Uri.parse("package:${context.packageName}")
})
showBatteryButton =
!pm.isIgnoringBatteryOptimizations(context.packageName)
},
modifier = Modifier
.fillMaxWidth()
.padding(16.dp)
.clip(RoundedCornerShape(24.dp))
.background(MaterialTheme.colorScheme.tertiaryContainer),
) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(16.dp)
) {
Icon(
imageVector = Icons.Default.BatteryAlert,
contentDescription = null,
tint = MaterialTheme.colorScheme.onTertiaryContainer,
modifier = Modifier.size(24.dp)
)
Text(
text = stringResource(R.string.battery_optimization_notification),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onTertiaryContainer
)
}
}
)
}
settingsSections.forEach { (titleDescIcon, destination) ->
SettingsListItem(
Expand All @@ -209,4 +182,4 @@ fun SettingsScreen(
}
}
}
}
}
Loading