From 450fa2b70d9736595a9b94466b5e94d255805c82 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sat, 3 Jun 2023 16:21:02 -0400 Subject: [PATCH] Removing some unnecessary code --- .../amethyst/ui/note/NoteCompose.kt | 25 ------ .../amethyst/ui/note/UserReactionsRow.kt | 6 -- .../ui/screen/loggedIn/NotificationScreen.kt | 90 +++++++++---------- 3 files changed, 45 insertions(+), 76 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt index 229b39407..9010900ca 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt @@ -40,7 +40,6 @@ import androidx.compose.material.Text import androidx.compose.material.darkColors import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Bolt -import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material.icons.filled.Link import androidx.compose.material.icons.filled.MoreVert @@ -799,30 +798,6 @@ fun RenderAppDefinition( } } - Row(verticalAlignment = Alignment.CenterVertically) { - Text( - text = note.idDisplayNote(), - modifier = Modifier.padding(top = 1.dp, bottom = 1.dp), - color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f) - ) - - IconButton( - modifier = Modifier - .size(25.dp) - .padding(start = 5.dp), - onClick = { clipboardManager.setText(AnnotatedString(note.idDisplayNote())); } - ) { - Icon( - imageVector = Icons.Default.ContentCopy, - null, - modifier = Modifier.size(15.dp), - tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f) - ) - } - } - - // DisplayNip05ProfileStatus(user) - val website = it.website if (!website.isNullOrEmpty()) { Row(verticalAlignment = Alignment.CenterVertically) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt index 082bfec3d..20d734838 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt @@ -270,12 +270,6 @@ class UserReactionsViewModel(val account: Account) : ViewModel() { var collectorJob: Job? = null init { - _reactions.value = emptyMap() - _boosts.value = emptyMap() - _zaps.value = emptyMap() - _replies.value = emptyMap() - takenIntoAccount = emptySet() - viewModelScope.launch(Dispatchers.IO) { initializeSuspend() diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt index 246d8dc3e..d673c8b90 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt @@ -123,52 +123,52 @@ fun SummaryBar(model: UserReactionsViewModel) { showChart = !showChart } - val lineChartCount = - lineChart( - lines = listOf(RoyalBlue, Color.Green, Color.Red).map { lineChartColor -> - LineChart.LineSpec( - lineColor = lineChartColor.toArgb(), - lineBackgroundShader = DynamicShaders.fromBrush( - Brush.verticalGradient( - listOf( - lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_START), - lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_END) - ) - ) - ) - ) - }, - targetVerticalAxisPosition = AxisPosition.Vertical.Start - ) - - val lineChartZaps = - lineChart( - lines = listOf(BitcoinOrange).map { lineChartColor -> - LineChart.LineSpec( - lineColor = lineChartColor.toArgb(), - lineBackgroundShader = DynamicShaders.fromBrush( - Brush.verticalGradient( - listOf( - lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_START), - lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_END) - ) - ) - ) - ) - }, - targetVerticalAxisPosition = AxisPosition.Vertical.End - ) - if (showChart) { - val axisModel by model.axisLabels.collectAsState() - val chartModel by model.chartModel.collectAsState() - chartModel?.let { - Row( - modifier = Modifier - .padding(vertical = 10.dp, horizontal = 20.dp) - .clickable(onClick = { showChart = !showChart }) - ) { - ProvideChartStyle() { + val lineChartCount = + lineChart( + lines = listOf(RoyalBlue, Color.Green, Color.Red).map { lineChartColor -> + LineChart.LineSpec( + lineColor = lineChartColor.toArgb(), + lineBackgroundShader = DynamicShaders.fromBrush( + Brush.verticalGradient( + listOf( + lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_START), + lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_END) + ) + ) + ) + ) + }, + targetVerticalAxisPosition = AxisPosition.Vertical.Start + ) + + val lineChartZaps = + lineChart( + lines = listOf(BitcoinOrange).map { lineChartColor -> + LineChart.LineSpec( + lineColor = lineChartColor.toArgb(), + lineBackgroundShader = DynamicShaders.fromBrush( + Brush.verticalGradient( + listOf( + lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_START), + lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_END) + ) + ) + ) + ) + }, + targetVerticalAxisPosition = AxisPosition.Vertical.End + ) + + Row( + modifier = Modifier + .padding(vertical = 10.dp, horizontal = 20.dp) + .clickable(onClick = { showChart = !showChart }) + ) { + ProvideChartStyle() { + val axisModel by model.axisLabels.collectAsState() + val chartModel by model.chartModel.collectAsState() + chartModel?.let { Chart( chart = remember(lineChartCount, lineChartZaps) { lineChartCount.plus(lineChartZaps)