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

Feedback #1

Open
wants to merge 195 commits into
base: feedback
Choose a base branch
from
Open

Feedback #1

wants to merge 195 commits into from

Commits on Feb 1, 2024

  1. Setting up GitHub Classroom Feedback

    @github-classroom
    github-classroom[bot] authored Feb 1, 2024
    Configuration menu
    Copy the full SHA
    038ea16 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Updated the README.md

    @JGonzaga7
    JGonzaga7 authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    a2cb276 View commit details
    Browse the repository at this point in the history

  2. Set up some incomplete Java files for Goal, GoalRepository, and GoalE… 

    …ntity
    @ZenoCS-Git
    ZenoCS-Git committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    0c70ad7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #32 from CSE-110-Winter-2024/JGonzaga7-patch-1 

    Updated the README.md
    @erichu100
    erichu100 authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    96ddf92 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into variant1

    @ZenoCS-Git
    ZenoCS-Git authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    34d0370 View commit details
    Browse the repository at this point in the history

  5. Some fixes to refactoring errors and types in dependencies

    @ZenoCS-Git
    ZenoCS-Git committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    94f0e1a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #34 from CSE-110-Winter-2024/variant1 

    Variant1
    @ZenoCS-Git
    ZenoCS-Git authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    ccba72c View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Created GoalRepository interface

    @wizard1238
    wizard1238 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    53b9da9 View commit details
    Browse the repository at this point in the history

  2. Fixed Goal.java to have both an id and a sort order

    @wizard1238
    wizard1238 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    1816323 View commit details
    Browse the repository at this point in the history

  3. Created a room database and MainViewModel

    @wizard1238
    wizard1238 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    902c5ee View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Merge pull request #35 from CSE-110-Winter-2024/US3-1 

    Us3 1
    @otisdog8
    otisdog8 authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    7d03b2d View commit details
    Browse the repository at this point in the history

  2. Add DateOffset class

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    0f883d1 View commit details
    Browse the repository at this point in the history

  3. Setup tests

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    c38ead0 View commit details
    Browse the repository at this point in the history

  4. Tests for DateOffset

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    c4f417e View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into mock-time

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    3104bb5 View commit details
    Browse the repository at this point in the history

  6. Hook up DateOffset into app logic

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b0680f8 View commit details
    Browse the repository at this point in the history

  7. UI elements to debug

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    c97fa36 View commit details
    Browse the repository at this point in the history

  8. UI element updates once per second; can be used for 2am scenario

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    6ca2a9a View commit details
    Browse the repository at this point in the history

  9. Fix CI

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    45da485 View commit details
    Browse the repository at this point in the history

  10. Refactor second ticker to be in Application to make MainViewModel mor… 

    …e logical
    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    10627e3 View commit details
    Browse the repository at this point in the history

  11. Basic data model stuff

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    56a1569 View commit details
    Browse the repository at this point in the history

  12. More data model changes for completion Date

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    58c945f View commit details
    Browse the repository at this point in the history

  13. Finished preliminary data model

    @otisdog8
    otisdog8 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    2505a35 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. Basic view model tests

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    5481bdf View commit details
    Browse the repository at this point in the history

  2. Basic view model tests

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    8a7163e View commit details
    Browse the repository at this point in the history

  3. Delete dummy

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    086b072 View commit details
    Browse the repository at this point in the history

  4. Add TODO

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    28a8a42 View commit details
    Browse the repository at this point in the history

  5. Fix fixable warnings

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    e9ad691 View commit details
    Browse the repository at this point in the history

  6. Added xml file for meny and inflater to MainActivity.java

    @erichu100
    erichu100 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    3babb01 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #39 from CSE-110-Winter-2024/data-model-changes_ 

    Implement basic data model
    @otisdog8
    otisdog8 authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    8f24880 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into mock-time 

    # Conflicts:
