# Conflicts:
#	app/src/main/java/com/fieldbook/tracker/dialogs/NewTraitDialog.kt
#	app/src/main/java/com/fieldbook/tracker/offbeat/traits/formats/Formats.kt
#	app/src/main/java/com/fieldbook/tracker/offbeat/traits/formats/parameters/CameraTypes.kt

# Conflicts:
#	app/src/main/java/com/fieldbook/tracker/dialogs/NewTraitDialog.kt
#	app/src/main/java/com/fieldbook/tracker/offbeat/traits/formats/parameters/CameraTypes.kt

# Conflicts:
#	app/src/main/java/com/fieldbook/tracker/dialogs/NewTraitDialog.kt
#	app/src/main/java/com/fieldbook/tracker/offbeat/traits/formats/parameters/CameraTypes.kt

…e view now just loads 512x512 thumbnails

added gopro hardware capture

fit gopro preview to screen

…of images, necessary for raw/large images that exceed phone memory

Added system, preview, and resolution settings to photo trait layout.
Photo trait now optionally uses camerax when in non-system mode, which allows a preview and target resolution selection (target is not guaranteed)

…Usb -> USB

# Conflicts:
#	app/src/main/java/com/fieldbook/tracker/offbeat/traits/formats/contracts/UsbCameraFormat.kt

Added preview, auto white balance and auto focus checkboxes.

Introduced camerax facade data pattern with DI to facilitate unified camera parameters across the app
Fixed EXIF data

updated ui to include preview in the main image recycler view
fixed full screen camera preview not matching camera sensor

updated camera trait ui
updated camera settings dialog ui
removed settings from fullscreen camera
updated fullscreen camera background to black
updated camera settings dialog strings
improved image loading to only load thumbnails on-the-fly
improved preview w/h based on screen density
restricted image aspect ratios to 4:3
bugfix for canceling coroutine when navigating between plots

fixed print label trait not updating repeated measures toolbar
introduced modular interfaces: Coders for encoding/decoding database obs. var. string values to models (such as Categorical json -> valid values array) and Presenters for creating a human-readable string representation of obs. var. database strings or their models, (such as displaying the Uri file name instead of the entire uri), this is only used in repeated measures dialog so far.

…_camera

# Conflicts:
#	app/src/main/java/com/fieldbook/tracker/interfaces/CollectController.kt

merged usb camera updates
introduced orientation-based ui for better handling of external camera traits which are naturally landscape
fixed minor bugs

# Conflicts:
#	app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java
#	app/src/main/java/com/fieldbook/tracker/interfaces/CollectController.kt
#	app/src/main/java/com/fieldbook/tracker/traits/AbstractCameraTrait.kt
#	app/src/main/res/layout/trait_camera.xml

improved delete preview for external cameras
improved positioning of shutter button on usb trait

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java
#	app/src/main/java/com/fieldbook/tracker/interfaces/CollectController.kt
#	app/src/main/java/com/fieldbook/tracker/offbeat/traits/formats/Formats.kt
#	app/src/main/java/com/fieldbook/tracker/offbeat/traits/formats/contracts/GoProFormat.kt
#	app/src/main/java/com/fieldbook/tracker/traits/AbstractCameraTrait.kt
#	app/src/main/res/values/strings.xml

added bitmap loader class to handle thumbnails, added a thumbnail implementation for external cameras as the default document provider was failing at times for canon images

introduced landscape image thumbnail dimen
improved delete trait listener for images
moved shutter button to below preview
updated camera settings to update on "ok" pressed
reduced size of landscape thumbnails
fixed usb settings title
fixed usb settings defaulting to highest resolution
fixed usb settings showing duplicated resolutions
fixed usb settings preview persisting
decreased image transfer size for canons

improved image saving speed
updated canon settings, preview now is toggleable
ensure photo file names are sanitized so they can be used with dir.findFile
removed old canon preferences
added beta to canon trait display name