brandon.presley/Massive
brandon.presley
/
Massive
4
8
Fork 3
Code Issues 14 Pull Requests Activity

Show both date and time by default

This commit is contained in:
Brandon Presley 2023-11-21 19:14:53 +13:00
parent 8cfdc354dc
commit 8a1e1b982a
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EditSet.tsx
View File

@ -307,7 +307,7 @@ export default function EditSet() {
{settings.showDate && ( {settings.showDate && (
<AppInput <AppInput
label="Created" label="Created"
value={format(created, settings.date || "P")} value={format(created, settings.date || "Pp")}
onPressOut={pickDate} onPressOut={pickDate}
/> />
)} )}

2
EditWeight.tsx
View File

@ -144,7 +144,7 @@ export default function EditWeight() {
{settings.showDate && ( {settings.showDate && (
<AppInput <AppInput
label="Created" label="Created"
value={format(created, settings.date || "P")} value={format(created, settings.date || "Pp")}
onPressOut={pickDate} onPressOut={pickDate}
/> />
)} )}

2
SetItem.tsx
View File

@ -66,7 +66,7 @@ const SetItem = React.memo(
description={ description={
settings.showDate ? ( settings.showDate ? (
<Text style={{ color: dark ? DARK_SUBDUED : LIGHT_SUBDUED }}> <Text style={{ color: dark ? DARK_SUBDUED : LIGHT_SUBDUED }}>
{format(new Date(item.created), settings.date || "P")} {format(new Date(item.created), settings.date || "Pp")}
</Text> </Text>
) : null ) : null
} }

7
ViewSetList.tsx
View File

@ -5,9 +5,8 @@ import { FlatList } from "react-native";
import { List, Text, useTheme } from "react-native-paper"; import { List, Text, useTheme } from "react-native-paper";
import { Like } from "typeorm"; import { Like } from "typeorm";
import { StackParams } from "./AppStack"; import { StackParams } from "./AppStack";
import SetItem from "./SetItem";
import StackHeader from "./StackHeader"; import StackHeader from "./StackHeader";
import { DARK_SUBDUED, LIGHT_SUBDUED, LIMIT } from "./constants"; import { LIMIT } from "./constants";
import { setRepo, settingsRepo } from "./db"; import { setRepo, settingsRepo } from "./db";
import GymSet from "./gym-set"; import GymSet from "./gym-set";
import Settings from "./settings"; import Settings from "./settings";
@ -19,7 +18,7 @@ interface ColorSet extends GymSet {
export default function ViewSetList() { export default function ViewSetList() {
const [sets, setSets] = useState<ColorSet[]>(); const [sets, setSets] = useState<ColorSet[]>();
const [settings, setSettings] = useState<Settings>(); const [settings, setSettings] = useState<Settings>();
const { colors, dark } = useTheme(); const { colors } = useTheme();
const { params } = useRoute<RouteProp<StackParams, "ViewSetList">>(); const { params } = useRoute<RouteProp<StackParams, "ViewSetList">>();
useEffect(() => { useEffect(() => {
@ -54,7 +53,7 @@ export default function ViewSetList() {
const renderItem = ({ item }: { item: ColorSet; index: number }) => ( const renderItem = ({ item }: { item: ColorSet; index: number }) => (
<List.Item <List.Item
title={format(new Date(item.created), settings.date || "P")} title={format(new Date(item.created), settings.date || "Pp")}
style={{ backgroundColor: item.color }} style={{ backgroundColor: item.color }}
right={() => ( right={() => (
<Text <Text

2
WeightItem.tsx
View File

@ -41,7 +41,7 @@ export default function WeightItem({
fontWeight: today ? "bold" : "normal", fontWeight: today ? "bold" : "normal",
}} }}
> >
{format(new Date(item.created), settings.date || "P")} {format(new Date(item.created), settings.date || "Pp")}
</Text> </Text>
)} )}
/> />