Replace BookMark to Bookmark

DroidKaigi · Jul 17, 2023 · b4fe687 · b4fe687
1 parent 736fff7
commit b4fe687
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 57 deletions.
diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched2023/KaigiApp.kt b/app-android/src/main/java/io/github/droidkaigi/confsched2023/KaigiApp.kt
@@ -28,7 +28,7 @@ import io.github.droidkaigi.confsched2023.main.mainScreen
 import io.github.droidkaigi.confsched2023.main.mainScreenRoute
 import io.github.droidkaigi.confsched2023.sessions.navigateSearchScreen
 import io.github.droidkaigi.confsched2023.sessions.navigateTimetableScreen
-import io.github.droidkaigi.confsched2023.sessions.navigateToBookMarkScreen
+import io.github.droidkaigi.confsched2023.sessions.navigateToBookmarkScreen
 import io.github.droidkaigi.confsched2023.sessions.navigateToTimetableItemDetailScreen
 import io.github.droidkaigi.confsched2023.sessions.nestedSessionScreens
 import io.github.droidkaigi.confsched2023.sessions.searchScreen
@@ -87,8 +87,8 @@ private fun NavGraphBuilder.mainScreen(navController: NavHostController) {
                         timetableitem.id,
                     )
                 },
-                onClickBookMarkIcon = {
-                    navController.navigateToBookMarkScreen()
+                onClickBookmarkIcon = {
+                    navController.navigateToBookmarkScreen()
                 },
             )
             composable(contributorsScreenRoute) {

diff --git a/...ng/src/main/java/io/github/droidkaigi/confsched2023/testing/robot/TimetableScreenRobot.kt b/...ng/src/main/java/io/github/droidkaigi/confsched2023/testing/robot/TimetableScreenRobot.kt
@@ -40,7 +40,7 @@ class TimetableScreenRobot @Inject constructor(
                 TimetableScreen(
                     onSearchClick = { },
                     onTimetableItemClick = { },
-                    onClickBookMarkIcon = { },
+                    onClickBookmarkIcon = { },
                 )
             }
         }

diff --git a/.../confsched2023/sessions/BookMarkScreen.kt → .../confsched2023/sessions/BookmarkScreen.kt b/.../confsched2023/sessions/BookMarkScreen.kt → .../confsched2023/sessions/BookmarkScreen.kt
@@ -16,40 +16,40 @@ import androidx.navigation.NavController
 import io.github.droidkaigi.confsched2023.model.DroidKaigi2023Day
 import io.github.droidkaigi.confsched2023.model.TimetableItem
 import io.github.droidkaigi.confsched2023.model.TimetableItemId
-import io.github.droidkaigi.confsched2023.sessions.component.BookMarkTopArea
-import io.github.droidkaigi.confsched2023.sessions.section.BookMarkSheet
+import io.github.droidkaigi.confsched2023.sessions.component.BookmarkTopArea
+import io.github.droidkaigi.confsched2023.sessions.section.BookmarkSheet
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.PersistentMap
 import kotlinx.collections.immutable.PersistentSet
 
-const val bookMarkScreenRoute = "bookMark"
+const val bookmarkScreenRoute = "bookmark"
 
