FIX: Reset ActivityPlayer state and standardize icons using lucide-re…

…act (#191)
amosproj · Feb 2, 2025 · 3ac236d · 3ac236d
2 parents bf6f3c5 + 1c76ea0
commit 3ac236d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/app/src/components/EditActivityButton.tsx b/app/src/components/EditActivityButton.tsx
@@ -45,7 +45,7 @@ export function EditActivityButton({ activity, updateActivity }: AlertIconDialog
     const newActivity: Activity = {
       id: activity.id,
       name: values.name,
-      activityType: activity.activityType,
+      type: activity.type,
       duration: values.duration,
       energy: values.energy,
       favorite: activity.favorite

diff --git a/app/src/screens/ActivityPlayer.tsx b/app/src/screens/ActivityPlayer.tsx
@@ -148,6 +148,10 @@ export const ActivityPlayer: React.FC = () => {
   }
 
   const finishSession = () => {
+    setIsPlaying(false);
+    setIsFinished(false);
+    setIsReloading(false);
+    setCurrentStep(0);
     navigate(Stacks.Auth, {
       screen: Screens.Feedback,
       params: { activityId: params?.activityId }
@@ -156,6 +160,10 @@ export const ActivityPlayer: React.FC = () => {
 
   const exitActivity = async () => {
     await sound.current.unloadAsync();
+    setIsPlaying(false);
+    setIsFinished(false);
+    setIsReloading(false);
+    setCurrentStep(0);
     navigate(Stacks.Auth, { screen: Screens.Home });
   };
 

diff --git a/app/src/screens/Feedback.tsx b/app/src/screens/Feedback.tsx
@@ -154,7 +154,7 @@ export const Feedback: React.FC = () => {
                 />
 
                 <View className='flex flex-row justify-end mt-4'>
-                  <Button className='' onPress={handleSubmit}>
+                  <Button className='' onPress={handleSubmit} disabled={message.length === 0}>
                     <Text className='text-primary-foreground'>Submit</Text>
                   </Button>
                 </View>

diff --git a/app/src/screens/History.tsx b/app/src/screens/History.tsx
@@ -1,25 +1,23 @@
 import { useNavigation } from '@react-navigation/native';
 import { Text } from '@shadcn/components';
+import { iconWithClassName } from '@shadcn/icons/iconWithClassName';
 import { Collections, Screens, Stacks, fireAuth, fireStore } from '@src/constants';
 import type { HistoryActivity } from '@src/types';
 import type { AppNavigation } from '@src/types';
 import { collection, doc, getDocs, updateDoc } from 'firebase/firestore';
-import { UserIcon } from 'lucide-react-native';
+import { Brain, Heart, House, PenLine, RefreshCw, UserIcon } from 'lucide-react-native';
 import React, { useEffect } from 'react';
 import { useAuthState } from 'react-firebase-hooks/auth';
 import { Image, ScrollView, TouchableOpacity, View } from 'react-native';
-import FeatherIcon from 'react-native-vector-icons/Feather';
-import type { IconProps } from 'react-native-vector-icons/Icon';
-import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+
+iconWithClassName(PenLine);
+iconWithClassName(RefreshCw);
 
 export const History: React.FC = () => {
   const { navigate } = useNavigation<AppNavigation>();
   const [user] = useAuthState(fireAuth);
   const [activeTab, setActiveTab] = React.useState<'all' | 'favorites'>('all');
-  const [items, setItems] = React.useState([] as HistoryActivity[]);
-
-  const MCIIcon = MaterialCommunityIcons as unknown as React.FC<IconProps>;
-  const FeatherIconCasted = FeatherIcon as unknown as React.FC<IconProps>;
+  const [items, setItems] = React.useState<HistoryActivity[]>([]);
 
   const fetchFavoriteActivities = async () => {
     if (!user) {
@@ -104,11 +102,7 @@ export const History: React.FC = () => {
   };
 
   // Decide which items to show based on activeTab
-  const itemsToShow =
-    activeTab === 'all' ? items : items.filter((item) => item.isFavourite === true);
-
-  // Icon color
-  const iconColor = '#620674';
+  const itemsToShow = activeTab === 'all' ? items : items.filter((item) => item.isFavourite);
 
   return (
     <View className='flex flex-1 flex-col px-6 gap-y-4'>
@@ -125,7 +119,7 @@ export const History: React.FC = () => {
         </View>
 
         <TouchableOpacity onPress={onHomeBtnPressed} className='ml-auto'>
-          <FeatherIconCasted name='home' size={27} color='#620674' />
+          <House size={27} className='text-primary' />
         </TouchableOpacity>
       </View>
 
@@ -179,23 +173,22 @@ export const History: React.FC = () => {
               <View className='flex-row'>
                 <TouchableOpacity className='m-2' onPress={() => handleToggleFavourite(item.id)}>
                   {/* If isFavourite = true => heart (filled), else => heart-outline */}
-                  <MCIIcon
-                    name={item.isFavourite ? 'heart' : 'heart-outline'}
+                  <Heart
                     size={20}
-                    color={iconColor}
+                    className={`text-primary ${item.isFavourite ? 'fill-primary' : ''}`}
                   />
                 </TouchableOpacity>
                 <TouchableOpacity className='m-2'>
-                  <MCIIcon name='brain' size={20} color={iconColor} />
+                  <Brain size={20} className='text-primary' />
                 </TouchableOpacity>
               </View>
               {/* Bottom row */}
               <View className='flex-row'>
                 <TouchableOpacity className='m-2'>
-                  <FeatherIconCasted name='edit-3' size={20} color={iconColor} />
+                  <PenLine size={20} className='text-primary' />
                 </TouchableOpacity>
                 <TouchableOpacity className='m-2' onPress={() => replayActivity(item.id)}>
-                  <FeatherIconCasted name='refresh-cw' size={20} color={iconColor} />
+                  <RefreshCw size={20} className='text-primary' />
                 </TouchableOpacity>
               </View>
             </View>