#	app/src/main/java/edu/ucsd/cse110/successorator/MainViewModel.java
    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    d06794c View commit details
    Browse the repository at this point in the history

  9. Started dialog creation fragment and made menu open it. Note: Back bu… 

    …tton and click outside of window to click default.
    @erichu100
    erichu100 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    091f791 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into add-goal

    @erichu100
    erichu100 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    561389f View commit details
    Browse the repository at this point in the history

  11. Actually mock calendar in time, so now we can do things like stop tim… 

    …e fully in tests
    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    b0cf776 View commit details
    Browse the repository at this point in the history

  12. Plugged addGoal() into CreateDialogFragment. Properly adds to app's d… 

    …atabase.
    @erichu100
    erichu100 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    28846de View commit details
    Browse the repository at this point in the history

  13. Series of changes integrating dates into the app and treating time zo… 

    …nes properly
    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    28a9e5f View commit details
    Browse the repository at this point in the history

  14. added listView to activity_main.xml and using new list_item_goal.xml

    @erichu100
    erichu100 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    e7bf5ae View commit details
    Browse the repository at this point in the history

  15. Refactored a ton of stuff to store dates more logically

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    4ec0429 View commit details
    Browse the repository at this point in the history

  16. Added GoalListAdapter.java, implemented in MainActivity.java.

    @erichu100
    erichu100 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    467d893 View commit details
    Browse the repository at this point in the history

  17. removed placeholder from activity_main.xml and MainActivity.java

    @erichu100
    erichu100 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    040a765 View commit details
    Browse the repository at this point in the history

  18. Comprehensive tests

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    4ad8b1c View commit details
    Browse the repository at this point in the history

  19. Fix warnings

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    3942d1d View commit details
    Browse the repository at this point in the history

  20. Some refactoring and added tests for scenarios for US7

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    eec3b58 View commit details
    Browse the repository at this point in the history

  21. Replaced HelloWorld test with listDisplay test in MainActivityTest.java

    @erichu100
    erichu100 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    57e3e7f View commit details
    Browse the repository at this point in the history

  22. Merge pull request #40 from CSE-110-Winter-2024/add-goal 

    User Story 3: Type a Goal
    @otisdog8
    otisdog8 authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    a33f6e1 View commit details
    Browse the repository at this point in the history

  23. comments

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    1bd74d7 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' into mock-time 

    # Conflicts:
#	app/src/main/java/edu/ucsd/cse110/successorator/MainActivity.java
#	app/src/main/res/layout/activity_main.xml
    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    a0cced2 View commit details
    Browse the repository at this point in the history

  25. Hacky UI for mocked time

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    10c90c9 View commit details
    Browse the repository at this point in the history

  26. display current date

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    70a32e0 View commit details
    Browse the repository at this point in the history

  27. Make current date display worse so we can't mark US2 as done immediat… 

    …ely so we respect the agile process
    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    2afafa0 View commit details
    Browse the repository at this point in the history

  28. In progress

    @emguz
    emguz committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    33eff56 View commit details
    Browse the repository at this point in the history

  29. Fix bug in GoalRepository

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    0b03b96 View commit details
    Browse the repository at this point in the history

  30. fix test fail

    @otisdog8
    otisdog8 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    d9afecc View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Merge pull request #41 from CSE-110-Winter-2024/mock-time 

    Complete US7: Mock time and necessary data layer changes to make completed goals go away at 2am
    @JGonzaga7
    JGonzaga7 authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    bdc0dc6 View commit details
    Browse the repository at this point in the history

  2. Print statement errors

    @emguz
    emguz committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    1479765 View commit details
    Browse the repository at this point in the history

  3. a

    @emguz
    emguz committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    926ecad View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Improve tests

    @otisdog8
    otisdog8 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    1eba684 View commit details
    Browse the repository at this point in the history

  2. Fix format

    @otisdog8
    otisdog8 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    4dcfa9d View commit details
    Browse the repository at this point in the history

  3. oops

    @otisdog8
    otisdog8 committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    c762afa View commit details
    Browse the repository at this point in the history

  4. Added Strikthrough and grey scale properties for completed and uncomp… 

    …leted goals. Ordering properties completed.
    @emguz
    emguz committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    9d9bedf View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Update MainViewModelTest.java 

    Added tests for the scenarios, US8 done by me and US6 done by 