-fun NavController.navigateToBookMarkScreen() {
-    navigate(bookMarkScreenRoute)
+fun NavController.navigateToBookmarkScreen() {
+    navigate(bookmarkScreenRoute)
 }
 
-sealed interface BookMarkScreenUiState {
+sealed interface BookmarkScreenUiState {
 
     val currentDayFilter: PersistentList<DroidKaigi2023Day>
 
     data class Empty(
         override val currentDayFilter: PersistentList<DroidKaigi2023Day>,
-    ) : BookMarkScreenUiState
+    ) : BookmarkScreenUiState
 
-    data class ListBookMark(
+    data class ListBookmark(
         val bookmarkedTimetableItemIds: PersistentSet<TimetableItemId>,
         val timetableItemMap: PersistentMap<String, List<TimetableItem>>,
         override val currentDayFilter: PersistentList<DroidKaigi2023Day>,
-    ) : BookMarkScreenUiState
+    ) : BookmarkScreenUiState
 }
 
 @Composable
-fun BookMarkScreen(
+fun BookmarkScreen(
     onClickBackPress: () -> Unit,
-    viewModel: BookMarkScreenViewModel = hiltViewModel<BookMarkScreenViewModel>(),
+    viewModel: BookmarkScreenViewModel = hiltViewModel<BookmarkScreenViewModel>(),
 ) {
     val uiState by viewModel.uiState.collectAsState()
-    BookMarkScreen(
+    BookmarkScreen(
         uiState = uiState,
         onClickBackPress = onClickBackPress,
         onClickBooMarkIcon = { viewModel.updateBookmark(it) },
@@ -60,11 +60,11 @@ fun BookMarkScreen(
     )
 }
 
-const val BookScreenTestTag = "TimetableScreenTestTag"
+const val BookmarkScreenTestTag = "BookmarkScreenTestTag"
 
 @Composable
-private fun BookMarkScreen(
-    uiState: BookMarkScreenUiState,
+private fun BookmarkScreen(
+    uiState: BookmarkScreenUiState,
     onClickBackPress: () -> Unit,
     onClickBooMarkIcon: (TimetableItemId) -> Unit,
     onClickAllFilterChip: () -> Unit,
@@ -74,20 +74,20 @@ private fun BookMarkScreen(
 ) {
     val scrollState = rememberLazyListState()
     Scaffold(
-        modifier = Modifier.testTag(BookScreenTestTag),
+        modifier = Modifier.testTag(BookmarkScreenTestTag),
         topBar = {
-            BookMarkTopArea(
+            BookmarkTopArea(
                 scrollState = scrollState,
                 onClickBackPress = onClickBackPress,
             )
         },
         containerColor = Color(0xFFF8FAF6),
         contentWindowInsets = WindowInsets(0.dp),
     ) { padding ->
-        BookMarkSheet(
+        BookmarkSheet(
             modifier = Modifier.padding(padding),
             scrollState = scrollState,
-            onClickBookMarkIcon = onClickBooMarkIcon,
+            onClickBookmarkIcon = onClickBooMarkIcon,
             onClickAllFilterChip = onClickAllFilterChip,
             onClickDayFirstChip = onClickDayFirstChip,
             onClickDaySecondChip = onClickDaySecondChip,

diff --git a/...d2023/sessions/BookMarkScreenViewModel.kt → ...d2023/sessions/BookmarkScreenViewModel.kt b/...d2023/sessions/BookMarkScreenViewModel.kt → ...d2023/sessions/BookmarkScreenViewModel.kt
@@ -23,7 +23,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class BookMarkScreenViewModel @Inject constructor(
+class BookmarkScreenViewModel @Inject constructor(
     private val sessionsRepository: SessionsRepository,
     userMessageStateHolder: UserMessageStateHolder,
 ) : ViewModel() {
@@ -44,7 +44,7 @@ class BookMarkScreenViewModel @Inject constructor(
         DroidKaigi2023Day.values().map { it },
     )
 
-    val uiState: StateFlow<BookMarkScreenUiState> =
+    val uiState: StateFlow<BookmarkScreenUiState> =
         buildUiState(
             sessionsStateFlow,
             currentDayFilter,
@@ -63,11 +63,11 @@ class BookMarkScreenViewModel @Inject constructor(
             }.toPersistentMap()
 
             if (sortAndGroupedBookmarkedTimetableItems.isEmpty()) {
-                BookMarkScreenUiState.Empty(
+                BookmarkScreenUiState.Empty(
                     currentDayFilter.toPersistentList(),
                 )
             } else {
-                BookMarkScreenUiState.ListBookMark(
+                BookmarkScreenUiState.ListBookmark(
                     sessionsStateFlow.bookmarks,
                     sortAndGroupedBookmarkedTimetableItems,
                     currentDayFilter.toPersistentList(),

diff --git a/...ns/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableItemDetailScreen.kt b/...ns/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableItemDetailScreen.kt
@@ -27,8 +27,8 @@ fun NavGraphBuilder.sessionScreens(onNavigationIconClick: () -> Unit) {
             onNavigationIconClick = onNavigationIconClick,
         )
     }
-    composable(bookMarkScreenRoute) {
-        BookMarkScreen(
+    composable(bookmarkScreenRoute) {
+        BookmarkScreen(
             onClickBackPress = onNavigationIconClick,
         )
     }

diff --git a/...ure/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableScreen.kt b/...ure/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableScreen.kt
@@ -31,13 +31,13 @@ const val timetableScreenRoute = "timetable"
 fun NavGraphBuilder.nestedSessionScreens(
     onSearchClick: () -> Unit,
     onTimetableItemClick: (TimetableItem) -> Unit,
-    onClickBookMarkIcon: () -> Unit,
+    onClickBookmarkIcon: () -> Unit,
 ) {
     composable(timetableScreenRoute) {
         TimetableScreen(
             onSearchClick = onSearchClick,
             onTimetableItemClick = onTimetableItemClick,
-            onClickBookMarkIcon = onClickBookMarkIcon,
+            onClickBookmarkIcon = onClickBookmarkIcon,
         )
     }
 }
@@ -52,7 +52,7 @@ const val TimetableScreenTestTag = "TimetableScreen"
 fun TimetableScreen(
     onSearchClick: () -> Unit,
     onTimetableItemClick: (TimetableItem) -> Unit,
-    onClickBookMarkIcon: () -> Unit,
+    onClickBookmarkIcon: () -> Unit,
     viewModel: TimetableScreenViewModel = hiltViewModel<TimetableScreenViewModel>(),
 ) {
     val uiState by viewModel.uiState.collectAsState()
@@ -67,7 +67,7 @@ fun TimetableScreen(
         snackbarHostState = snackbarHostState,
         onTimetableItemClick = onTimetableItemClick,
         onBookmarkClick = viewModel::onBookmarkClick,
-        onClickBookMarkIcon = onClickBookMarkIcon,
+        onClickBookmarkIcon = onClickBookmarkIcon,
         onSearchClick = onSearchClick,
         onTimetableUiChangeClick = viewModel::onUiTypeChange,
     )
@@ -83,7 +83,7 @@ private fun TimetableScreen(
     snackbarHostState: SnackbarHostState,
     onTimetableItemClick: (TimetableItem) -> Unit,
     onBookmarkClick: (TimetableItem) -> Unit,
-    onClickBookMarkIcon: () -> Unit,
+    onClickBookmarkIcon: () -> Unit,
     onSearchClick: () -> Unit,
     onTimetableUiChangeClick: () -> Unit,
 ) {
@@ -103,7 +103,7 @@ private fun TimetableScreen(
                 state,
                 onTimetableUiChangeClick,
                 onSearchClick,
-                onClickBookMarkIcon,
+                onClickBookmarkIcon,
             )
         },
         containerColor = MaterialTheme.colorScheme.surfaceVariant,

diff --git a/...2023/sessions/component/BookMarkFilter.kt → ...2023/sessions/component/BookmarkFilter.kt b/...2023/sessions/component/BookMarkFilter.kt → ...2023/sessions/component/BookmarkFilter.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.unit.sp
 import io.github.droidkaigi.confsched2023.model.DroidKaigi2023Day
 
 @Composable
-fun BookMarkFilter(
+fun BookmarkFilter(
     currentDayFilter: List<DroidKaigi2023Day>,
     onClickAllFilterChip: () -> Unit,
     onClickDayFirstChip: () -> Unit,

diff --git a/...ed2023/sessions/component/BookMarkItem.kt → ...ed2023/sessions/component/BookmarkItem.kt b/...ed2023/sessions/component/BookMarkItem.kt → ...ed2023/sessions/component/BookmarkItem.kt
@@ -31,10 +31,10 @@ import io.github.droidkaigi.confsched2023.model.TimetableItemId
 import kotlinx.collections.immutable.PersistentSet
 
 @Composable
-fun BookMarkItem(
+fun BookmarkItem(
     bookmarkedTimetableItemIds: PersistentSet<TimetableItemId>,
     timetableItem: TimetableItem,
-    onClickBooMarkIcon: (TimetableItemId) -> Unit,
+    onClickBoomarkIcon: (TimetableItemId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(modifier) {
@@ -58,7 +58,7 @@ fun BookMarkItem(
                 },
                 contentDescription = null,
                 modifier = Modifier.clickable {
-                    onClickBooMarkIcon(timetableItem.id)
+                    onClickBoomarkIcon(timetableItem.id)
                 },
             )
         }

diff --git a/...023/sessions/component/BookMarkTopArea.kt → ...023/sessions/component/BookmarkTopArea.kt b/...023/sessions/component/BookMarkTopArea.kt → ...023/sessions/component/BookmarkTopArea.kt
@@ -34,7 +34,7 @@ import androidx.compose.ui.unit.sp
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun BookMarkTopArea(
+fun BookmarkTopArea(
     scrollState: LazyListState,
     onClickBackPress: () -> Unit,
     modifier: Modifier = Modifier,

diff --git a/...s/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt b/...s/src/main/java/io/github/droidkaigi/confsched2023/sessions/component/TimetableTopArea.kt
@@ -34,7 +34,7 @@ fun TimetableTopArea(
     state: TimetableScreenScrollState,
     onTimetableUiChangeClick: () -> Unit,
     onSearchClick: () -> Unit,
-    onClickTopAreaBookMarkIcon: () -> Unit,
+    onClickTopAreaBookmarkIcon: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(modifier = modifier) {
@@ -64,7 +64,7 @@ fun TimetableTopArea(
                 }
                 IconButton(
                     modifier = Modifier.testTag(TimetableBookmarkIconTestTag),
-                    onClick = { onClickTopAreaBookMarkIcon() },
+                    onClick = { onClickTopAreaBookmarkIcon() },
                 ) {
                     Icon(
                         imageVector = Icons.Outlined.Bookmark,

diff --git a/...ched2023/sessions/section/BookMarkList.kt → ...ched2023/sessions/section/BookmarkList.kt b/...ched2023/sessions/section/BookMarkList.kt → ...ched2023/sessions/section/BookmarkList.kt
@@ -18,12 +18,12 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import io.github.droidkaigi.confsched2023.model.TimetableItem
 import io.github.droidkaigi.confsched2023.model.TimetableItemId
-import io.github.droidkaigi.confsched2023.sessions.component.BookMarkItem
+import io.github.droidkaigi.confsched2023.sessions.component.BookmarkItem
 import kotlinx.collections.immutable.PersistentMap
 import kotlinx.collections.immutable.PersistentSet
 
 @Composable
-fun BookMarkList(
+fun BookmarkList(
     scrollState: LazyListState,
     bookmarkedTimetableItemIds: PersistentSet<TimetableItemId>,
     timetableItemMap: PersistentMap<String, List<TimetableItem>>,
@@ -58,10 +58,10 @@ fun BookMarkList(
                             }
                         }
                     }
-                    BookMarkItem(
+                    BookmarkItem(
                         bookmarkedTimetableItemIds = bookmarkedTimetableItemIds,
                         timetableItem = timetableItem,
-                        onClickBooMarkIcon = onClickBooMarkIcon,
+                        onClickBoomarkIcon = onClickBooMarkIcon,
                     )
                 }
             }

diff --git a/...hed2023/sessions/section/BookMarkSheet.kt → ...hed2023/sessions/section/BookmarkSheet.kt b/...hed2023/sessions/section/BookMarkSheet.kt → ...hed2023/sessions/section/BookmarkSheet.kt
@@ -23,16 +23,16 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
 import io.github.droidkaigi.confsched2023.model.TimetableItemId
-import io.github.droidkaigi.confsched2023.sessions.BookMarkScreenUiState
-import io.github.droidkaigi.confsched2023.sessions.BookMarkScreenUiState.Empty
-import io.github.droidkaigi.confsched2023.sessions.BookMarkScreenUiState.ListBookMark
-import io.github.droidkaigi.confsched2023.sessions.component.BookMarkFilter
+import io.github.droidkaigi.confsched2023.sessions.BookmarkScreenUiState
+import io.github.droidkaigi.confsched2023.sessions.BookmarkScreenUiState.Empty
+import io.github.droidkaigi.confsched2023.sessions.BookmarkScreenUiState.ListBookmark
+import io.github.droidkaigi.confsched2023.sessions.component.BookmarkFilter
 
 @Composable
-fun BookMarkSheet(
-    uiState: BookMarkScreenUiState,
+fun BookmarkSheet(
+    uiState: BookmarkScreenUiState,
     scrollState: LazyListState,
-    onClickBookMarkIcon: (TimetableItemId) -> Unit,
+    onClickBookmarkIcon: (TimetableItemId) -> Unit,
     onClickAllFilterChip: () -> Unit,
     onClickDayFirstChip: () -> Unit,
     onClickDaySecondChip: () -> Unit,
@@ -42,7 +42,7 @@ fun BookMarkSheet(
     Column(
         modifier = modifier.fillMaxSize(),
     ) {
-        BookMarkFilter(
+        BookmarkFilter(
             currentDayFilter = uiState.currentDayFilter,
             onClickAllFilterChip = onClickAllFilterChip,
             onClickDayFirstChip = onClickDayFirstChip,
@@ -55,12 +55,12 @@ fun BookMarkSheet(
                 EmptyView()
             }
 
-            is ListBookMark -> {
-                BookMarkList(
+            is ListBookmark -> {
+                BookmarkList(
                     scrollState = scrollState,
                     bookmarkedTimetableItemIds = uiState.bookmarkedTimetableItemIds,
                     timetableItemMap = uiState.timetableItemMap,
-                    onClickBooMarkIcon = onClickBookMarkIcon,
+                    onClickBooMarkIcon = onClickBookmarkIcon,
                     modifier = Modifier.padding(start = 16.dp),
                 )
             }