Rename TimetableTopArea from TimetableTopAppBar

DroidKaigi · Jul 1, 2023 · b7f29fd · b7f29fd
1 parent fb33f77
commit b7f29fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
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
@@ -18,7 +18,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import io.github.droidkaigi.confsched2023.model.TimetableItem
-import io.github.droidkaigi.confsched2023.sessions.component.TimetableTopAppBar
+import io.github.droidkaigi.confsched2023.sessions.component.TimetableTopArea
 import io.github.droidkaigi.confsched2023.sessions.component.rememberTimetableScreenScrollState
 import io.github.droidkaigi.confsched2023.sessions.section.TimetableSheet
 import io.github.droidkaigi.confsched2023.sessions.section.TimetableSheetUiState
@@ -73,7 +73,7 @@ private fun TimetableScreen(
             )
         },
         topBar = {
-            TimetableTopAppBar(state, onTimetableUiChangeClick)
+            TimetableTopArea(state, onTimetableUiChangeClick)
         },
         containerColor = MaterialTheme.colorScheme.surfaceVariant,
         contentWindowInsets = WindowInsets(0.dp),

diff --git a/.../sessions/component/TimetableTopAppBar.kt → ...23/sessions/component/TimetableTopArea.kt b/.../sessions/component/TimetableTopAppBar.kt → ...23/sessions/component/TimetableTopArea.kt
@@ -25,7 +25,7 @@ const val TimetableUiTypeChangeButtonTestTag = "TimetableUiTypeChangeButton"
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-fun TimetableTopAppBar(state: TimetableScreenScrollState, onTimetableUiChangeClick: () -> Unit) {
+fun TimetableTopArea(state: TimetableScreenScrollState, onTimetableUiChangeClick: () -> Unit) {
     Column {
         // TODO: Implement TopAppBar design
         TopAppBar(

diff --git a/...ssions/src/main/java/io/github/droidkaigi/confsched2023/sessions/section/TimetableGrid.kt b/...ssions/src/main/java/io/github/droidkaigi/confsched2023/sessions/section/TimetableGrid.kt
@@ -119,9 +119,6 @@ fun TimetableGrid(
     val linePxSize = with(timetableState.density) { TimetableSizes.lineStrokeSize.toPx() }
     val layoutDirection = LocalLayoutDirection.current
 
-    val currentTimeLineColor = MaterialTheme.colorScheme.primary
-    val currentTimeCircleRadius =
-        with(timetableState.density) { TimetableSizes.currentTimeCircleRadius.toPx() }
     LazyLayout(
         modifier = modifier
             .padding(
@@ -437,25 +434,6 @@ class ScreenScrollState(
         }
     }
 
-    suspend fun flingYIfPossible() = coroutineScope {
-        val velocity = velocityTracker.calculateVelocity()
-        launch {
-            _scrollY.animateDecay(
-                velocity.y / 2f,
-                exponentialDecay(),
-            )
-        }
-    }
-
-    suspend fun flingXIfPossible() = coroutineScope {
-        val velocity = velocityTracker.calculateVelocity()
-        launch {
-            _scrollX.animateDecay(
-                velocity.x / 2f,
-                exponentialDecay(),
-            )
-        }
-    }
 
     fun updateBounds(maxX: Float, maxY: Float) {
         _scrollX.updateBounds(maxX, 0f)