diff --git a/apps/mobile/app/components/HamburgerMenu.tsx b/apps/mobile/app/components/HamburgerMenu.tsx index 9f7f877e0..da8d4750b 100644 --- a/apps/mobile/app/components/HamburgerMenu.tsx +++ b/apps/mobile/app/components/HamburgerMenu.tsx @@ -101,7 +101,7 @@ const HamburgerMenu = observer((props: any) => { marginTop: 4, }} > - {user?.email}s + {user?.email} {activeTeam ? ( = observer( return ( <> onChangePriority(e.value)} onDismiss={() => setOpenModal(false)} @@ -81,7 +81,11 @@ const TaskPriority: FC = observer( )} - + diff --git a/apps/mobile/app/components/TaskSize.tsx b/apps/mobile/app/components/TaskSize.tsx index 56aa7ee0d..b5c71b279 100644 --- a/apps/mobile/app/components/TaskSize.tsx +++ b/apps/mobile/app/components/TaskSize.tsx @@ -88,7 +88,11 @@ const TaskSize: FC = observer(({ task, containerStyle, setSize, s )} - + diff --git a/apps/mobile/app/components/TaskSizePopup.tsx b/apps/mobile/app/components/TaskSizePopup.tsx index 333a8f1fd..b315b0db7 100644 --- a/apps/mobile/app/components/TaskSizePopup.tsx +++ b/apps/mobile/app/components/TaskSizePopup.tsx @@ -103,6 +103,7 @@ interface ItemProps { const Item: FC = ({ currentSizeName, size, onSizeSelected }) => { const { colors } = useAppTheme() const selected = size.value === currentSizeName + return ( onSizeSelected(size)}> diff --git a/apps/mobile/app/components/TaskStatus.tsx b/apps/mobile/app/components/TaskStatus.tsx index e0f487b20..05cd52b86 100644 --- a/apps/mobile/app/components/TaskStatus.tsx +++ b/apps/mobile/app/components/TaskStatus.tsx @@ -54,7 +54,7 @@ const TaskStatus: FC = observer( return ( <> onChangeStatus(e)} onDismiss={() => setOpenModal(false)} @@ -90,7 +90,11 @@ const TaskStatus: FC = observer( )} )} - + diff --git a/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx b/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx index 3d4a6fdff..9a417987d 100644 --- a/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx +++ b/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx @@ -79,7 +79,13 @@ const DropDownSection: FC = observer(function DropDownSection({ data={others} scrollEnabled={false} renderItem={({ item, index }) => ( - + = (props) => { return ( @@ -285,6 +285,14 @@ const ListCardItem: React.FC = (props) => { export default ListCardItem const styles = StyleSheet.create({ + cardContainer: { + borderRadius: 14, + elevation: 24, + shadowColor: "#000", + shadowOffset: { width: 0, height: 12 }, + shadowOpacity: 0.05, + shadowRadius: 5, + }, dropdownTxt: { color: "#282048", fontFamily: typography.primary.semiBold, diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TimerButton.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TimerButton.tsx index 0172c68b1..8e2837384 100644 --- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TimerButton.tsx +++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TimerButton.tsx @@ -82,7 +82,7 @@ const styles = StyleSheet.create({ shadowTimerNotRunning: { elevation: 10, shadowColor: "#3826A6", - shadowOffset: { width: 0, height: 10 }, + shadowOffset: { width: 0, height: 8 }, shadowOpacity: 0.5, shadowRadius: 10, }, diff --git a/apps/mobile/app/screens/Authenticated/TimerScreen/components/ComboBox.tsx b/apps/mobile/app/screens/Authenticated/TimerScreen/components/ComboBox.tsx index aa2bec99c..ae5534993 100644 --- a/apps/mobile/app/screens/Authenticated/TimerScreen/components/ComboBox.tsx +++ b/apps/mobile/app/screens/Authenticated/TimerScreen/components/ComboBox.tsx @@ -1,7 +1,7 @@ /* eslint-disable camelcase */ /* eslint-disable react-native/no-inline-styles */ /* eslint-disable react-native/no-color-literals */ -import React, { FC } from "react" +import React, { FC, useState } from "react" import { Text } from "react-native-paper" import { View, StyleSheet, TouchableWithoutFeedback, Pressable, FlatList } from "react-native" import { Ionicons } from "@expo/vector-icons" @@ -20,6 +20,7 @@ export interface Props { const ComboBox: FC = observer(function ComboBox({ tasksHandler, closeCombo, setEditMode }) { const { colors } = useAppTheme() + const [isScrolling, setIsScrolling] = useState(false) return ( @@ -54,6 +55,8 @@ const ComboBox: FC = observer(function ComboBox({ tasksHandler, closeComb setIsScrolling(true)} + onScrollEndDrag={() => setIsScrolling(false)} showsVerticalScrollIndicator={false} data={tasksHandler.filteredTasks} renderItem={({ item, index }) => ( @@ -61,6 +64,7 @@ const ComboBox: FC = observer(function ComboBox({ tasksHandler, closeComb key={index} onReopenTask={() => tasksHandler.handleReopenTask(item)} task={item} + isScrolling={isScrolling} handleActiveTask={tasksHandler.setActiveTeamTask} closeCombo={closeCombo} setEditMode={setEditMode} diff --git a/apps/mobile/app/screens/Authenticated/TimerScreen/components/IndividualTask.tsx b/apps/mobile/app/screens/Authenticated/TimerScreen/components/IndividualTask.tsx index e0d69f343..803befa05 100644 --- a/apps/mobile/app/screens/Authenticated/TimerScreen/components/IndividualTask.tsx +++ b/apps/mobile/app/screens/Authenticated/TimerScreen/components/IndividualTask.tsx @@ -21,10 +21,11 @@ export interface Props { closeCombo?: () => unknown onReopenTask: () => unknown setEditMode: (val: boolean) => void + isScrolling: boolean } const IndividualTask: FC = observer( - ({ task, handleActiveTask, closeCombo, onReopenTask, setEditMode }) => { + ({ task, handleActiveTask, closeCombo, onReopenTask, setEditMode, isScrolling }) => { const { colors } = useAppTheme() const [showDel, setShowDel] = useState(false) const { updateTask } = useTeamTasks() @@ -54,7 +55,7 @@ const IndividualTask: FC = observer( > { - handleActiveTask(task) + !isScrolling && handleActiveTask(task) }} // added it here because doesn't work when assigned to the parent style={{ flexDirection: "row", @@ -76,7 +77,7 @@ const IndividualTask: FC = observer( { - handleActiveTask(task) + !isScrolling && handleActiveTask(task) }} // added it here because doesn't work when assigned to the parent style={{ flexDirection: "row",