Revert "Add setting for showing date by default"
This reverts commit e8715162a0
.
This commit is contained in:
parent
e8715162a0
commit
e1b7e80e2f
|
@ -26,7 +26,7 @@ export default function SetList() {
|
|||
const [offset, setOffset] = useState(0);
|
||||
const [search, setSearch] = useState('');
|
||||
const [end, setEnd] = useState(false);
|
||||
const [dates, setDates] = useState(!!settings.showDate);
|
||||
const [dates, setDates] = useState(false);
|
||||
const [images, setImages] = useState(true);
|
||||
const navigation = useNavigation<NavigationProp<HomePageParams>>();
|
||||
|
||||
|
@ -75,7 +75,6 @@ export default function SetList() {
|
|||
headerRight: () => <DrawerMenu name="Home" />,
|
||||
});
|
||||
setImages(!!settings.images);
|
||||
setDates(!!settings.showDate);
|
||||
}, [refresh, navigation]),
|
||||
);
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@ export default function SettingsPage() {
|
|||
const [workouts, setWorkouts] = useState(!!settings.workouts);
|
||||
const [steps, setSteps] = useState(!!settings.steps);
|
||||
const [date, setDate] = useState('%Y-%m-%d %H:%M');
|
||||
const [showDate, setShowDate] = useState(false);
|
||||
const {color, setColor} = useContext(CustomTheme);
|
||||
const {toast} = useContext(SnackbarContext);
|
||||
|
||||
|
@ -51,7 +50,6 @@ export default function SettingsPage() {
|
|||
workouts: +workouts,
|
||||
steps: +steps,
|
||||
date,
|
||||
showDate: +showDate,
|
||||
});
|
||||
getSettings();
|
||||
}, [
|
||||
|
@ -66,7 +64,6 @@ export default function SettingsPage() {
|
|||
workouts,
|
||||
steps,
|
||||
date,
|
||||
showDate,
|
||||
]);
|
||||
|
||||
const changeAlarmEnabled = useCallback(
|
||||
|
@ -152,15 +149,6 @@ export default function SettingsPage() {
|
|||
[toast],
|
||||
);
|
||||
|
||||
const changeShowDate = useCallback(
|
||||
(enabled: boolean) => {
|
||||
setShowDate(enabled);
|
||||
if (enabled) toast('Show date for sets by default.', 4000);
|
||||
else toast('Stopped showing date for sets by default.', 4000);
|
||||
},
|
||||
[toast],
|
||||
);
|
||||
|
||||
const switches: Input<boolean>[] = [
|
||||
{name: 'Rest timers', value: alarm, onChange: changeAlarmEnabled},
|
||||
{name: 'Vibrate', value: vibrate, onChange: changeVibrate},
|
||||
|
@ -170,7 +158,6 @@ export default function SettingsPage() {
|
|||
{name: 'Show unit', value: showUnit, onChange: changeUnit},
|
||||
{name: 'Show workouts', value: workouts, onChange: changeWorkouts},
|
||||
{name: 'Show steps', value: steps, onChange: changeSteps},
|
||||
{name: 'Show date', value: showDate, onChange: changeShowDate},
|
||||
];
|
||||
|
||||
return (
|
||||
|
|
|
@ -39,18 +39,17 @@ export default function TimerPage() {
|
|||
|
||||
const tick = (date: Date) => {
|
||||
const remaining = date.getTime() - new Date().getTime();
|
||||
console.log(`${TimerPage.name}.tick`, {remaining});
|
||||
if (remaining <= 0) return 0;
|
||||
console.log(`${TimerPage.name}.useEffect`, {remaining});
|
||||
if (remaining <= 0) return;
|
||||
setMs(remaining);
|
||||
return remaining;
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
console.log(`${TimerPage.name}.useEffect:`, {next});
|
||||
const date = next || new Date();
|
||||
if (tick(date) <= 0) return;
|
||||
tick(date);
|
||||
const id = setInterval(() => {
|
||||
if (tick(date) <= 0) clearInterval(id);
|
||||
tick(date);
|
||||
}, 1000);
|
||||
setIntervalId(oldId => {
|
||||
clearInterval(oldId);
|
||||
|
@ -76,13 +75,6 @@ export default function TimerPage() {
|
|||
setNext(date);
|
||||
NativeModules.AlarmModule.add(ms, !!settings.vibrate, settings.sound);
|
||||
tick(date);
|
||||
const id = setInterval(() => {
|
||||
if (tick(date) <= 0) clearInterval(id);
|
||||
}, 1000);
|
||||
setIntervalId(oldId => {
|
||||
clearInterval(oldId);
|
||||
return id;
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
|
|
3
db.ts
3
db.ts
|
@ -106,9 +106,6 @@ const migrations = [
|
|||
`
|
||||
ALTER TABLE settings ADD COLUMN date TEXT NULL
|
||||
`,
|
||||
`
|
||||
ALTER TABLE settings ADD COLUMN showDate BOOLEAN DEFAULT 0
|
||||
`,
|
||||
];
|
||||
|
||||
export let db: SQLiteDatabase;
|
||||
|
|
|
@ -11,5 +11,4 @@ export default interface Settings {
|
|||
steps: number;
|
||||
nextAlarm?: string;
|
||||
date?: string;
|
||||
showDate: number;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user