Merge branch 'ryandev' of github.com:curtisullerich/butterflies into ryandev
Merge branch 'ryandev' of github.com:curtisullerich/butterflies into ryandev
added formatting profile
Basic summary page implemented. Will want to be polished later #60
Forgot a null check #60
Added descriptions for current settings #86
Cleaned up the upgrading portion of the developer database. It now uses the SQLiteOpenHelper class to control it's life cycle rather than the onCreate within the provider. Also began performing on cleanup and commenting of the database code.
Code cleanup. Few issues: 1. help.xml is never being used but will in the future so I left it in. 2. Cameron will need to look at Settings.java. I'm a little confused as to what that's for and don't think it's currently in use. 3. Preferences.xml has two settings which are commented out that I left there since they will need to be implemented. #98
Deleted individual state files and csv files. #98
refactoring and cleanup for #98
I completed the development of the Survey and Sightings managers. These manager will allow for the removal of the sql code from throughout the application. Also went through and removed the Core and updated the
feedback tasks to not use the Core. The Camera and Light Sensor code will need to be completely redone as the previous layout of those will not work. Went through and completed documenting the database code as well. #98
Adding the java file that was used to parse the butterfly list provided by Nathan and Anita.
Merge branch 'dev' of https://github.com/curtisullerich/butterflies into locdev

Conflicts:
	app/android/src/edu/iastate/ece/butterflies/Core.java
	app/android/src/edu/iastate/ece/butterflies/FeedbackInstance.java
	app/android/src/edu/iastate/ece/butterflies/LightSensor.java
	app/android/src/edu/iastate/ece/butterflies/Settings.java
	app/android/src/edu/iastate/ece/butterflies/activity/FeedbackActivity.java
	app/android/src/edu/iastate/ece/butterflies/task/UploadFeedbackTask.java
Completed the feedback page support on the server as well as in the application. The feedback from the application, assuming internet is present when used, is uploaded to a csv. The php code to handle the parsing of the the applications message has been added to this commit as well. #30
Added support for uploading surveys to the server. The server will store the received results in a csv format for later usage. Also added the ability to specify the servers location from within the settings menu. This will allow a user to specify their own server if they desire. A column has been added to the Survey table as well to keep track of whether a particular survey has been uploaded or not. Performing a long press on the survey explorer page will present the context menu with the upload option. #9
Added support for the pollard survey type within the application. When a pollard survey is selected, a dropdown menu will appear while performing the survey and filling in the survey information. Along with this, a transect value has now been added to the sighting database as well. The default values for transects are either numbers or letters. The view option can be specified in the settings menu. #20
Continued work on adding support for importing custom butterfly lists. The ButterflyManager now has a function that will allow for the importing of custom butterfly lists through a csv file. I also rebuilt the database to contain the butterflies from the US and Canada list that was received from Nathan. During a fresh install of the application, the new list of butterfies will be pushed to the device. I also implemented a method of switching out the master butterfly list content with content from a CSV. This provides the possibility of regional lists that could be made available and easily installed into the application. #103 #96
Merge branch 'dev' of https://github.com/curtisullerich/butterflies into locDev
reworked breadcrumbing to allow configurable period. #85
Continued work on adding support for the Pollard protocol. I added a field to the Survey table to keep track of how the transects are broke apart, distance or habitat. I also added a dropdown menu when a Pollard survey has been opened that show
all the current transects that have been configured on the device. This required the creation of another database table to store all the user created transect information. I also created a provider and manager for accessing that information. Each sighting is saved with an index into the lists that are generated in the dropdown menu for the transect. This will probably need to be changed to store the record ID of the transect from the database table. As the user will eventually be able to modify their transect list, I removed the Pollard mode from the settings files. The SurveyFragment and the EditSighting page were also modified to change their apearance slightly if a Pollard survey has been opened. A method still needs to be implemented for allowing the user to customize their list of transects. #20