emguz, issues with Git Bash so manually adding it here
    @ZenoCS-Git
    ZenoCS-Git authored Feb 16, 2024
    Configuration menu
    Copy the full SHA
    9ab4417 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #49 from CSE-110-Winter-2024/complete-goal 

    Complete goal
    @ZenoCS-Git
    ZenoCS-Git authored Feb 16, 2024
    Configuration menu
    Copy the full SHA
    2582ce8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into date-display

    @otisdog8
    otisdog8 authored Feb 16, 2024
    Configuration menu
    Copy the full SHA
    2b8e521 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #48 from CSE-110-Winter-2024/date-display 

    Date display
    @wizard1238
    wizard1238 authored Feb 16, 2024
    Configuration menu
    Copy the full SHA
    59fedb0 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2024

  1. Added imeOptions to fragment_dialog_create_goal_xml.

    @erichu100
    erichu100 committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    25a08aa View commit details
    Browse the repository at this point in the history

  2. Replaced PositiveButton with OnEditorActionListener. Pressing enter k… 

    …ey now automatically creates goal and closes dialog. Closing dialog through back button or tapping outside of fragment continues to not create a goal.
    @erichu100
    erichu100 committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    c91b6e0 View commit details
    Browse the repository at this point in the history

  3. Clearing warnings. Deleted unused import, moved hint to values file, … 

    …declined autofill for input box.
    @erichu100
    erichu100 committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    a4e2f66 View commit details
    Browse the repository at this point in the history

  4. Made it a bit clearer OnEditorActionListener is always tied to the en… 

    …ter key of the textbox it's tied to.
    @erichu100
    erichu100 committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    e3339d2 View commit details
    Browse the repository at this point in the history

  5. Added tutorial text

    @wizard1238
    wizard1238 committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    1ca468e View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. Merge pull request #51 from CSE-110-Winter-2024/US-1 

    Added tutorial text
    @wizard1238
    wizard1238 authored Feb 18, 2024
    Configuration menu
    Copy the full SHA
    5d0d314 View commit details
    Browse the repository at this point in the history

  2. Fixed 2 bugs wrt time; changed behavior to be in line with Dylan's pi… 

    …azza post; updated tests
    @otisdog8
    otisdog8 committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    830507f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #52 from CSE-110-Winter-2024/fix-time-handling 

    Time handling improvements
    @wizard1238
    wizard1238 authored Feb 18, 2024
    Configuration menu
    Copy the full SHA
    238369b View commit details
    Browse the repository at this point in the history

  4. added integration tests for iteration 1

    @wizard1238
    wizard1238 committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    7bf96f9 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Fixed tests; gh action runners don't support expresso

    @otisdog8
    otisdog8 committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    5503014 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into iteration-1-testing

    @otisdog8
    otisdog8 authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    16727ff View commit details
    Browse the repository at this point in the history

  3. new behavior caused broken tests

    @otisdog8
    otisdog8 committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    a99bff8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into enterToConfirm

    @otisdog8
    otisdog8 authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    febb660 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #50 from CSE-110-Winter-2024/enterToConfirm 

    Enter to confirm
    @erichu100
    erichu100 authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    1a59323 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into iteration-1-testing

    @erichu100
    erichu100 authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    5a01936 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #53 from CSE-110-Winter-2024/iteration-1-testing 

    added integration tests for iteration 1
    @erichu100
    erichu100 authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    6481de2 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Substantial data model changes making implementation of mode switchin… 

    …g easy. This makes implementing many tasks substantially easier, but directly completes 1.1 and 3.2. Adds multiple TODOs for people who then actually go and implement the stuff that's been skeletonized here.
    @otisdog8
    otisdog8 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    7311d65 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. Add dropdown menu image and dropdown menu.

    @erichu100
    erichu100 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    c10381e View commit details
    Browse the repository at this point in the history

  2. Implemented creation of dropdown menu

    @erichu100
    erichu100 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    7713891 View commit details
    Browse the repository at this point in the history

  3. Setup framework for updating title based on appMode.

    @erichu100
    erichu100 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    7244dad View commit details
    Browse the repository at this point in the history

  4. Implemented popup menu's logic.

    @erichu100
    erichu100 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    3822199 View commit details
    Browse the repository at this point in the history

  5. Added getting string for Tomorrow's date.

    @erichu100
    erichu100 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    8e912d5 View commit details
    Browse the repository at this point in the history

  6. Updated date formatter and updated MainViewModelTest tests to match. 

    Additionally, updated MainActivityTest to consider refactor and added test for updating title along with methods to MainActivity to facilitate these tests.
    @erichu100
    erichu100 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    640f33f View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Merge pull request #106 from CSE-110-Winter-2024/fix-list-export 

    General architectural and data model improvements + exporting specific lists
    @otisdog8
    otisdog8 authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    636f3f2 View commit details
    Browse the repository at this point in the history

  2. 3.1 Added radios buttons with modifcations and color changes that mat… 

    …ches the example scenarios
    @ZenoCS-Git
    ZenoCS-Git committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    2beae22 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Merge branch 'master' into view_popup_menu

    @erichu100
    erichu100 authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    f9ed934 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #108 from CSE-110-Winter-2024/view_popup_menu 

    View popup menu
    @emguz
    emguz authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    5538ddf View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Fixed design for task 1.5

    @otisdog8
    otisdog8 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    24ad1ee View commit details
    Browse the repository at this point in the history

  2. Improved TimeUtils by adding utility methods. This enables tasks 6.1,… 

    … and 6.4/6.5
    @otisdog8
    otisdog8 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    5272e9c View commit details
    Browse the repository at this point in the history

  3. Added RecurringGoalSorter as part of 6.1

    @otisdog8
    otisdog8 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    dda7809 View commit details
    Browse the repository at this point in the history

  4. Changes to data layer as part of 6.1 to enable creating instances of … 

    …recurring tasks
    @otisdog8
    otisdog8 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    76f92d8 View commit details
    Browse the repository at this point in the history

  5. Refactored TodayGoalFilter as part of 6.1 to make correct and tested

    @otisdog8
    otisdog8 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    eaa1532 View commit details
    Browse the repository at this point in the history

  6. Fix typos and modernize

    @otisdog8
    otisdog8 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    7494535 View commit details
    Browse the repository at this point in the history

  7. Full implementation of most important recurring goal logic; handles g… 

    …eneration and cleanup of recurring tasks, and tests all added code. Effectively implements 6.1, 6.4, and 6.5, though story tests will be needed to further verify correctness for the end to end integration.
    @otisdog8
    otisdog8 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    befe3e6 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge pull request #109 from CSE-110-Winter-2024/recurring-goal-model 

    Recurring goal model + design fixes for app title stuff
    @JGonzaga7
    JGonzaga7 authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    869fb38 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:CSE-110-Winter-2024/project-team-… 

    …23 into iteration1-testing
    @ZenoCS-Git
    ZenoCS-Git committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    65e6f2f View commit details
    Browse the repository at this point in the history

  3. Added outline of Scenario-Based System Test number 1

    @ZenoCS-Git
    ZenoCS-Git committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    9188b22 View commit details
    Browse the repository at this point in the history

  4. connected context buttons in CreateGoalDialogFragment to logic, will … 

    …now throw if goal string is empty or no context is selected
    @wizard1238
    wizard1238 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    9703bb2 View commit details
    Browse the repository at this point in the history

  5. Added outlines for SBST 2 and 3, polished SBST 1, and added overloade… 

    …d method for goal creating with Context for testing
    @ZenoCS-Git
    ZenoCS-Git committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    f41b107 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Added parts of tests for SBST 2 and 3, incomplete because depend on o… 

    …ther US
    @ZenoCS-Git
    ZenoCS-Git committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    88bc2ee View commit details
    Browse the repository at this point in the history

  2. Removed old unnecessary code from UI development

    @ZenoCS-Git
    ZenoCS-Git authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    a357c88 View commit details
    Browse the repository at this point in the history

  3. Update fragment_dialog_create_goal.xml

    @JGonzaga7
    JGonzaga7 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    3cc9db7 View commit details
    Browse the repository at this point in the history

  4. Changed the name for addGoal to addGoalWithContext for clear method n… 

    …ames
    @ZenoCS-Git
    ZenoCS-Git committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    1c9961a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'iteration1-testing' of github.com:CSE-110-Winter-2024/p… 

    …roject-team-23 into iteration1-testing
    @ZenoCS-Git
    ZenoCS-Git committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    e3f0b39 View commit details
    Browse the repository at this point in the history

  6. Updated goal creation UI with contexts 

    Re-used old Context UI, added recurring Goal UI (no functionality yet)
    @JGonzaga7
    JGonzaga7 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    da2a867 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #110 from CSE-110-Winter-2024/iteration1-testing 

    Iteration 1 Testing
    @ZenoCS-Git
    ZenoCS-Git authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    5786029 View commit details
    Browse the repository at this point in the history

  8. Updated goal UI to be separate when in Recurring List

    @JGonzaga7
    JGonzaga7 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    b217a94 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into recurring-goal-UI

    @JGonzaga7
    JGonzaga7 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    a3db839 View commit details
    Browse the repository at this point in the history

  10. added tests for us3

    @wizard1238
    wizard1238 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    bc0a6e2 View commit details
    Browse the repository at this point in the history

  11. app now doesn't do anything if no context is selected

    @wizard1238
    wizard1238 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    6c81ee8 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into ui-context-selection

    @wizard1238
    wizard1238 authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    d92ac6d View commit details
    Browse the repository at this point in the history

  13. fixed remaining merge conflict bugs

    @wizard1238
    wizard1238 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    b9f7867 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #111 from CSE-110-Winter-2024/ui-context-selection 

    UI context selection
    @ZenoCS-Git
    ZenoCS-Git authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    5f2a94b View commit details
    Browse the repository at this point in the history

  15. Implementing Logic of recurring goal creation

    @JGonzaga7
    JGonzaga7 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    307ee33 View commit details
    Browse the repository at this point in the history

  16. added testing for US6

    @wizard1238
    wizard1238 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    472e2ad View commit details
    Browse the repository at this point in the history

  17. fixed bug in deleteRecurringGoal

    @wizard1238
    wizard1238 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    b80d7e8 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' into US6-testing

    @erichu100
    erichu100 authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    bb10f66 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #112 from CSE-110-Winter-2024/US6-testing 

    automatic merge
    @erichu100
    erichu100 authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    c1d2a1d View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. UI for the icons for list goals

    @ZenoCS-Git
    ZenoCS-Git committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    838b414 View commit details
    Browse the repository at this point in the history

  2. UI for floating 'context' menu for pending goals

    @ZenoCS-Git
    ZenoCS-Git committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    20a6749 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. skeletons for US8 tests

    @ZenoCS-Git
    ZenoCS-Git committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    82c805a View commit details
    Browse the repository at this point in the history

  2. Finished Adding Recurring Goal UI

    @JGonzaga7
    JGonzaga7 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    9dfbeca View commit details
    Browse the repository at this point in the history

  3. ACTUALLY Completed Deleting Recurring Goal

    @JGonzaga7
    JGonzaga7 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    1387529 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into recurring-goal-UI

    @JGonzaga7
    JGonzaga7 authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    40e3690 View commit details
    Browse the repository at this point in the history

  5. task 4.1: finish tomorrow-related state changes and testing for tomor… 

    …row goal filter
    @otisdog8
    otisdog8 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    8abf741 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #113 from CSE-110-Winter-2024/pending_ui 

    US8 Pending UI and Skeleton Tests
    @ZenoCS-Git
    ZenoCS-Git authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    079f328 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into recurring-goal-UI

    @erichu100
    erichu100 authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    8a522c3 View commit details
    Browse the repository at this point in the history

  8. Fixing Merge issue with parsing AppMode value

    @JGonzaga7
    JGonzaga7 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    4c765e7 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #114 from CSE-110-Winter-2024/recurring-goal-UI 

    Recurring goal UI and logic
    @erichu100
    erichu100 authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    c824418 View commit details
    Browse the repository at this point in the history

  10. Updated default goal sorter to prioritize context before sortOrder.

    @erichu100
    erichu100 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    5e2f3f6 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of github.com:CSE-110-Winter-2024/project-team-… 

    …23 into context-filter-sorter
    @erichu100
    erichu100 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    4d6573b View commit details
    Browse the repository at this point in the history

  12. Added context and id comparisons to PendingGoalSorter. RecurringGoalS… 

    …orter remains solely based on date.
    @erichu100
    erichu100 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    ae31c2b View commit details
    Browse the repository at this point in the history

  13. Added context to CreateRecurringGoalDialogFragment. 

    Additionally added id to RadioGroup in fragment_dialog_create_recurring_goal.xml
    @erichu100
    erichu100 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    173bf12 View commit details
    Browse the repository at this point in the history

  14. Changed context filter to filter directly from repository rather than… 

    … filtering displayed goals (ouroboros)
    @erichu100
    erichu100 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    2d00688 View commit details
    Browse the repository at this point in the history

  15. Preliminary tests for US2 and US3

    @erichu100
    erichu100 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    a396dfb View commit details
    Browse the repository at this point in the history

  16. Cleared a couple warnings, made sorter logic more compact.

    @erichu100
    erichu100 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    1d114a4 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #116 from CSE-110-Winter-2024/context-filter-sorter 

    Context Filter and Sorter
    @JGonzaga7
    JGonzaga7 authored Mar 13, 2024
    Configuration menu
    Copy the full SHA
    36353b6 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Fixing Bug for Recurring options in Pending List

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    f05d1de View commit details
    Browse the repository at this point in the history

  2. Added Recurrence String to show Day of Week

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    e1c9c9d View commit details
    Browse the repository at this point in the history

  3. Today and Tomorrow Recurring Goals show in Recurring List

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    e8710df View commit details
    Browse the repository at this point in the history

  4. Added Test for NthDayofWeek

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    0c31a61 View commit details
    Browse the repository at this point in the history

  5. Made Test for Recurring Goal String UI, DOESN'T WORK PLEASE HELP

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    5f8e792 View commit details
    Browse the repository at this point in the history

  6. Fix sbst failures

    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    efee856 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into tomorrow-tests 

    # Conflicts:
