Closed NinjaSnail42 closed 4 years ago
I just checked over it now and it looks great to me too just with a few merge conflicts to fix. Agreed on the gitignore (although I've tried and failed in the past at ignoring that- maybe there are lots of different DS_Stores?). Thanks for your input too @shayneptorres !
Yeah, apologies for the merge conflict on the storyboard file. I was a dev manager on an iOS project last year for a class at University, and it is quite a pain to fix merge conflicts in the storyboard files.
I fixed the merge conflicts. Had to change repositories from my fork to the actual repo. Should be good for an admin to merge now.
Whew thank you for that @NinjaSnail42 !! I tried to resolve the conflicts for 30 minutes earlier, it was quite hellish, and I ended up discarding all my changes and was going to try again tonight. I made a few tweaks and I'm merging the changes in now! :)
4 Native Dark Mode support for the app.
Notes
Testing