search

JamesLongman / Squad-Mortar-Calculator-IOS

IOS App: Mortar calculator for the video game Squad
https://itunes.apple.com/app/id1352781413
MIT License
3 stars 0 forks source link

Add custom keyboards #20

Open JamesLongman opened 6 years ago

JamesLongman commented 6 years ago

The app should have custom keyboards particularly for the second input fields where there is only a number input needed.

There is the option to include a number only keyboard but the numbers are laid out like a phone (upside down from numpad layout) so I thought that it would be very confusing.

JamesLongman commented 6 years ago

I have only done a little bit of work on this issue so far and merging conflict in Xcode seems to be very difficult and it's causing me crashes so I'm just going to push my current work up to a remote branch and probably create a new branch to continue it from the current develop.

For the future if merge conflicts need to be resolved I will most likely use githubs file editor

JamesLongman commented 6 years ago

Decided to try to resolve the merge, never used github to do it before but was surprisingly easy. A very basic editor though so for merge conflicts to develop you would have to pay close attention to the auto code reviews to make sure your style/syntax is good