Skip to content

Small changes (work in progress) to calendar, and cleaning up old unnecessary lines of code #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hauolinalani wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Small changes (work in progress) to calendar, and cleaning up old unnecessary lines of code #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
790c1a6
Added birth control tracking to calendar
hauolinalani Nov 7, 2025
daa049f
Calendar reflects easy birth control click from home page
hauolinalani Nov 17, 2025
1234ed7
re-pushing with github action errors fixed
hauolinalani Nov 23, 2025
b4c4fec
Merge branch 'main' into hauoli-tasks
hauolinalani Nov 23, 2025
55ee8df
fix linting issues with npm run lint
hauolinalani Nov 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions app/(tabs)/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import { useFocusEffect } from "expo-router";
export default function FlowCalendar() {
const [key, setKey] = useState<string>("");

// access state management
const { date, setDate } = useSelectedDate();
const { selectedFilters, setSelectedFilters } = useCalendarFilters();
const { predictionChoice, setPredictionChoice } = usePredictionChoice();
Expand All @@ -43,27 +42,22 @@ export default function FlowCalendar() {
const filterColors = theme.dark ? FilterColorsDark : FilterColorsLight;
const styles = makeStyles({ theme });

// get date in local time
const day = new Date();
const offset = day.getTimezoneOffset();
const localDate = new Date(day.getTime() - offset * 60 * 1000);
const localDate = new Date(day.getTime() - offset * 60000);
const today = localDate.toISOString().split("T")[0];

const dismissKeyboard = () => {
Keyboard.dismiss();
};
const dismissKeyboard = () => Keyboard.dismiss();

const { themeColor } = useThemeColor();
const themeKey = `${theme.dark ? "dark" : "light"}-${themeColor}`;

// load filters from secure store
useEffect(() => {
const loadFilters = async () => {
const filters = await getSetting(SettingsKeys.calendarFilters);
if (filters?.value) {
setSelectedFilters(JSON.parse(filters.value));
} else {
// set Flow as first filter by default (filler color given since color isn't optional)
setSelectedFilters(["Flow"]);
await insertSetting(
SettingsKeys.calendarFilters,
Expand All @@ -74,14 +68,12 @@ export default function FlowCalendar() {
loadFilters();
}, [setSelectedFilters]);

// load filters from secure store
useEffect(() => {
const loadPredictionChoice = async () => {
const filters = await getSetting(SettingsKeys.cyclePredictions);
if (filters?.value) {
setPredictionChoice(JSON.parse(filters.value));
} else {
// set Flow as first filter by default (filler color given since color isn't optional)
setPredictionChoice(true);
await insertSetting(
SettingsKeys.cyclePredictions,
Expand All @@ -92,15 +84,12 @@ export default function FlowCalendar() {
loadPredictionChoice();
}, [setPredictionChoice]);

// Set selected date to today when screen is focused
useFocusEffect(
useCallback(() => {
setDate(today);
}, [setDate, today]),
);

// the calendar doesn't expose a method to jump to today, so we have to
// change the key after setting the date to force a re-render
const jumpToToday = () => {
setDate(today);
setKey(date + String(Math.random()));
Expand Down Expand Up @@ -163,7 +152,9 @@ export default function FlowCalendar() {
textDayHeaderFontSize: 16,
}}
/>

<Divider />

<View style={styles.legendContainer}>
{selectedFilters.map((filter, index) => (
<View
Expand Down Expand Up @@ -224,6 +215,7 @@ export default function FlowCalendar() {
)}
<Divider />
</View>

<View>{date && <DayView />}</View>
</ScrollView>
</SafeAreaView>
Expand All @@ -240,7 +232,6 @@ const makeStyles = ({ theme }: { theme: MD3Theme }) =>
backgroundColor: theme.colors.background,
flex: 1,
paddingTop: StatusBar.currentHeight,
// Since iOS bar uses absolute positon for blur affect, we have to adjust padding to bottom of container
paddingBottom: Platform.select({
ios: 60,
default: 0,
Expand Down
Loading
Loading