#	app/src/main/java/edu/ucsd/cse110/successorator/MainViewModel.java
    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    c1380a6 View commit details
    Browse the repository at this point in the history

  8. Add scenario tests

    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    2c1f467 View commit details
    Browse the repository at this point in the history

  9. looks like someone tested this

    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d4f865c View commit details
    Browse the repository at this point in the history

  10. Improvements to recurring goal handling: specifically, cases where re… 

    …curring goals got deleted with not visible instances were not tested
    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    549ad51 View commit details
    Browse the repository at this point in the history

  11. Need to subtract 1 from month: months are 0-indexed

    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    f89f885 View commit details
    Browse the repository at this point in the history

  12. Add specific text to recurring goal buttons, improve coverage of butt… 

    …on generating strings
    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d40bfb7 View commit details
    Browse the repository at this point in the history

  13. changed ui so that pending goals don't have a temporal component

    @wizard1238
    wizard1238 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    8448303 View commit details
    Browse the repository at this point in the history

  14. Add validation

    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    04a054d View commit details
    Browse the repository at this point in the history

  15. added code for US8.1, the context menu in pending tasks works. in add… 

    …ition, the context menu for recurring tasks should also work
    @wizard1238
    wizard1238 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    cba934c View commit details
    Browse the repository at this point in the history

  16. Add validation

    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ecf8a75 View commit details
    Browse the repository at this point in the history

  17. Fix goal generation

    @otisdog8
    otisdog8 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    79831e9 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #115 from CSE-110-Winter-2024/tomorrow-tests 

    Fully implement US4, various recurring goal & testing improvements
    @emguz
    emguz authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    2779cf0 View commit details
    Browse the repository at this point in the history

  19. Added xml for focus popup and hamburger menu image.

    @erichu100
    erichu100 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    60fceb8 View commit details
    Browse the repository at this point in the history

  20. Fixed test for UI String on recurring goal

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    acc5ad0 View commit details
    Browse the repository at this point in the history

  21. Refactored focus mode code in MainActivity and updated MainViewModelTest

    @erichu100
    erichu100 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    59bd6be View commit details
    Browse the repository at this point in the history

  22. Added focus popup. Currently tied to top left.

    @erichu100
    erichu100 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    0d180a0 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' of github.com:CSE-110-Winter-2024/project-team-… 

    …23 into context-menu

