- nothing
Merge branches 'Eric' and 'master' of https://github.com/CaKlassen/DogSweater
Merge branch 'master' of https://github.com/CaKlassen/DogSweater
- modified Profile.java to describe the actual Dimensions that need to be added to a Profile, and their associated defaultValueExpressions
- updated some comments
- changed flow of main application to skip the YarnChoice and Material activities and go straight to YarnSelection
- updated some comments
- Created Popup.java, it is a very generic implementation of a Popup, using the info_popup layout.
- added setters to the StylePopup so that we don't have to pass so many things into its constructor
- fixed an infinite loop problem with my Dimensions class...whoops
- updated comments
- fixed bug; now, in the ProfileSelection activity, when a profile is selected, we get its database ID, and put it into an intent to send to the StyleSelection activity...it didn't used to do this
- worked on the StyleSelection activity; now it selects a style, and passes the styleId on to the next activity
- worked on YarnSelection, it now creates a project and puts it into the DB, and starts the next activity
- TODO: calculate and add gauge information to the Project
- TODO: make the project save gauge information into the DB
- TODO: make the preprocessing method, that creates and returns a Dimensions with the needed keys for the ProjectPattern

- NOTE: make sure you reinstall the app because the database schema changed

- TODO: calculate and add gauge information to the Project
- TODO: make the project save gauge information into the DB