Skip to content

Refactor FAB with onScroll animation #1475

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

Merged
merged 7 commits into from
Oct 3, 2024
Merged

Refactor FAB with onScroll animation #1475

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e27352a
refactor FAB with onScroll animation
jamilxt Sep 30, 2024
52be0a1
use mutableIntStateOf instead of mutableStateOf
jamilxt Sep 30, 2024
7a399c3
use mutableIntStateOf instead of mutableStateOf
jamilxt Sep 30, 2024
8f6061f
use built-in function to detect scroll event
jamilxt Oct 1, 2024
56750c8
apply spotless
jamilxt Oct 2, 2024
3520c95
Merge branch 'main' into reply/refactor/update-floating-action-button
jamilxt Oct 3, 2024
67c6a98
Merge branch 'main' into reply/refactor/update-floating-action-button
bentrengrove Oct 3, 2024
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
20 changes: 9 additions & 11 deletions Reply/app/src/main/java/com/example/reply/ui/ReplyListContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.layout.windowInsetsBottomHeight
Expand All @@ -35,9 +34,10 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material3.ExtendedFloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.LargeFloatingActionButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
Expand Down Expand Up @@ -113,20 +113,18 @@ fun ReplyInboxScreen(
)
// When we have bottom navigation we show FAB at the bottom end.
if (navigationType == ReplyNavigationType.BOTTOM_NAVIGATION) {
LargeFloatingActionButton(
ExtendedFloatingActionButton(
text = { Text(text = stringResource(id = R.string.compose)) },
icon = { Icon(Icons.Default.Edit, stringResource(id = R.string.compose)) },
onClick = { /*TODO*/ },
modifier = Modifier
.align(Alignment.BottomEnd)
.padding(16.dp),
containerColor = MaterialTheme.colorScheme.tertiaryContainer,
contentColor = MaterialTheme.colorScheme.onTertiaryContainer
) {
Icon(
imageVector = Icons.Default.Edit,
contentDescription = stringResource(id = R.string.compose),
modifier = Modifier.size(28.dp)
)
}
contentColor = MaterialTheme.colorScheme.onTertiaryContainer,
expanded = emailLazyListState.lastScrolledBackward ||
!emailLazyListState.canScrollBackward
)
}
}
}
Expand Down