From 06072be56c229a083bde04818a63f0d5b941e03c Mon Sep 17 00:00:00 2001 From: Saeed Noshadi Date: Wed, 18 May 2022 20:53:08 +0430 Subject: [PATCH 1/5] fix done button color in the darkmode and lightmode --- .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt | 2 +- .../apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index 1a03d2751..1dc1d3198 100644 --- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -287,7 +287,7 @@ private fun LazyListScope.InterestsSelection( ) { Text( text = stringResource(R.string.done), - color = MaterialTheme.colorScheme.onPrimary + style = MaterialTheme.typography.bodyMedium ) } } diff --git a/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt index 87412f1f3..afa3155f9 100644 --- a/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt +++ b/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt @@ -18,6 +18,7 @@ package com.google.samples.apps.nowinandroid.feature.foryou import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test +import app.cash.turbine.test import com.google.samples.apps.nowinandroid.core.model.data.Author import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic From 9998658210e6ae5dcb9875f532352499df24b6f9 Mon Sep 17 00:00:00 2001 From: Saeed Noshadi Date: Wed, 18 May 2022 20:58:22 +0430 Subject: [PATCH 2/5] revert a import line --- .../apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt index afa3155f9..87412f1f3 100644 --- a/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt +++ b/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt @@ -18,7 +18,6 @@ package com.google.samples.apps.nowinandroid.feature.foryou import androidx.lifecycle.SavedStateHandle import app.cash.turbine.test -import app.cash.turbine.test import com.google.samples.apps.nowinandroid.core.model.data.Author import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic From ecd52300c2c741779b424f5733b00716bf4a3e11 Mon Sep 17 00:00:00 2001 From: Saeed Noshadi Date: Thu, 19 May 2022 11:52:49 +0430 Subject: [PATCH 3/5] used NiaFilledButton instead of Button --- .../apps/nowinandroid/feature/foryou/ForYouScreen.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index 1dc1d3198..993c2f546 100644 --- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -90,6 +90,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.SaveableNewsResource import com.google.samples.apps.nowinandroid.core.model.data.Topic import com.google.samples.apps.nowinandroid.core.ui.LoadingWheel import com.google.samples.apps.nowinandroid.core.ui.NewsResourceCardExpanded +import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilledButton import com.google.samples.apps.nowinandroid.core.ui.component.NiaGradientBackground import com.google.samples.apps.nowinandroid.core.ui.component.NiaToggleButton import com.google.samples.apps.nowinandroid.core.ui.component.NiaTopAppBar @@ -275,7 +276,7 @@ private fun LazyListScope.InterestsSelection( horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth() ) { - Button( + NiaFilledButton( onClick = saveFollowedTopics, enabled = interestsSelectionState.canSaveInterests, modifier = Modifier @@ -286,8 +287,7 @@ private fun LazyListScope.InterestsSelection( ) ) { Text( - text = stringResource(R.string.done), - style = MaterialTheme.typography.bodyMedium + text = stringResource(R.string.done) ) } } From f55ad14a3d8d359431a21c6466986f98171fd2a1 Mon Sep 17 00:00:00 2001 From: Saeed Noshadi Date: Thu, 19 May 2022 11:57:55 +0430 Subject: [PATCH 4/5] remove colors --- .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index 993c2f546..c87e66a22 100644 --- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -281,10 +281,7 @@ private fun LazyListScope.InterestsSelection( enabled = interestsSelectionState.canSaveInterests, modifier = Modifier .padding(horizontal = 40.dp) - .width(364.dp), - colors = ButtonDefaults.buttonColors( - containerColor = MaterialTheme.colorScheme.onBackground - ) + .width(364.dp) ) { Text( text = stringResource(R.string.done) From 829d4daf271d39e637c8e52a6d2fbd79fa3f7854 Mon Sep 17 00:00:00 2001 From: Saeed Noshadi Date: Thu, 19 May 2022 20:58:43 +0430 Subject: [PATCH 5/5] run spotlessApply task --- .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index c87e66a22..2ab82c054 100644 --- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -50,8 +50,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.outlined.AccountCircle -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme