Integrate Challenges into habits screen #128
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request includes significant updates to the habits and challenges functionality within the application. The changes focus on integrating challenges into the habits page, enhancing the challenge details screen, and adding a new screen for logging challenge progress.
Integration of Challenges into Habits Page:
Challenge
type and integrated it into theHabitsPage
component. (app/(tabs)/habits.tsx
)getTimeBasedGreeting
function to display a dynamic greeting based on the current time. (app/(tabs)/habits.tsx
)HabitList
to fetch and display challenges alongside habits, including the logic to separate completed and not completed items. (app/(tabs)/habits.tsx
) [1] [2] [3]ChallengeItem
component for rendering individual challenges and handling logging of challenge progress. (app/(tabs)/habits.tsx
)Enhancements to Challenge Details Screen:
ChallengeScreen
to use a newChallengeStatus
component for displaying challenge status. (app/challenges/[id]/index.tsx
) (app/challenges/[id]/index.tsxL15-R29, app/challenges/[id]/index.tsxL82-R71, app/challenges/[id]/index.tsxR95-R128, app/challenges/[id]/index.tsxL150-R158, app/challenges/[id]/index.tsxR169-R214)app/challenges/[id]/index.tsx
) (app/challenges/[id]/index.tsxR95-R128, app/challenges/[id]/index.tsxL150-R158)New Screen for Logging Challenge Progress:
LogChallengeProgressScreen
for logging progress on challenges, including form validation and error handling. (app/challenges/[id]/log-progress/index.tsx
) (app/challenges/[id]/log-progress/index.tsxR1-R146)