joseph/Massive
1
0
Fork 0
Code Pull Requests Activity

Remove dates toggle from set item

Browse Source 
This feature exists in the settings page,
so duplicating it here might be confusing to users.
This commit is contained in:
Brandon Presley 2022-10-12 14:10:59 +13:00
parent e7438138a6
commit 636bfa35a4
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SetItem.tsx
View File

@ -10,13 +10,9 @@ import {useSettings} from './use-settings';
export default function SetItem({ export default function SetItem({
item, item,
onRemove, onRemove,
dates,
setDates,
}: { }: {
item: Set; item: Set;
onRemove: () => void; onRemove: () => void;
dates: boolean;
setDates: (value: boolean) => void;
}) { }) {
const [showMenu, setShowMenu] = useState(false); const [showMenu, setShowMenu] = useState(false);
const [anchor, setAnchor] = useState({x: 0, y: 0}); const [anchor, setAnchor] = useState({x: 0, y: 0});
@ -44,11 +40,6 @@ export default function SetItem({
[setShowMenu, setAnchor], [setShowMenu, setAnchor],
); );
const toggleDates = useCallback(() => {
setDates(!dates);
setShowMenu(false);
}, [dates, setDates]);
return ( return (
<> <>
<List.Item <List.Item
@ -64,7 +55,7 @@ export default function SetItem({
} }
right={() => ( right={() => (
<> <>
{dates && ( {!!settings.showDate && (
<Text <Text
style={{ style={{
alignSelf: 'center', alignSelf: 'center',
@ -77,7 +68,6 @@ export default function SetItem({
visible={showMenu} visible={showMenu}
onDismiss={() => setShowMenu(false)}> onDismiss={() => setShowMenu(false)}>
<Menu.Item icon="content-copy" onPress={copy} title="Copy" /> <Menu.Item icon="content-copy" onPress={copy} title="Copy" />
<Menu.Item icon="event" onPress={toggleDates} title="Dates" />
<Divider /> <Divider />
<Menu.Item icon="delete" onPress={remove} title="Delete" /> <Menu.Item icon="delete" onPress={remove} title="Delete" />
</Menu> </Menu>

14
SetList.tsx
View File

@ -23,7 +23,6 @@ export default function SetList() {
const [search, setSearch] = useState(''); const [search, setSearch] = useState('');
const [end, setEnd] = useState(false); const [end, setEnd] = useState(false);
const {settings} = useSettings(); const {settings} = useSettings();
const [dates, setDates] = useState(!!settings.showDate);
const navigation = useNavigation<NavigationProp<HomePageParams>>(); const navigation = useNavigation<NavigationProp<HomePageParams>>();
const refresh = useCallback(async () => { const refresh = useCallback(async () => {
@ -48,8 +47,7 @@ export default function SetList() {
navigation.getParent()?.setOptions({ navigation.getParent()?.setOptions({
headerRight: () => <DrawerMenu name="Home" />, headerRight: () => <DrawerMenu name="Home" />,
}); });
setDates(!!settings.showDate); }, [refresh, navigation]),
}, [refresh, navigation, settings.showDate]),
); );
useEffect(() => { useEffect(() => {
@ -58,15 +56,9 @@ export default function SetList() {
const renderItem = useCallback( const renderItem = useCallback(
({item}: {item: Set}) => ( ({item}: {item: Set}) => (
<SetItem <SetItem item={item} key={item.id} onRemove={refresh} />
dates={dates}
setDates={setDates}
item={item}
key={item.id}
onRemove={refresh}
/>
), ),
[refresh, dates, setDates], [refresh],
); );
const next = useCallback(async () => { const next = useCallback(async () => {