Fix spotless issues

pull/330/head
Don Turner 3 years ago
parent 56c0645816
commit c3f7870412

@ -204,7 +204,7 @@ class NavigationTest {
}
@Test
fun whenSettingsDialogDismissed_previousScreenIsDisplayed(){
fun whenSettingsDialogDismissed_previousScreenIsDisplayed() {
composeTestRule.apply {

@ -420,7 +420,6 @@ fun TopicIcon(
)
}
@DevicePreviews
@Composable
fun ForYouScreenPopulatedFeed() {

@ -31,10 +31,6 @@ import com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsStrea
import com.google.samples.apps.nowinandroid.core.domain.GetSaveableNewsResourcesStreamUseCase
import com.google.samples.apps.nowinandroid.core.domain.GetSortedFollowableAuthorsStreamUseCase
import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource
import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig.FOLLOW_SYSTEM
import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand.DEFAULT
import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsUiState.FollowedInterests
import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsUiState.None
@ -82,7 +78,6 @@ class ForYouViewModel @Inject constructor(
initialValue = Unknown
)
/**
* The in-progress set of topics to be selected, persisted through process death with a
* [SavedStateHandle].
@ -231,8 +226,6 @@ class ForYouViewModel @Inject constructor(
}
}
}
}
private fun Flow<List<SaveableNewsResource>>.mapToFeedState(): Flow<NewsFeedUiState> =

@ -52,7 +52,7 @@ class SettingsDialogTest {
}
@Test
fun whenStateIsSuccess_allSettingsAreDisplayed(){
fun whenStateIsSuccess_allSettingsAreDisplayed() {
composeTestRule.setContent {
SettingsDialog(
settingsUiState = Success(

@ -92,7 +92,7 @@ fun SettingsDialog(
},
text = {
Divider()
Column (Modifier.verticalScroll(rememberScrollState())) {
Column(Modifier.verticalScroll(rememberScrollState())) {
when (settingsUiState) {
Loading -> {
Text(
@ -199,7 +199,6 @@ fun SettingsDialogThemeChooserRow(
}
}
@Composable
private fun LegalPanel() {
Row(

@ -20,18 +20,16 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository
import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig.FOLLOW_SYSTEM
import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand.DEFAULT
import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Loading
import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Success
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import javax.inject.Inject
@HiltViewModel
class SettingsViewModel @Inject constructor(

@ -28,7 +28,7 @@ object SettingsDestination : NiaNavigationDestination {
}
@OptIn(ExperimentalLifecycleComposeApi::class)
fun NavGraphBuilder.settingsDialog(onDismiss : () -> Unit) {
fun NavGraphBuilder.settingsDialog(onDismiss: () -> Unit) {
dialog(route = SettingsDestination.route) {
SettingsDialog(onDismiss = onDismiss)
}

@ -66,7 +66,8 @@ class SettingsViewModelTest {
darkThemeConfig = DARK
)
),
viewModel.settingsUiState.value)
viewModel.settingsUiState.value
)
collectJob.cancel()
}

Loading…
Cancel
Save