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

Jump to bottom

Move save to the topbar of user settings and deduplicate topbar code #1243

Merged
merged 5 commits into from
Sep 20, 2023
Merged

Move save to the topbar of user settings and deduplicate topbar code #1243

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
918e540
Move save to the topbar of user settings and deduplicate topbar code
MV-GH Sep 17, 2023
21e44b6
Refactor SaveTopBar to ActionTopBar
MV-GH Sep 19, 2023
112477f
Refactor naming
MV-GH Sep 19, 2023
8a88741
Merge branch 'main' into refactor/move_save_to_topbar
MV-GH Sep 19, 2023
328e5c2
Fix formatting
MV-GH Sep 19, 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
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/comment/edit/CommentEditActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import com.jerboa.feat.doIfReadyElseDisplayInfo
import com.jerboa.model.AccountViewModel
import com.jerboa.model.CommentEditViewModel
import com.jerboa.ui.components.common.JerboaSnackbarHost
import com.jerboa.ui.components.common.SaveTopBar
import com.jerboa.ui.components.common.ActionTopBar
import com.jerboa.ui.components.common.getCurrentAccount

object CommentEditReturn {
Expand Down Expand Up @@ -63,7 +63,7 @@ fun CommentEditActivity(
Scaffold(
snackbarHost = { JerboaSnackbarHost(snackbarHostState) },
topBar = {
SaveTopBar(
ActionTopBar(
loading = loading,
onBackClick = appState::popBackStack,
onSaveClick = {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReplyActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import com.jerboa.model.CommentReplyViewModel
import com.jerboa.model.ReplyItem
import com.jerboa.model.SiteViewModel
import com.jerboa.ui.components.common.LoadingBar
import com.jerboa.ui.components.common.SaveTopBar
import com.jerboa.ui.components.common.ActionTopBar
import com.jerboa.ui.components.common.getCurrentAccount

object CommentReplyReturn {
Expand Down Expand Up @@ -63,7 +63,7 @@ fun CommentReplyActivity(

Scaffold(
topBar = {
SaveTopBar(
ActionTopBar(
title = stringResource(R.string.comment_reply_reply),
loading = loading,
onBackClick = appState::popBackStack,
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -670,7 +670,7 @@ fun JerboaPullRefreshIndicator(

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SaveTopBar(
fun ActionTopBar(
onBackClick: () -> Unit,
onSaveClick: () -> Unit,
dessalines marked this conversation as resolved.
Show resolved Hide resolved
loading: Boolean,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/post/create/CreatePostActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import com.jerboa.imageInputStreamFromUri
import com.jerboa.model.AccountViewModel
import com.jerboa.model.CreatePostViewModel
import com.jerboa.ui.components.common.LoadingBar
import com.jerboa.ui.components.common.SaveTopBar
import com.jerboa.ui.components.common.ActionTopBar
import com.jerboa.ui.components.common.getCurrentAccount
import com.jerboa.ui.components.community.list.CommunityListReturn
import com.jerboa.ui.components.post.composables.CreateEditPostBody
Expand Down Expand Up @@ -123,7 +123,7 @@ fun CreatePostActivity(
ApiState.Loading -> true
else -> false
}
SaveTopBar(
ActionTopBar(
formValid = formValid,
loading = loading,
onSaveClick = {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/post/edit/PostEditActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import com.jerboa.imageInputStreamFromUri
import com.jerboa.model.AccountViewModel
import com.jerboa.model.PostEditViewModel
import com.jerboa.ui.components.common.LoadingBar
import com.jerboa.ui.components.common.SaveTopBar
import com.jerboa.ui.components.common.ActionTopBar
import com.jerboa.ui.components.common.getCurrentAccount
import com.jerboa.ui.components.post.composables.CreateEditPostBody
import com.jerboa.validatePostName
Expand Down Expand Up @@ -76,7 +76,7 @@ fun PostEditActivity(
ApiState.Loading -> true
else -> false
}
SaveTopBar(
ActionTopBar(
onBackClick = appState::popBackStack,
formValid = formValid,
loading = loading,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/privatemessage/CreatePrivateMessageActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import com.jerboa.datatypes.types.PrivateMessageResponse
import com.jerboa.db.entity.isAnon
import com.jerboa.model.AccountViewModel
import com.jerboa.ui.components.common.MarkdownTextField
import com.jerboa.ui.components.common.SaveTopBar
import com.jerboa.ui.components.common.ActionTopBar
import com.jerboa.ui.components.common.getCurrentAccount
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -60,7 +60,7 @@ fun CreatePrivateMessageActivity(
val focusManager = LocalFocusManager.current
Scaffold(
topBar = {
SaveTopBar(
ActionTopBar(
title = personName,
loading = loading,
onBackClick = onBack,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/privatemessage/PrivateMessageReplyActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import com.jerboa.model.AccountViewModel
import com.jerboa.model.PrivateMessageReplyViewModel
import com.jerboa.model.SiteViewModel
import com.jerboa.ui.components.common.LoadingBar
import com.jerboa.ui.components.common.SaveTopBar
import com.jerboa.ui.components.common.ActionTopBar
import com.jerboa.ui.components.common.getCurrentAccount

object PrivateMessage {
Expand Down Expand Up @@ -61,7 +61,7 @@ fun PrivateMessageReplyActivity(
Surface(color = MaterialTheme.colorScheme.background) {
Scaffold(
topBar = {
SaveTopBar(
ActionTopBar(
loading = loading,
onBackClick = onBack,
onSaveClick = {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/report/comment/CreateCommentReportActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import com.jerboa.datatypes.types.CommentId
import com.jerboa.db.entity.isAnon
import com.jerboa.model.AccountViewModel
import com.jerboa.model.CreateReportViewModel
import com.jerboa.ui.components.common.SaveTopBar
import com.jerboa.ui.components.common.ActionTopBar
import com.jerboa.ui.components.common.getCurrentAccount
import com.jerboa.ui.components.report.CreateReportBody

Expand All @@ -46,7 +46,7 @@ fun CreateCommentReportActivity(
val focusManager = LocalFocusManager.current
Scaffold(
topBar = {
SaveTopBar(
ActionTopBar(
title = stringResource(R.string.create_report_report),
loading = loading,
onBackClick = onBack,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/report/post/CreatePostReportActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import com.jerboa.datatypes.types.PostId
import com.jerboa.db.entity.isAnon
import com.jerboa.model.AccountViewModel
import com.jerboa.model.CreateReportViewModel
import com.jerboa.ui.components.common.SaveTopBar
import com.jerboa.ui.components.common.ActionTopBar
import com.jerboa.ui.components.common.getCurrentAccount
import com.jerboa.ui.components.report.CreateReportBody

Expand All @@ -48,7 +48,7 @@ fun CreatePostReportActivity(

Scaffold(
topBar = {
SaveTopBar(
ActionTopBar(
title = stringResource(R.string.create_report_report),
loading = loading,
onBackClick = onBack,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import com.jerboa.model.AccountSettingsViewModel
import com.jerboa.model.AccountViewModel
import com.jerboa.model.SiteViewModel
import com.jerboa.ui.components.common.JerboaSnackbarHost
import com.jerboa.ui.components.common.SaveTopBar
import com.jerboa.ui.components.common.ActionTopBar
import com.jerboa.ui.components.common.getCurrentAccount

@OptIn(ExperimentalMaterial3Api::class)
Expand All @@ -39,7 +39,7 @@ fun AccountSettingsActivity(
Scaffold(
snackbarHost = { JerboaSnackbarHost(snackbarHostState) },
topBar = {
SaveTopBar(
ActionTopBar(
onBackClick = onBack,
onSaveClick = {
accountSettingsViewModel.saveSettings(
Expand Down