Skip to content
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

Fix deprecations #962

Merged
merged 2 commits into from
Jul 3, 2023
Merged

Fix deprecations #962

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
1eac896
Fix deprecations
MV-GH Jul 3, 2023
da1734c
Fix formatting
MV-GH Jul 3, 2023
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
11 changes: 5 additions & 6 deletions app/src/main/java/com/jerboa/ui/components/common/AppBars.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.rememberLazyListState
Expand Down Expand Up @@ -43,9 +44,6 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import com.google.accompanist.flowlayout.FlowCrossAxisAlignment
import com.google.accompanist.flowlayout.FlowMainAxisAlignment
import com.google.accompanist.flowlayout.FlowRow
import com.jerboa.R
import com.jerboa.datatypes.samplePerson
import com.jerboa.datatypes.samplePost
Expand Down Expand Up @@ -209,7 +207,7 @@ fun CommentNavigationBottomAppBar(
)
}

@OptIn(ExperimentalFoundationApi::class)
@OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class)
@Composable
fun CommentOrPostNodeHeader(
creator: Person,
Expand All @@ -229,8 +227,8 @@ fun CommentOrPostNodeHeader(
showAvatar: Boolean,
) {
FlowRow(
mainAxisAlignment = FlowMainAxisAlignment.SpaceBetween,
crossAxisAlignment = FlowCrossAxisAlignment.Center,
verticalArrangement = Arrangement.SpaceBetween,
horizontalArrangement = Arrangement.Center,
modifier = Modifier
.fillMaxWidth()
.padding(
Expand Down Expand Up @@ -502,6 +500,7 @@ fun Sidebar(
}
}

@OptIn(ExperimentalLayoutApi::class)
@Composable
fun CommentsAndPosts(
usersActiveDay: Int,
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/jerboa/ui/components/home/BottomNavActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import arrow.core.Either
import com.google.accompanist.navigation.animation.AnimatedNavHost
import com.google.accompanist.navigation.animation.composable
import com.google.accompanist.navigation.animation.rememberAnimatedNavController
import com.jerboa.api.ApiState
import com.jerboa.db.AccountViewModel
import com.jerboa.db.AppSettings
Expand Down Expand Up @@ -64,7 +64,7 @@ fun BottomNavActivity(
val ctx = LocalContext.current
val scope = rememberCoroutineScope()

val bottomNavController = rememberAnimatedNavController()
val bottomNavController = rememberNavController()
var selectedTab by rememberSaveable { mutableStateOf(BottomNavTab.Home) }
val onSelectTab = { tab: BottomNavTab ->
if (tab.needsLogin() && account == null) {
Expand Down Expand Up @@ -127,7 +127,7 @@ fun BottomNavActivity(
padding.calculateBottomPadding()
}

AnimatedNavHost(
NavHost(
navController = bottomNavController,
startDestination = BottomNavTab.Home.name,
modifier = Modifier.padding(bottom = bottomPadding),
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/com/jerboa/ui/components/post/PostListing.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
Expand Down Expand Up @@ -59,9 +61,6 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.navigation.compose.rememberNavController
import com.google.accompanist.flowlayout.FlowCrossAxisAlignment
import com.google.accompanist.flowlayout.FlowMainAxisAlignment
import com.google.accompanist.flowlayout.FlowRow
import com.jerboa.InstantScores
import com.jerboa.PostViewMode
import com.jerboa.R
Expand Down Expand Up @@ -1089,6 +1088,7 @@ fun PostVotingTile(
}
}

@OptIn(ExperimentalLayoutApi::class)
@Composable
fun PostListingList(
postView: PostView,
Expand Down Expand Up @@ -1137,9 +1137,9 @@ fun PostListingList(
) {
PostName(postView = postView)
FlowRow(
mainAxisAlignment = FlowMainAxisAlignment.Start,
mainAxisSpacing = SMALL_PADDING,
crossAxisAlignment = FlowCrossAxisAlignment.Center,
horizontalArrangement = Arrangement.spacedBy(SMALL_PADDING, Alignment.Start),
verticalArrangement = Arrangement.Center,

) {
if (showCommunityName) {
CommunityLink(
Expand Down