Eva dai

[eevadai]

Setting and Import button finished. But still need more modifications! Problems: 1) Setting: After changing color, cannot return to default color. 2) Import: in progress

[ScottCTD]

It seems you have some troubles with your pull request.

You only have 1 commit but you pr many commits from others.

The solution is

1. Copy and paste the files you modified to an arbitrary location like your desktop.
2. Clone our repo to make sure everything is in the correct state.
3. Switch to Charlotte's branch.
4. Create a new branch with whatever name from Charlotte's branch.
5. Copy and paste the files you modified into the correct location. In this case, you can move the files to src/main/java/billgates/view/gui.
6. Use IntelliJ to commit your change.
7. Push your commit.
8. Make a pull request from the branch you created to Charlotte's branch.
9. Then, you will have a new pull request with only one commit in it. Done!

For now, I will close your PR and you can remake the pr as I described above (no change to code, just copying and pasting some files).

Comments on your change:

• Overall, you did a great job implementing the import and some settings.
• However, since we are changing our GUI, your contribution can be impacted by this.
• We plan to move the import button and the setting button to the menu bar.
• Therefore, our change indeed influenced your contribution but it is very easy to change a little bit of your code to resolve this issue.
• We didn't plan to do import functionality, as you can see in our initial implementation plan. But it is very great to try to implement the feature by yourself. Importing is actually a big functionality involving string manipulations, database interactions, and some GUI updates.

I will repost these comments in your new PR, and I will review your code in your new PR (for now, it is almost impossible to review your code).