Skip to content

Commit

Permalink
Fix spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
JolandaVerhoef committed Nov 20, 2023
1 parent 89ea885 commit 1236df2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
package com.example.jetnews.ui

import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.add
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.systemBars
import androidx.compose.material3.DrawerState
import androidx.compose.material3.DrawerValue
import androidx.compose.material3.ExperimentalMaterial3Api
Expand All @@ -33,8 +27,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.example.jetnews.data.AppContainer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import android.content.Intent
import android.content.res.Configuration.UI_MODE_NIGHT_YES
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
Expand Down Expand Up @@ -160,10 +159,9 @@ private fun ArticleScreenContent(
post = post,
contentPadding = innerPadding,
modifier = Modifier
.nestedScroll(scrollBehavior.nestedScrollConnection)
// innerPadding takes into account the top and bottom bar
.nestedScroll(scrollBehavior.nestedScrollConnection),
// innerPadding takes into account the top and bottom bar
// .padding(innerPadding)
,
state = lazyListState,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,8 @@ private fun HomeScreenWithList(
onRefresh = onRefreshPosts,
content = {
when (uiState) {
is HomeUiState.HasPosts -> hasPostsContent(uiState, innerPadding, contentModifier)
is HomeUiState.HasPosts ->
hasPostsContent(uiState, innerPadding, contentModifier)
is HomeUiState.NoPosts -> {
if (uiState.errorMessages.isEmpty()) {
// if there are no posts, and no error, let the user refresh manually
Expand All @@ -326,7 +327,8 @@ private fun HomeScreenWithList(
Box(
contentModifier
.padding(innerPadding)
.fillMaxSize()) { /* empty screen */ }
.fillMaxSize()
) { /* empty screen */ }
}
}
}
Expand Down

0 comments on commit 1236df2

Please sign in to comment.