Skip to content
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

Jump to bottom

Develop #19

Merged
merged 63 commits into from
Aug 25, 2023
Merged

Develop #19

merged 63 commits into from
Aug 25, 2023

Conversation

brandyodhiambo
Copy link
Owner

No description provided.

brandyodhiambo and others added 30 commits December 5, 2022 05:24
@brandyodhiambo
test ci cd
693dc9b
@brandyodhiambo
Merge branch 'main' into develop
47a3d98 
# Conflicts:
#	app/src/main/java/com/brandyodhiambo/quench/views/screens/settings/SettingsScreen.kt
@brandyodhiambo
Merging changes from main
1977e1a
@brandyodhiambo
Update android_build.yml
77f65c5
@brandyodhiambo
changing to dsl
1fca480
@brandyodhiambo
completed migration to dsl
7e609d0
@brandyodhiambo
Merge pull request #8 from brandy-kay/feature/migrate_to_kts
4670c8e
@brandyodhiambo
setting design system
51dfaaf
@brandyodhiambo
created modules
4b9b763
@brandyodhiambo
divided dependencies
7fa1aeb
@brandyodhiambo
fixing kapt
6b250b9
@brandyodhiambo
Merge pull request #9 from brandy-kay/dependencies
171f9dc
@brandyodhiambo
divided the code base to different modules.
a0681e3
@joelkanyi
Merge pull request #10 from brandy-kay/feature/divide_features
eb24e40 
divided the code base to different modules.
@brandyodhiambo
WIP:Setting splash
a75b410
@brandyodhiambo
WIP:Setting splash
7c2e424
@brandyodhiambo
Merge pull request #11 from brandy-kay/feature/splash_screen
2674d9d
@brandyodhiambo
WIP:Edited notification screen and completed navigation set up
9828b40
@brandyodhiambo
WIP:Edite Home Screen
0ee0f08
@brandyodhiambo
WIP:Fixes compile issues
d25dd7b
@brandyodhiambo
Merge pull request #12 from brandy-kay/feature/notification_reminder
2e0b62c
@brandyodhiambo
WIP:Room database setup
2f13a3b
@brandyodhiambo
Merge pull request #13 from brandy-kay/feature_setup_room
252732b
@brandyodhiambo
WIP:Splash screen now working
8d7d4c7
@brandyodhiambo
WIP:completed insertion of sleep time to db
2035d8a
@brandyodhiambo
WIP:completed insertion of wake time to db and set the navigation onc…
3ff0dd0 
…e the times are set
@brandyodhiambo
WIP: Worked on ideal water intake
3fe37d5
@brandyodhiambo
WIP: Minor fixes
90c0741
@brandyodhiambo
WIP: Worked on wake time and edited the composable
28b3b62
@brandyodhiambo
WIP: Minor edits
62ad6c4
@brandyodhiambo
fixes the time set dialogue
a577d12
@brandyodhiambo
fixes time dialog
fd15593
@brandyodhiambo
fixes time dialog
6f2baca
@brandyodhiambo
Merge pull request #14 from brandy-kay/feature/home_screen
19acb23
@brandyodhiambo
working on alarm manager
51b735c
@brandyodhiambo
added delete dialog and placed date formate to a readable form
6698a7e
@brandyodhiambo
fixes alarm manager
b2988cd
@brandyodhiambo
fixes alarm manager
5ec646b
@brandyodhiambo
Merge pull request #15 from brandy-kay/feature/alarm_manager
2fde1e4
@brandyodhiambo
working on statistics screen
2071499
@brandyodhiambo
working on statistics screen more specifically graphs
79e56f8
@brandyodhiambo
Merge pull request #16 from brandy-kay/feature/alarm_manager
c4a3aa3
@brandyodhiambo
setting up work manager
b6fd00d
@brandyodhiambo
working on daily statistics
e98ef57
@brandyodhiambo
works on weekly achievement
a222049
@brandyodhiambo
works on weekly achievement
b1efc24
@brandyodhiambo
completes statistics screen
92fc914
@brandyodhiambo
completes statistics screen
20a277a
@brandyodhiambo
works on settings screen
5f28c39
@brandyodhiambo
fixed is achieved and graphs
adc3502
@brandyodhiambo
fixes achievement worker
30af7a2
@brandyodhiambo
fixes achievement worker
75f0356
@brandyodhiambo
Update README.md
ca5f4de
@brandyodhiambo
Merge pull request #17 from brandy-kay/feature/work_manager
9ec637e
@brandyodhiambo
Update README.md
27d396f
@brandyodhiambo
Update README.md
9f7cbaf
@brandyodhiambo
added screen images
8908aa0
@brandyodhiambo
Merge pull request #18 from brandy-kay/feature/work_manager
0ba8e86
@brandyodhiambo brandyodhiambo merged commit 7aed1f5 into main Aug 25, 2023
1 check failed
@brandyodhiambo brandyodhiambo deleted the develop branch August 25, 2023 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@brandyodhiambo @joelkanyi