delete ActivityBar, close button

commaai · Feb 3, 2025 · 6cc9878 · 6cc9878
1 parent 1605a4b
commit 6cc9878
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git a/src/pages/dashboard/activities/RouteActivity.tsx b/src/pages/dashboard/activities/RouteActivity.tsx
@@ -8,13 +8,13 @@ import {
 
 import { getRoute } from '~/api/route'
 
+import IconButton from '~/components/material/IconButton'
+import TopAppBar from '~/components/material/TopAppBar'
 import RouteStaticMap from '~/components/RouteStaticMap'
 import RouteStatistics from '~/components/RouteStatistics'
 import Timeline from '~/components/Timeline'
 import { parseDateStr } from '~/utils/date'
 
-import ActivityBar from '../components/ActivityBar'
-
 const RouteVideoPlayer = lazy(() => import('~/components/RouteVideoPlayer'))
 
 type RouteActivityProps = {
@@ -37,9 +37,9 @@ const RouteActivity: VoidComponent<RouteActivityProps> = (props) => {
 
   return (
     <>
-      <ActivityBar backHref={`/${props.dongleId}`}>
+      <TopAppBar leading={<IconButton class="md:hidden" href={`/${props.dongleId}`}>arrow_back</IconButton>}>
         {startTime()}
-      </ActivityBar>
+      </TopAppBar>
 
       <div class="flex flex-col gap-6 px-4 pb-4">
         <Suspense

diff --git a/src/pages/dashboard/activities/SettingsActivity.tsx b/src/pages/dashboard/activities/SettingsActivity.tsx
@@ -10,9 +10,10 @@ import ButtonBase from '~/components/material/ButtonBase'
 import Button from '~/components/material/Button'
 import CircularProgress from '~/components/material/CircularProgress'
 import Icon from '~/components/material/Icon'
+import IconButton from '~/components/material/IconButton'
+import TopAppBar from '~/components/material/TopAppBar'
 import { createQuery } from '~/utils/createQuery'
 
-import ActivityBar from '../components/ActivityBar'
 
 const useAction = <T,>(action: () => Promise<T>): [() => void, Resource<T>] => {
   const [source, setSource] = createSignal(false)
@@ -352,9 +353,9 @@ const SettingsActivity: VoidComponent<PrimeActivityProps> = (props) => {
   const [device] = createResource(() => props.dongleId, getDevice)
   return (
     <>
-      <ActivityBar backHref={`/${props.dongleId}`}>
+      <TopAppBar leading={<IconButton class="md:hidden" href={`/${props.dongleId}`}>arrow_back</IconButton>}>
         Device Settings
-      </ActivityBar>
+      </TopAppBar>
       <div class="max-w-lg px-4">
         <h2 class="mb-4 text-headline-sm">comma prime</h2>
         <Suspense>

diff --git a/src/pages/dashboard/components/ActivityBar.tsx b/src/pages/dashboard/components/ActivityBar.tsx