Progress tab

app/app.json

@@ -17,7 +17,15 @@
     "backgroundColor": "#fcfdf6",
     "primaryColor": "#046F03",
     "plugins": [
-      "expo-router",
+      [
+        "expo-router",
+        {
+          "headers": {
+            "Cross-Origin-Embedder-Policy": "credentialless",
+            "Cross-Origin-Opener-Policy": "same-origin"
+          }
+        }
+      ],
       [
         "expo-dev-client",
         {

app/app/(tabs)/(session)/session/post-workout.tsx

@@ -2,15 +2,18 @@ import FullHeightScrollView from '@/components/layout/full-height-scroll-view';
 import FloatingBottomContainer from '@/components/presentation/foundation/floating-bottom-container';
 import { SessionComparisonTable } from '@/components/presentation/workout/session-comparison-table';
 import { spacing } from '@/hooks/useAppTheme';
-import { useAppSelectorWithArg } from '@/store';
+import { useAppSelector, useAppSelectorWithArg } from '@/store';
 import {
   finishCurrentWorkout,
   selectCurrentSession,
 } from '@/store/current-session';
+import { selectPreferredWeightUnit } from '@/store/settings';
 import {
   selectPreviousComparableSession,
+  selectSessions,
   selectSession,
 } from '@/store/stored-sessions';
+import { getSessionPersonalBestEntries } from '@/utils/personal-bests';
 import { useTranslate } from '@tolgee/react';
 import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
 import { useEffect } from 'react';
@@ -36,6 +39,8 @@ export default function PostWorkoutPage() {
   const openedAfterFinishingWorkout = source === 'finished';
   const showFinishButton = openedAfterFinishingWorkout;
   const showBackButton = !openedAfterFinishingWorkout;
+  const sessions = useAppSelector(selectSessions);
+  const preferredUnit = useAppSelector(selectPreferredWeightUnit);
   const previousComparableSession = useAppSelectorWithArg(
     selectPreviousComparableSession,
     session,
@@ -54,6 +59,12 @@ export default function PostWorkoutPage() {
     return null;
   }
 
+  const personalBestEntries = getSessionPersonalBestEntries(
+    sessions,
+    session,
+    preferredUnit,
+  );
+
   const floatingBottomContainer = showFinishButton ? (
     <FloatingBottomContainer
       fab={
@@ -86,6 +97,7 @@ export default function PostWorkoutPage() {
       <View style={{ marginVertical: spacing[4] }}>
         <SessionComparisonTable
           mode="full"
+          personalBestEntries={personalBestEntries}
           previousSession={previousComparableSession}
           session={session}
         />

app/app/(tabs)/_layout.tsx

@@ -48,10 +48,10 @@ export default function Layout() {
       />
 
       <Tabs.Screen
-        name="stats"
+        name="progress"
         options={{
-          tabBarLabel: t('stats.stats.title'),
-          tabBarButtonTestID: 'nav__stats',
+          tabBarLabel: t('progress.title'),
+          tabBarButtonTestID: 'nav__progress',
           tabBarIcon: ({ color, size, focused }) => {
             return (
               <Icon
@@ -63,17 +63,8 @@ export default function Layout() {
           },
         }}
       />
-
-      <Tabs.Screen
-        name="history"
-        options={{
-          tabBarLabel: t('generic.history.title'),
-          tabBarButtonTestID: 'nav__history',
-          tabBarIcon: ({ color, size }) => {
-            return <Icon source={'history'} size={size} color={color} />;
-          },
-        }}
-      />
+      <Tabs.Screen name="stats" options={{ href: null }} />
+      <Tabs.Screen name="history" options={{ href: null }} />
 
       <Tabs.Screen
         name="settings"

app/app/(tabs)/feed/index.tsx

@@ -6,6 +6,7 @@ import {
   useScroll,
   useScrollHeaderColor,
 } from '@/hooks/useScrollListener';
+import { spacing } from '@/hooks/useAppTheme';
 import { useAppSelector } from '@/store';
 import { selectFollowRequestCount } from '@/store/feed';
 import { useTranslate } from '@tolgee/react';
@@ -38,7 +39,10 @@ export default function FeedIndexPage() {
       <Stack.Screen options={{ title: t('feed.feed.title') }} />
       <TabsProvider onChangeIndex={setActiveTabIndex}>
         <Tabs
-          tabHeaderStyle={{ backgroundColor: headerColor }}
+          tabHeaderStyle={{
+            backgroundColor: headerColor,
+            marginBottom: spacing[1],
+          }}
           style={{ backgroundColor: 'transparent' }}
         >
           <TabScreen label={t('feed.feed.title')}>

app/app/(tabs)/history/edit.tsx

@@ -1,83 +1,5 @@
-import SessionComponent from '@/components/smart/session-component';
-import SessionMoreMenuComponent from '@/components/smart/session-more-menu-component';
-import { spacing } from '@/hooks/useAppTheme';
-import { useAppSelector, RootState } from '@/store';
-import {
-  finishCurrentWorkout,
-  setActiveSessionDate,
-} from '@/store/current-session';
-import { LocalDate } from '@js-joda/core';
-import { useRouter, Stack } from 'expo-router';
-import { useEffect } from 'react';
-import { View } from 'react-native';
-import { DatePickerInput } from 'react-native-paper-dates';
-import { useDispatch } from 'react-redux';
+import { HistoryEditContent } from '@/components/presentation/data/history-edit-content';
 
 export default function HistoryEditPage() {
-  const dispatch = useDispatch();
-  const session = useAppSelector(
-    (state: RootState) => state.currentSession.historySession,
-  );
-  const { dismissTo } = useRouter();
-
-  const save = () => {
-    dispatch(finishCurrentWorkout('historySession'));
-  };
-  useEffect(() => {
-    if (!session) {
-      dismissTo('/history');
-    }
-  }, [session, dismissTo]);
-  const showBodyweight = useAppSelector((x) => x.settings.showBodyweight);
-  const jsDate =
-    session &&
-    new Date(
-      session.date.year(),
-      session.date.month().ordinal(),
-      session.date.dayOfMonth(),
-    );
-
-  return (
-    <>
-      <Stack.Screen
-        options={{
-          title: session?.blueprint.name ?? 'Workout',
-          headerRight: () => (
-            <SessionMoreMenuComponent target="historySession" />
-          ),
-        }}
-      />
-      <View
-        style={{
-          paddingHorizontal: spacing.pageHorizontalMargin,
-          flexDirection: 'row',
-        }}
-      >
-        <DatePickerInput
-          testID="session-date-input"
-          locale="default"
-          inputMode="start"
-          onChange={(e) => {
-            if (e)
-              dispatch(
-                setActiveSessionDate({
-                  target: 'historySession',
-                  payload: LocalDate.of(
-                    e.getFullYear(),
-                    e.getMonth() + 1,
-                    e.getDate(),
-                  ),
-                }),
-              );
-          }}
-          value={jsDate}
-        />
-      </View>
-      <SessionComponent
-        target="historySession"
-        showBodyweight={showBodyweight}
-        saveAndClose={save}
-      />
-    </>
-  );
+  return <HistoryEditContent emptyRoute="/history" />;
 }