Skip to content

Feat/issue #33 - 알림 UI 개선 #34

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

Merged
Richter3766 merged 2 commits into from
Mar 2, 2025
Merged

Feat/issue #33 - 알림 UI 개선 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee8e00d
feat: 알림 화면 UI 개선
Richter3766 Mar 2, 2025
452ab22
refactor: 제목 화면 개선
Richter3766 Mar 2, 2025
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
63 changes: 56 additions & 7 deletions app/src/main/java/com/example/notimanager/presentation/ui/component/NotificationListView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.text.BasicText
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
Expand All @@ -18,7 +18,10 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
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.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.example.notimanager.common.objects.DateFormatter.formatTimestamp
import com.example.notimanager.domain.model.Notification
Expand Down Expand Up @@ -50,18 +53,64 @@ fun NotificationListView(notificationState: NotificationState) {

@Composable
fun NotificationItemView(notification: Notification, onClick: () -> Unit) {
var showModal by remember { mutableStateOf(false) }
Row(
modifier = Modifier
.padding(16.dp)
.fillMaxWidth()
.clickable(onClick = onClick),
verticalAlignment = Alignment.CenterVertically
.clickable(onClick = {
showModal = true
}),
verticalAlignment = Alignment.Top
) {
AppIconView(notification.notificationIcon)
Column {
BasicText(text = notification.title, style = MaterialTheme.typography.bodyLarge)
BasicText(text = notification.content, style = MaterialTheme.typography.bodyMedium)
BasicText(text = formatTimestamp(notification.timestamp), style = MaterialTheme.typography.bodyMedium)
Column (
modifier = Modifier.padding(start = 16.dp)
){
Text(
text = notification.title,
style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Bold)
)
Text(
text = notification.content,
style = MaterialTheme.typography.bodySmall
)
Text(
text = formatTimestamp(notification.timestamp),
style = MaterialTheme.typography.labelSmall,
color = Color.LightGray
)
}

if (showModal) {
BottomSheet(showModal, onDismiss = { showModal = false }){
Column(
modifier = Modifier
.fillMaxWidth()
.padding(16.dp)
) {
Text(
text = notification.title,
style = MaterialTheme.typography.labelLarge,
color = Color.Gray
)
Text(
text = notification.content,
style = MaterialTheme.typography.labelSmall,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
color = Color.Gray
)
ClickableTextView(text = "앱으로 이동", onClick = {
onClick()
showModal = false
})

ClickableTextView(text = "삭제", onClick = {
showModal = false
})
}
}
}
}
}
18 changes: 6 additions & 12 deletions .../main/java/com/example/notimanager/presentation/ui/component/NotificationTitleListView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,10 @@ fun NotificationTitleItemView(
Column (
modifier = Modifier.weight(1f)
){
if (notification.subText == "") {
Text(
text = notification.title,
style = MaterialTheme.typography.bodySmall.copy(fontWeight = FontWeight.Bold)
)
}else{
Text(
text = notification.subText,
style = MaterialTheme.typography.bodySmall.copy(fontWeight = FontWeight.Bold)
)
}
Text(
text = if (notification.subText == "") notification.title else notification.subText ,
style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Bold)
)
Text(
text = notification.content,
style = MaterialTheme.typography.bodySmall,
Expand All @@ -147,10 +140,11 @@ fun NotificationTitleItemView(
.padding(16.dp)
) {
Text(
text = notification.title,
text = if (notification.subText == "") notification.title else notification.subText,
style = MaterialTheme.typography.labelLarge,
color = Color.Gray
)

if (notification.priorityActive) {
ClickableTextView(text = "중요 알림 취소", onClick = {
priorityViewModel.removeTitlePriority(notificationId = notification.id){
Expand Down
Loading