# Conflicts:
#	app/src/main/java/edu/ucsd/cse110/successorator/MainViewModel.java
    @erichu100
    erichu100 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    a865436 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' into Pending-Goal-UI

    @JGonzaga7
    JGonzaga7 authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    6eeee02 View commit details
    Browse the repository at this point in the history

  25. Fixed Merge Conflict

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    5252994 View commit details
    Browse the repository at this point in the history

  26. Fixing error caused by merge conflict

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    49627df View commit details
    Browse the repository at this point in the history

  27. Fixing decrement issue

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d4672ed View commit details
    Browse the repository at this point in the history

  28. Fixing .class merge error (hopefully)

    @JGonzaga7
    JGonzaga7 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    b13236f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Merge branch 'master' into tomorrow-tests

    @erichu100
    erichu100 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    ce6f3ad View commit details
    Browse the repository at this point in the history

  2. Merge pull request #118 from CSE-110-Winter-2024/tomorrow-tests

    @otisdog8
    otisdog8 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    c57d4c1 View commit details
    Browse the repository at this point in the history

  3. Implemented hamburger menu.

    @erichu100
    erichu100 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    db67a57 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:CSE-110-Winter-2024/project-team-… 

    …23 into context-menu
    @erichu100
    erichu100 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    15b0e01 View commit details
    Browse the repository at this point in the history

  5. wrote tests for US7, half of US8. also refactored a bit

    @wizard1238
    wizard1238 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    95c1792 View commit details
    Browse the repository at this point in the history

  6. Fixed merge conflict

    @wizard1238
    wizard1238 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    11be11a View commit details
    Browse the repository at this point in the history

  7. finished writing tests for us8

    @wizard1238
    wizard1238 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    6a3268c View commit details
    Browse the repository at this point in the history

  8. Goals now update immediately after context update.

    @erichu100
    erichu100 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    fbf2407 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into Pending-Goal-UI

    @emguz
    emguz authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    1ea630d View commit details
    Browse the repository at this point in the history

  10. Added jank color switching. Would need to switch to Toolbar to fix.

    @erichu100
    erichu100 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    5204c7a View commit details
    Browse the repository at this point in the history

  11. reverted redundant bug fix

    @wizard1238
    wizard1238 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    835af42 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #117 from CSE-110-Winter-2024/Pending-Goal-UI 

    UI Bug Fixes + Goal Creation Functionality
    @wizard1238
    wizard1238 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    048117e View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into US7

    @wizard1238
    wizard1238 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    f020b3a View commit details
    Browse the repository at this point in the history

  14. fixed typo

    @wizard1238
    wizard1238 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    afd7b3b View commit details
    Browse the repository at this point in the history

  15. Merge pull request #119 from CSE-110-Winter-2024/US7 

    US7 and US8
    @emguz
    emguz authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    49ccdf0 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of github.com:CSE-110-Winter-2024/project-team-… 

    …23 into context-menu
    @erichu100
    erichu100 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    36c06eb View commit details
    Browse the repository at this point in the history

  17. Tested gravity, doesn't work.

    @erichu100
    erichu100 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    ba7dc9c View commit details
    Browse the repository at this point in the history

  18. Merge pull request #120 from CSE-110-Winter-2024/context-menu 

    Focus Mode Implementation
    @JGonzaga7
    JGonzaga7 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    1472c5c View commit details
    Browse the repository at this point in the history

  19. reverted half of previous reversion from 'UI Bug Fixes + Goal Creatio… 

    …n Functionality'
    @wizard1238
    wizard1238 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    9c30bb4 View commit details
    Browse the repository at this point in the history

  20. Update README.md

    @wizard1238
    wizard1238 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    2207ed1 View commit details
    Browse the repository at this point in the history

  21. Moved focus menu to right and made top bar change depending on focus … 

    …mode.

Readded mock button.
    @erichu100
    erichu100 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    f7b06df View commit details
    Browse the repository at this point in the history

  22. Merge pull request #121 from CSE-110-Winter-2024/fixing-reverts 

    reverted half of previous reversion from 'UI Bug Fixes + Goal Creatio…
    @JGonzaga7
    JGonzaga7 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    416840b View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' of github.com:CSE-110-Winter-2024/project-team-… 

    …23 into readd-mock
    @erichu100
    erichu100 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    e97c2da View commit details
    Browse the repository at this point in the history

  24. Merge pull request #122 from CSE-110-Winter-2024/readd-mock 

    Readd mock
    @otisdog8
    otisdog8 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    a54e193 View commit details
    Browse the repository at this point in the history

  25. Fix UI so that it correctly displays letters with list items

    @otisdog8
    otisdog8 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    80e1cef View commit details
    Browse the repository at this point in the history

  26. Merge pull request #123 from CSE-110-Winter-2024/ui-hotfix 

    Fix UI so that it correctly displays letters with list items
    @JGonzaga7
    JGonzaga7 authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    c1317b2 View commit details
    Browse the repository at this point in the history