From cd643c2c429d88268a66c2f44a792cdbfe0b9a2e Mon Sep 17 00:00:00 2001 From: Paul Woitaschek Date: Sun, 22 Sep 2024 20:46:24 +0200 Subject: [PATCH] Enable the composable parameter naming rule --- .editorconfig | 1 - .../bottomSheet/BottomSheetContent.kt | 4 ++-- .../bottomSheet/BottomSheetItemViewModel.kt | 2 +- .../bottomSheet/BottomSheetViewModel.kt | 2 +- .../deleteBook/DeleteBookDialog.kt | 6 +++--- .../deleteBook/DeleteBookViewModel.kt | 4 ++-- .../EditBookCategoryViewModel.kt | 2 +- .../editTitle/EditBookTitleViewModel.kt | 2 +- .../fileCover/FileCoverViewModel.kt | 2 +- .../internetCover/InternetCoverViewModel.kt | 2 +- .../overview/BookOverviewViewModel.kt | 2 +- .../voice/bookOverview/views/BookOverview.kt | 14 ++++++------- .../voice/bookOverview/views/GridBooks.kt | 4 ++-- .../voice/bookOverview/views/ListBooks.kt | 4 ++-- .../bookOverview/views/PermissionBugCard.kt | 6 +++--- .../kotlin/voice/bookmark/BookmarkScreen.kt | 18 ++++++++--------- .../voice/bookmark/BookmarkViewModel.kt | 6 +++--- .../bookmark/dialogs/AddBookmarkDialog.kt | 6 +++--- .../selectType/FolderModeSelectionCard.kt | 6 +++--- .../selectType/SelectFolderType.kt | 12 +++++------ .../voice/migration/MigrationViewModel.kt | 12 +++++------ .../kotlin/voice/migration/views/Migration.kt | 20 +++++++++---------- .../migration/views/MigrationViewState.kt | 6 +++--- .../playbackScreen/BookPlayController.kt | 10 +++++----- .../voice/playbackScreen/BookPlayViewModel.kt | 12 +++++------ .../playbackScreen/SelectChapterDialog.kt | 2 +- .../kotlin/voice/review/AskForReviewDialog.kt | 12 +++++------ .../main/kotlin/voice/review/ReviewFeature.kt | 4 ++-- .../kotlin/voice/settings/SettingsListener.kt | 6 +++--- .../voice/settings/SettingsViewModel.kt | 6 +++--- .../voice/settings/views/AutoRewindRow.kt | 4 ++-- .../voice/settings/views/SeekTimeRow.kt | 4 ++-- .../kotlin/voice/settings/views/Settings.kt | 14 ++++++------- .../voice/settings/views/TimeSettingDialog.kt | 4 ++-- 34 files changed, 110 insertions(+), 111 deletions(-) diff --git a/.editorconfig b/.editorconfig index 3dd3f63e7..20d412a0e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,7 +16,6 @@ ktlint_code_style = intellij_idea ktlint_standard_function-expression-body = disabled ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2 ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2 -ktlint_compose_parameter-naming = disabled ij_java_class_count_to_use_import_on_demand = 999 ij_kotlin_allow_trailing_comma = true ij_kotlin_allow_trailing_comma_on_call_site = true diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt index 476200f7f..a57f2131e 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetContent.kt @@ -15,13 +15,13 @@ import androidx.compose.ui.unit.dp @Composable internal fun BottomSheetContent( state: EditBookBottomSheetState, - onItemClicked: (BottomSheetItem) -> Unit, + onItemClick: (BottomSheetItem) -> Unit, ) { Column { state.items.forEach { item -> ListItem( modifier = Modifier.clickable { - onItemClicked(item) + onItemClick(item) }, headlineContent = { Text(text = stringResource(item.titleRes)) diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt index d3894aa66..3686ef6e5 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetItemViewModel.kt @@ -5,7 +5,7 @@ import voice.common.BookId interface BottomSheetItemViewModel { suspend fun items(bookId: BookId): List - suspend fun onItemClicked( + suspend fun onItemClick( bookId: BookId, item: BottomSheetItem, ) diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt index ebdcc310c..56e7b59d9 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/bottomSheet/BottomSheetViewModel.kt @@ -34,7 +34,7 @@ class BottomSheetViewModel val bookId = bookId ?: return scope.launch { viewModels.forEach { - it.onItemClicked(bookId, item) + it.onItemClick(bookId, item) } } } diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt index 737e86adc..e56401cbb 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookDialog.kt @@ -26,7 +26,7 @@ internal fun DeleteBookDialog( viewState: DeleteBookViewState, onDismiss: () -> Unit, onConfirmDeletion: () -> Unit, - onDeleteCheckBoxChecked: (Boolean) -> Unit, + onDeleteCheckBoxCheck: (Boolean) -> Unit, ) { AlertDialog( onDismissRequest = onDismiss, @@ -65,12 +65,12 @@ internal fun DeleteBookDialog( .padding(top = 8.dp) .fillMaxWidth() .clickable { - onDeleteCheckBoxChecked(!viewState.deleteCheckBoxChecked) + onDeleteCheckBoxCheck(!viewState.deleteCheckBoxChecked) }, ) { Checkbox( checked = viewState.deleteCheckBoxChecked, - onCheckedChange = onDeleteCheckBoxChecked, + onCheckedChange = onDeleteCheckBoxCheck, ) Text(stringResource(id = StringsR.string.delete_book_dialog_deletion_confirmation)) } diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt index cc30b9a01..e49d5d65f 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/deleteBook/DeleteBookViewModel.kt @@ -36,7 +36,7 @@ constructor( return listOf(BottomSheetItem.DeleteBook) } - override suspend fun onItemClicked( + override suspend fun onItemClick( bookId: BookId, item: BottomSheetItem, ) { @@ -62,7 +62,7 @@ constructor( _state.value = null } - internal fun onDeleteCheckBoxChecked(checked: Boolean) { + internal fun onDeleteCheckBoxCheck(checked: Boolean) { _state.value = _state.value?.copy(deleteCheckBoxChecked = checked) } diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt index 926f95980..0bce415e0 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/editBookCategory/EditBookCategoryViewModel.kt @@ -38,7 +38,7 @@ constructor(private val repo: BookRepository) : BottomSheetItemViewModel { } } - override suspend fun onItemClicked( + override suspend fun onItemClick( bookId: BookId, item: BottomSheetItem, ) { diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt index f4e46ecdb..e9fa900e8 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/editTitle/EditBookTitleViewModel.kt @@ -30,7 +30,7 @@ constructor(private val repo: BookRepository) : BottomSheetItemViewModel { return listOf(BottomSheetItem.Title) } - override suspend fun onItemClicked( + override suspend fun onItemClick( bookId: BookId, item: BottomSheetItem, ) { diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt index 84aea9225..62aa72106 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/fileCover/FileCoverViewModel.kt @@ -22,7 +22,7 @@ constructor(private val navigator: Navigator) : BottomSheetItemViewModel { return listOf(BottomSheetItem.FileCover) } - override suspend fun onItemClicked( + override suspend fun onItemClick( bookId: BookId, item: BottomSheetItem, ) { diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt index 057da039d..3f22f57ce 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/internetCover/InternetCoverViewModel.kt @@ -19,7 +19,7 @@ constructor(private val navigator: Navigator) : BottomSheetItemViewModel { return listOf(BottomSheetItem.InternetCover) } - override suspend fun onItemClicked( + override suspend fun onItemClick( bookId: BookId, item: BottomSheetItem, ) { diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt b/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt index 652d78e3a..a54c6978b 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/overview/BookOverviewViewModel.kt @@ -237,7 +237,7 @@ constructor( playerController.playPause() } - fun onPermissionBugCardClicked() { + fun onPermissionBugCardClick() { if (Build.VERSION.SDK_INT >= 30) { navigator.goTo( Destination.Activity( diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt index 2222f0a7e..3ce0a8d30 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/BookOverview.kt @@ -102,7 +102,7 @@ fun BookOverviewScreen(modifier: Modifier = Modifier) { onSearchActiveChange = bookOverviewViewModel::onSearchActiveChange, onSearchQueryChange = bookOverviewViewModel::onSearchQueryChange, onSearchBookClick = bookOverviewViewModel::onSearchBookClick, - onPermissionBugCardClicked = bookOverviewViewModel::onPermissionBugCardClicked, + onPermissionBugCardClick = bookOverviewViewModel::onPermissionBugCardClick, ) val deleteBookViewState = deleteBookViewModel.state.value if (deleteBookViewState != null) { @@ -110,7 +110,7 @@ fun BookOverviewScreen(modifier: Modifier = Modifier) { viewState = deleteBookViewState, onDismiss = deleteBookViewModel::onDismiss, onConfirmDeletion = deleteBookViewModel::onConfirmDeletion, - onDeleteCheckBoxChecked = deleteBookViewModel::onDeleteCheckBoxChecked, + onDeleteCheckBoxCheck = deleteBookViewModel::onDeleteCheckBoxCheck, ) } val editBookTitleState = editBookTitleViewModel.state.value @@ -131,7 +131,7 @@ fun BookOverviewScreen(modifier: Modifier = Modifier) { content = { BottomSheetContent( state = bottomSheetViewModel.state.value, - onItemClicked = { item -> + onItemClick = { item -> if (item == BottomSheetItem.FileCover) { getContentLauncher.launch("image/*") } @@ -163,7 +163,7 @@ internal fun BookOverview( onSearchActiveChange: (Boolean) -> Unit, onSearchQueryChange: (String) -> Unit, onSearchBookClick: (BookId) -> Unit, - onPermissionBugCardClicked: () -> Unit, + onPermissionBugCardClick: () -> Unit, modifier: Modifier = Modifier, ) { val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() @@ -205,7 +205,7 @@ internal fun BookOverview( onBookClick = onBookClick, onBookLongClick = onBookLongClick, showPermissionBugCard = viewState.showStoragePermissionBugCard, - onPermissionBugCardClicked = onPermissionBugCardClicked, + onPermissionBugCardClick = onPermissionBugCardClick, ) } BookOverviewLayoutMode.Grid -> { @@ -214,7 +214,7 @@ internal fun BookOverview( onBookClick = onBookClick, onBookLongClick = onBookLongClick, showPermissionBugCard = viewState.showStoragePermissionBugCard, - onPermissionBugCardClicked = onPermissionBugCardClicked, + onPermissionBugCardClick = onPermissionBugCardClick, ) } } @@ -242,7 +242,7 @@ fun BookOverviewPreview( onSearchActiveChange = {}, onSearchQueryChange = {}, onSearchBookClick = {}, - onPermissionBugCardClicked = {}, + onPermissionBugCardClick = {}, ) } } diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt index 16ec21b2b..73d155df0 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/GridBooks.kt @@ -42,7 +42,7 @@ internal fun GridBooks( onBookClick: (BookId) -> Unit, onBookLongClick: (BookId) -> Unit, showPermissionBugCard: Boolean, - onPermissionBugCardClicked: () -> Unit, + onPermissionBugCardClick: () -> Unit, ) { val cellCount = gridColumnCount() LazyVerticalGrid( @@ -55,7 +55,7 @@ internal fun GridBooks( item( span = { GridItemSpan(maxLineSpan) }, ) { - PermissionBugCard(onPermissionBugCardClicked) + PermissionBugCard(onPermissionBugCardClick) } } books.forEach { (category, books) -> diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt index 3de29e58a..a6f5893fb 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/ListBooks.kt @@ -42,7 +42,7 @@ internal fun ListBooks( onBookClick: (BookId) -> Unit, onBookLongClick: (BookId) -> Unit, showPermissionBugCard: Boolean, - onPermissionBugCardClicked: () -> Unit, + onPermissionBugCardClick: () -> Unit, ) { LazyColumn( verticalArrangement = Arrangement.spacedBy(8.dp), @@ -50,7 +50,7 @@ internal fun ListBooks( ) { if (showPermissionBugCard) { item { - PermissionBugCard(onPermissionBugCardClicked) + PermissionBugCard(onPermissionBugCardClick) } } books.forEach { (category, books) -> diff --git a/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt b/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt index d461b84a6..708a13903 100644 --- a/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt +++ b/bookOverview/src/main/kotlin/voice/bookOverview/views/PermissionBugCard.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.unit.dp import voice.strings.R as StringsR @Composable -internal fun PermissionBugCard(onPermissionBugCardClicked: () -> Unit) { +internal fun PermissionBugCard(onPermissionBugCardClick: () -> Unit) { Card( Modifier .padding(horizontal = 8.dp) @@ -29,7 +29,7 @@ internal fun PermissionBugCard(onPermissionBugCardClicked: () -> Unit) { Text(text = stringResource(id = StringsR.string.storage_bug_subtitle)) Spacer(modifier = Modifier.size(16.dp)) Button( - onClick = onPermissionBugCardClicked, + onClick = onPermissionBugCardClick, ) { Text(text = stringResource(id = StringsR.string.storage_bug_button)) } @@ -40,5 +40,5 @@ internal fun PermissionBugCard(onPermissionBugCardClicked: () -> Unit) { @Composable @Preview private fun PermissionBugCardPreview() { - PermissionBugCard(onPermissionBugCardClicked = {}) + PermissionBugCard(onPermissionBugCardClick = {}) } diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt index 441ac82da..40ce8bd05 100644 --- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt +++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkScreen.kt @@ -68,12 +68,12 @@ fun BookmarkScreen(bookId: BookId) { BookmarkScreen( viewState = viewState, onClose = viewModel::closeScreen, - onAdd = viewModel::onAddClicked, + onAdd = viewModel::onAddClick, onDelete = viewModel::deleteBookmark, - onEdit = viewModel::onEditClicked, - onScrollConfirmed = viewModel::onScrollConfirmed, + onEdit = viewModel::onEditClick, + onScrollConfirm = viewModel::onScrollConfirm, onClick = viewModel::selectBookmark, - onNewBookmarkNameChosen = viewModel::addBookmark, + onNewBookmarkNameChoose = viewModel::addBookmark, onCloseDialog = viewModel::closeDialog, onEditBookmark = viewModel::editBookmark, ) @@ -86,10 +86,10 @@ internal fun BookmarkScreen( onAdd: () -> Unit, onDelete: (Bookmark.Id) -> Unit, onEdit: (Bookmark.Id) -> Unit, - onScrollConfirmed: () -> Unit, + onScrollConfirm: () -> Unit, onClick: (Bookmark.Id) -> Unit, onCloseDialog: () -> Unit, - onNewBookmarkNameChosen: (String) -> Unit, + onNewBookmarkNameChoose: (String) -> Unit, onEditBookmark: (Bookmark.Id, String) -> Unit, modifier: Modifier = Modifier, ) { @@ -123,11 +123,11 @@ internal fun BookmarkScreen( }, ) { paddingValues -> val lazyListState = rememberLazyListState() - LaunchedEffect(viewState.shouldScrollTo, onScrollConfirmed) { + LaunchedEffect(viewState.shouldScrollTo, onScrollConfirm) { val index = viewState.bookmarks.indexOfFirst { it.id == viewState.shouldScrollTo } if (index != -1) { lazyListState.animateScrollToItem(index) - onScrollConfirmed() + onScrollConfirm() } } LazyColumn( @@ -156,7 +156,7 @@ internal fun BookmarkScreen( BookmarkDialogViewState.AddBookmark -> { AddBookmarkDialog( onDismissRequest = onCloseDialog, - onBookmarkNameChosen = onNewBookmarkNameChosen, + onBookmarkNameChoose = onNewBookmarkNameChoose, ) } BookmarkDialogViewState.None -> { diff --git a/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt index d6d319773..9e13d7834 100644 --- a/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt +++ b/bookmark/src/main/kotlin/voice/bookmark/BookmarkViewModel.kt @@ -155,7 +155,7 @@ class BookmarkViewModel } } - fun onScrollConfirmed() { + fun onScrollConfirm() { shouldScrollTo = null } @@ -163,11 +163,11 @@ class BookmarkViewModel dialogViewState = BookmarkDialogViewState.None } - fun onAddClicked() { + fun onAddClick() { dialogViewState = BookmarkDialogViewState.AddBookmark } - fun onEditClicked(id: Bookmark.Id) { + fun onEditClick(id: Bookmark.Id) { val bookmark = bookmarks.find { it.id == id } ?: return dialogViewState = BookmarkDialogViewState.EditBookmark(id, bookmark.title) } diff --git a/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt index 47ecf38f4..adbaf954e 100644 --- a/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt +++ b/bookmark/src/main/kotlin/voice/bookmark/dialogs/AddBookmarkDialog.kt @@ -29,7 +29,7 @@ import voice.strings.R as StringsR @Composable internal fun AddBookmarkDialog( onDismissRequest: () -> Unit, - onBookmarkNameChosen: (String) -> Unit, + onBookmarkNameChoose: (String) -> Unit, ) { var bookmarkName by remember { mutableStateOf("") } val focusRequester = remember { FocusRequester() } @@ -54,7 +54,7 @@ internal fun AddBookmarkDialog( ), keyboardActions = KeyboardActions( onDone = { - onBookmarkNameChosen(bookmarkName) + onBookmarkNameChoose(bookmarkName) }, ), singleLine = true, @@ -64,7 +64,7 @@ internal fun AddBookmarkDialog( confirmButton = { Button( onClick = { - onBookmarkNameChosen(bookmarkName) + onBookmarkNameChoose(bookmarkName) onDismissRequest() }, ) { diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt index 185bd0087..a6e4d232a 100644 --- a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt +++ b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/FolderModeSelectionCard.kt @@ -25,7 +25,7 @@ import voice.strings.R as StringsR @Composable internal fun FolderModeSelectionCard( - onFolderModeSelected: (FolderMode) -> Unit, + onFolderModeSelect: (FolderMode) -> Unit, selectedFolderMode: FolderMode, ) { Card( @@ -38,7 +38,7 @@ internal fun FolderModeSelectionCard( verticalArrangement = Arrangement.spacedBy(8.dp), ) { FolderMode.entries.forEach { folderMode -> - val selectFolder = { onFolderModeSelected(folderMode) } + val selectFolder = { onFolderModeSelect(folderMode) } FolderModeColumn(selectFolder = selectFolder, selectedFolderMode = selectedFolderMode, folderMode = folderMode) } } @@ -92,7 +92,7 @@ private fun FolderMode.title(): Int { private fun FolderModeSelectionCardPreview() { VoiceTheme { FolderModeSelectionCard( - onFolderModeSelected = {}, + onFolderModeSelect = {}, selectedFolderMode = FolderMode.Audiobooks, ) } diff --git a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt index f252807b7..aa814d8bb 100644 --- a/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt +++ b/folderPicker/src/main/kotlin/voice/folderPicker/selectType/SelectFolderType.kt @@ -60,7 +60,7 @@ fun SelectFolderType( } SelectFolderType( viewState = viewModel.viewState(), - onFolderModeSelected = viewModel::setFolderMode, + onFolderModeSelect = viewModel::setFolderMode, onAddClick = viewModel::add, onBackClick = viewModel::onCloseClick, ) @@ -69,7 +69,7 @@ fun SelectFolderType( @Composable private fun SelectFolderType( viewState: SelectFolderTypeViewState, - onFolderModeSelected: (FolderMode) -> Unit, + onFolderModeSelect: (FolderMode) -> Unit, onAddClick: () -> Unit, onBackClick: () -> Unit, ) { @@ -85,7 +85,7 @@ private fun SelectFolderType( ) { contentPadding -> Content( contentPadding = contentPadding, - onFolderModeSelected = onFolderModeSelected, + onFolderModeSelect = onFolderModeSelect, viewState = viewState, ) } @@ -95,7 +95,7 @@ private fun SelectFolderType( private fun Content( contentPadding: PaddingValues, viewState: SelectFolderTypeViewState, - onFolderModeSelected: (FolderMode) -> Unit, + onFolderModeSelect: (FolderMode) -> Unit, ) { LazyVerticalGrid( columns = GridCells.Adaptive(150.dp), @@ -107,7 +107,7 @@ private fun Content( span = { GridItemSpan(maxLineSpan) }, ) { FolderModeSelectionCard( - onFolderModeSelected = onFolderModeSelected, + onFolderModeSelect = onFolderModeSelect, selectedFolderMode = viewState.selectedFolderMode, ) } @@ -186,7 +186,7 @@ private fun AppBar( private fun SelectFolderTypePreview() { SelectFolderType( onBackClick = {}, - onFolderModeSelected = {}, + onFolderModeSelect = {}, viewState = SelectFolderTypeViewState( books = listOf( SelectFolderTypeViewState.Book("Cats", 42), diff --git a/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt b/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt index 03a95182f..d856d5419 100644 --- a/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt +++ b/migration/src/main/kotlin/voice/migration/MigrationViewModel.kt @@ -36,17 +36,17 @@ class MigrationViewModel var showDeletionConfirmationDialog by remember { mutableStateOf(false) } - val onDeleteClicked = { + val onDeleteClick = { showDeletionConfirmationDialog = true } - val onDeletionAborted = { + val onDeletionAbort = { showDeletionConfirmationDialog = false } var items by remember { mutableStateOf(listOf()) } val scope = rememberCoroutineScope() - val onDeletionConfirmed: () -> Unit = { + val onDeletionConfirm: () -> Unit = { showDeletionConfirmationDialog = false scope.launch { dao.deleteAll() @@ -59,10 +59,10 @@ class MigrationViewModel return MigrationViewState( items = items, - onDeleteClicked = onDeleteClicked, + onDeleteClick = onDeleteClick, showDeletionConfirmationDialog = showDeletionConfirmationDialog, - onDeletionConfirmed = onDeletionConfirmed, - onDeletionAborted = onDeletionAborted, + onDeletionConfirm = onDeletionConfirm, + onDeletionAbort = onDeletionAbort, ) } diff --git a/migration/src/main/kotlin/voice/migration/views/Migration.kt b/migration/src/main/kotlin/voice/migration/views/Migration.kt index e7ca555f4..ee4db3d35 100644 --- a/migration/src/main/kotlin/voice/migration/views/Migration.kt +++ b/migration/src/main/kotlin/voice/migration/views/Migration.kt @@ -55,7 +55,7 @@ fun Migration() { val viewState = viewModel.viewState() Migration( viewState = viewState, - onCloseClicked = { + onCloseClick = { viewModel.onCloseClick() }, ) @@ -64,7 +64,7 @@ fun Migration() { @Composable internal fun Migration( viewState: MigrationViewState, - onCloseClicked: () -> Unit, + onCloseClick: () -> Unit, ) { val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() Scaffold( @@ -77,7 +77,7 @@ internal fun Migration( }, navigationIcon = { IconButton( - onClick = onCloseClicked, + onClick = onCloseClick, ) { Icon( imageVector = Icons.Outlined.Close, @@ -88,7 +88,7 @@ internal fun Migration( ) }, floatingActionButton = { - FloatingActionButton(onClick = viewState.onDeleteClicked) { + FloatingActionButton(onClick = viewState.onDeleteClick) { Icon( imageVector = Icons.Outlined.Delete, contentDescription = stringResource(id = StringsR.string.delete), @@ -106,8 +106,8 @@ internal fun Migration( } if (viewState.showDeletionConfirmationDialog) { DeletionConfirmationDialog( - onCancel = viewState.onDeletionAborted, - onConfirm = viewState.onDeletionConfirmed, + onCancel = viewState.onDeletionAbort, + onConfirm = viewState.onDeletionConfirm, ) } } @@ -236,7 +236,7 @@ private fun MigrationPreview( viewState: MigrationViewState, ) { VoiceTheme { - Migration(viewState, onCloseClicked = {}) + Migration(viewState, onCloseClick = {}) } } @@ -272,10 +272,10 @@ internal class MigrationViewStatePreviewProvider : PreviewParameterProvider, - val onDeleteClicked: () -> Unit, + val onDeleteClick: () -> Unit, val showDeletionConfirmationDialog: Boolean, - val onDeletionConfirmed: () -> Unit, - val onDeletionAborted: () -> Unit, + val onDeletionConfirm: () -> Unit, + val onDeletionAbort: () -> Unit, ) { data class Item( val name: String, diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt index c85a8e5fc..896e26062 100644 --- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt +++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayController.kt @@ -70,16 +70,16 @@ class BookPlayController(bundle: Bundle) : ComposeController(bundle) { onFastForwardClick = viewModel::fastForward, onRewindClick = viewModel::rewind, onSeek = viewModel::seekTo, - onBookmarkClick = viewModel::onBookmarkClicked, - onBookmarkLongClick = viewModel::onBookmarkLongClicked, + onBookmarkClick = viewModel::onBookmarkClick, + onBookmarkLongClick = viewModel::onBookmarkLongClick, onSkipSilenceClick = viewModel::toggleSkipSilence, onSleepTimerClick = viewModel::toggleSleepTimer, - onVolumeBoostClick = viewModel::onVolumeGainIconClicked, - onSpeedChangeClick = viewModel::onPlaybackSpeedIconClicked, + onVolumeBoostClick = viewModel::onVolumeGainIconClick, + onSpeedChangeClick = viewModel::onPlaybackSpeedIconClick, onCloseClick = { router.popController(this@BookPlayController) }, onSkipToNext = viewModel::next, onSkipToPrevious = viewModel::previous, - onCurrentChapterClick = viewModel::onCurrentChapterClicked, + onCurrentChapterClick = viewModel::onCurrentChapterClick, useLandscapeLayout = LocalConfiguration.current.orientation == ORIENTATION_LANDSCAPE, snackbarHostState = snackbarHostState, ) diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt index d01e55aee..c7b406dd7 100644 --- a/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt +++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/BookPlayViewModel.kt @@ -193,7 +193,7 @@ class BookPlayViewModel player.fastForward() } - fun onCurrentChapterClicked() { + fun onCurrentChapterClick() { scope.launch { val book = bookRepository.get(bookId) ?: return@launch val chapterMarks = book.chapters.flatMap { @@ -207,7 +207,7 @@ class BookPlayViewModel } } - fun onChapterClicked(index: Int) { + fun onChapterClick(index: Int) { scope.launch { val book = bookRepository.get(bookId) ?: return@launch var currentIndex = -1 @@ -224,7 +224,7 @@ class BookPlayViewModel } } - fun onPlaybackSpeedIconClicked() { + fun onPlaybackSpeedIconClick() { scope.launch { val playbackSpeed = bookRepository.get(bookId)?.content?.playbackSpeed if (playbackSpeed != null) { @@ -233,7 +233,7 @@ class BookPlayViewModel } } - fun onVolumeGainIconClicked() { + fun onVolumeGainIconClick() { scope.launch { val content = bookRepository.get(bookId)?.content if (content != null) { @@ -250,11 +250,11 @@ class BookPlayViewModel ) } - fun onBookmarkClicked() { + fun onBookmarkClick() { navigator.goTo(Destination.Bookmarks(bookId)) } - fun onBookmarkLongClicked() { + fun onBookmarkLongClick() { scope.launch { val book = bookRepository.get(bookId) ?: return@launch bookmarkRepository.addBookmarkAtBookPosition( diff --git a/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt b/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt index f2d14e3ca..4f2995b1c 100644 --- a/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt +++ b/playbackScreen/src/main/kotlin/voice/playbackScreen/SelectChapterDialog.kt @@ -33,7 +33,7 @@ internal fun SelectChapterDialog( ListItem( colors = ListItemDefaults.colors(containerColor = Color.Transparent), modifier = Modifier.clickable { - viewModel.onChapterClicked(index) + viewModel.onChapterClick(index) }, headlineContent = { Text(text = chapter.name ?: "") diff --git a/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt b/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt index de91af2d8..7d13e74e0 100644 --- a/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt +++ b/review/play/src/main/kotlin/voice/review/AskForReviewDialog.kt @@ -28,8 +28,8 @@ import voice.strings.R as StringsR @Composable internal fun AskForReviewDialog( - onReviewed: (Int) -> Unit, - onReviewDenied: () -> Unit, + onReview: (Int) -> Unit, + onReviewDeny: () -> Unit, onDismiss: () -> Unit, ) { var selectedStars by remember { mutableIntStateOf(5) } @@ -70,14 +70,14 @@ internal fun AskForReviewDialog( } }, dismissButton = { - TextButton(onClick = onReviewDenied) { + TextButton(onClick = onReviewDeny) { Text(stringResource(StringsR.string.review_request_button_no)) } }, confirmButton = { TextButton( onClick = { - onReviewed(selectedStars) + onReview(selectedStars) }, ) { Text(stringResource(StringsR.string.review_request_button_yes)) @@ -90,8 +90,8 @@ internal fun AskForReviewDialog( @Preview private fun AskForReviewDialogPreview() { AskForReviewDialog( - onReviewed = {}, - onReviewDenied = {}, + onReview = {}, + onReviewDeny = {}, onDismiss = {}, ) } diff --git a/review/play/src/main/kotlin/voice/review/ReviewFeature.kt b/review/play/src/main/kotlin/voice/review/ReviewFeature.kt index 993ea9504..6a377a8d9 100644 --- a/review/play/src/main/kotlin/voice/review/ReviewFeature.kt +++ b/review/play/src/main/kotlin/voice/review/ReviewFeature.kt @@ -51,7 +51,7 @@ fun ReviewFeature() { val reviewManager = reviewComponent.reviewManager val activity = LocalContext.current.findActivity() ?: return AskForReviewDialog( - onReviewed = { stars -> + onReview = { stars -> Logger.d("User rated $stars") scope.launch { shouldShowReviewDialog.setShown() @@ -67,7 +67,7 @@ fun ReviewFeature() { showReviewDialog = false } }, - onReviewDenied = { + onReviewDeny = { showReviewDialog = false scope.launch { shouldShowReviewDialog.setShown() diff --git a/settings/src/main/kotlin/voice/settings/SettingsListener.kt b/settings/src/main/kotlin/voice/settings/SettingsListener.kt index d87a907d0..16e705898 100644 --- a/settings/src/main/kotlin/voice/settings/SettingsListener.kt +++ b/settings/src/main/kotlin/voice/settings/SettingsListener.kt @@ -5,9 +5,9 @@ interface SettingsListener { fun toggleDarkTheme() fun toggleGrid() fun seekAmountChanged(seconds: Int) - fun onSeekAmountRowClicked() - fun autoRewindAmountChanged(seconds: Int) - fun onAutoRewindRowClicked() + fun onSeekAmountRowClick() + fun autoRewindAmountChang(seconds: Int) + fun onAutoRewindRowClick() fun dismissDialog() fun getSupport() fun suggestIdea() diff --git a/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt b/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt index d1c22de7c..f0263b334 100644 --- a/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt +++ b/settings/src/main/kotlin/voice/settings/SettingsViewModel.kt @@ -80,15 +80,15 @@ class SettingsViewModel seekTimePref.value = seconds } - override fun onSeekAmountRowClicked() { + override fun onSeekAmountRowClick() { dialog.value = SettingsViewState.Dialog.SeekTime } - override fun autoRewindAmountChanged(seconds: Int) { + override fun autoRewindAmountChang(seconds: Int) { autoRewindAmountPref.value = seconds } - override fun onAutoRewindRowClicked() { + override fun onAutoRewindRowClick() { dialog.value = SettingsViewState.Dialog.AutoRewindAmount } diff --git a/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt b/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt index a2dde5028..59ebff00b 100644 --- a/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt +++ b/settings/src/main/kotlin/voice/settings/views/AutoRewindRow.kt @@ -48,7 +48,7 @@ internal fun AutoRewindRow( @Composable internal fun AutoRewindAmountDialog( currentSeconds: Int, - onSecondsConfirmed: (Int) -> Unit, + onSecondsConfirm: (Int) -> Unit, onDismiss: () -> Unit, ) { TimeSettingDialog( @@ -57,7 +57,7 @@ internal fun AutoRewindAmountDialog( minSeconds = 0, maxSeconds = 20, textPluralRes = StringsR.plurals.seconds, - onSecondsConfirmed = onSecondsConfirmed, + onSecondsConfirm = onSecondsConfirm, onDismiss = onDismiss, ) } diff --git a/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt b/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt index 725f655e6..438ea4be2 100644 --- a/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt +++ b/settings/src/main/kotlin/voice/settings/views/SeekTimeRow.kt @@ -48,7 +48,7 @@ internal fun SeekTimeRow( @Composable internal fun SeekAmountDialog( currentSeconds: Int, - onSecondsConfirmed: (Int) -> Unit, + onSecondsConfirm: (Int) -> Unit, onDismiss: () -> Unit, ) { TimeSettingDialog( @@ -57,7 +57,7 @@ internal fun SeekAmountDialog( minSeconds = 3, maxSeconds = 60, textPluralRes = StringsR.plurals.seconds, - onSecondsConfirmed = onSecondsConfirmed, + onSecondsConfirm = onSecondsConfirm, onDismiss = onDismiss, ) } diff --git a/settings/src/main/kotlin/voice/settings/views/Settings.kt b/settings/src/main/kotlin/voice/settings/views/Settings.kt index b6bcc34d7..2f80e5274 100644 --- a/settings/src/main/kotlin/voice/settings/views/Settings.kt +++ b/settings/src/main/kotlin/voice/settings/views/Settings.kt @@ -57,9 +57,9 @@ private fun SettingsPreview() { override fun close() {} override fun toggleDarkTheme() {} override fun seekAmountChanged(seconds: Int) {} - override fun onSeekAmountRowClicked() {} - override fun autoRewindAmountChanged(seconds: Int) {} - override fun onAutoRewindRowClicked() {} + override fun onSeekAmountRowClick() {} + override fun autoRewindAmountChang(seconds: Int) {} + override fun onAutoRewindRowClick() {} override fun dismissDialog() {} override fun openTranslations() {} override fun getSupport() {} @@ -131,10 +131,10 @@ private fun Settings( }, ) SeekTimeRow(viewState.seekTimeInSeconds) { - listener.onSeekAmountRowClicked() + listener.onSeekAmountRowClick() } AutoRewindRow(viewState.autoRewindInSeconds) { - listener.onAutoRewindRowClicked() + listener.onAutoRewindRowClick() } ListItem( modifier = Modifier.clickable { listener.suggestIdea() }, @@ -185,14 +185,14 @@ private fun Dialog( SettingsViewState.Dialog.AutoRewindAmount -> { AutoRewindAmountDialog( currentSeconds = viewState.autoRewindInSeconds, - onSecondsConfirmed = listener::autoRewindAmountChanged, + onSecondsConfirm = listener::autoRewindAmountChang, onDismiss = listener::dismissDialog, ) } SettingsViewState.Dialog.SeekTime -> { SeekAmountDialog( currentSeconds = viewState.seekTimeInSeconds, - onSecondsConfirmed = listener::seekAmountChanged, + onSecondsConfirm = listener::seekAmountChanged, onDismiss = listener::dismissDialog, ) } diff --git a/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt b/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt index 376b33399..ab6e4f464 100644 --- a/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt +++ b/settings/src/main/kotlin/voice/settings/views/TimeSettingDialog.kt @@ -23,7 +23,7 @@ fun TimeSettingDialog( @PluralsRes textPluralRes: Int, minSeconds: Int, maxSeconds: Int, - onSecondsConfirmed: (Int) -> Unit, + onSecondsConfirm: (Int) -> Unit, onDismiss: () -> Unit, ) { var sliderValue by remember { mutableFloatStateOf(currentSeconds.toFloat()) } @@ -53,7 +53,7 @@ fun TimeSettingDialog( confirmButton = { TextButton( onClick = { - onSecondsConfirmed(sliderValue.roundToInt()) + onSecondsConfirm(sliderValue.roundToInt()) onDismiss() }, ) {