Commit Graph

483 Commits

Author SHA1 Message Date
Amanda Bullington
8114015c70 Upload on ObsEdit takes user to MyObservations (#747)
* Upload now drops user on ObsList; fixes for upload status & toolbar

* Fix for showing ObsUploadStatus UI
2023-08-24 15:12:50 -07:00
Amanda Bullington
bc350c77b9 Nested navigators (#741)
* Move login and camera screens into stack navigators

* Navigation fixes

* Create ObservationsStackNavigator

* Move drawer items into drawer nav

* Navigator fixes and improvements

* Nav improvements

* Fix navigation from ObsEdit

* Fix test

* Fix test

* Redo bottom tab nav with Explore as part of ObservationsStack

* Use ObsEdit and AddID in two stacks

* Move identify into ObservationsStack and fix headers

* Fix ObsEdit bottom button issue by using fixed positioning for tab bar

That required a few other changes to places where we were explicitly
compensating for the height of the tab bar. Also fixed some other minor
layout issues.

* Typo

* Add LocationPicker to ObservationsStackNavigator

---------

Co-authored-by: Ken-ichi Ueda <kenichi.ueda@gmail.com>
2023-08-23 22:07:07 -07:00
Amanda Bullington
3231747e9f ObsEdit uses prediction from AR Camera (#746)
* Add prediction to ObsEdit when nav from ARCamera

* Take photo from checkmark
2023-08-23 20:45:18 -07:00
Amanda Bullington
1142d00563 Update activity list when on non current user ObsDetail screen (#742)
* Fix agree/suggest/comment refetch for ObsDetails, non current-users

* Fix test
2023-08-22 17:43:16 -07:00
Amanda Bullington
0d203dfce0 Update activity list with suggested IDs (#740)
* Pass non-serialized values to AddID; handle id creation before nav; closes #721

* Fix tests
2023-08-17 19:27:49 -07:00
Amanda Bullington
5bfa7940e1 Refactor ObsDetails and show ID after agree button pressed (#738) 2023-08-16 16:09:46 -07:00
Ken-ichi Ueda
a17f8e026d Use default styling for view type buttons on Explore 2023-08-15 16:03:44 -07:00
Amanda Bullington
dceccaece4 Add tests to DisplayTaxon; closes #726 (#735) 2023-08-14 17:04:01 -07:00
Amanda Bullington
2853855206 Bug fixes for Explore on Android (#734)
* Bug fixes for Explore on Android

* Button fixes

* Platform specific button code
2023-08-14 10:29:30 -07:00
Amanda Bullington
85f11fdf69 Add IconicTaxonChooser to ObsEdit (#733) 2023-08-10 18:01:24 -07:00
Ken-ichi Ueda
203d22baf9 Bugfix: forgot cvModel helper doesn't have the unique file names 2023-08-09 18:20:31 -07:00
Ken-ichi Ueda
8b0c7a4f55 Minor pre-release updates
* Updated the README to be more explicit about how to make an internal test
  release
* Added ML model and taxonomy file names to the About screen
* Changed the dirModel and dirTaxonomy exports from cvModel to be modelPath
  and taxonomyPath since they point to files, not directories
2023-08-09 17:54:06 -07:00
Amanda Bullington
5b913ad1a7 Create IconicTaxonChooser, add to UI library, and write tests (#732) 2023-08-09 10:04:21 -07:00
Amanda Bullington
20d8308e5f Explore UI (#731)
* Start building explore screen

* Header for Explore screen

* Fix button build

* Move ObsFlashList to shared components for use in Explore

* Fix background transparency on SegmentedButtons

* Use reusable components for map and ObservationLocation

* Use search observations API to show results in explore views

* Add infinite scroll hook to species, observers, and identifiers views

* Update snapshots and create ExploreFlashList for consistent header animation

* Float segmented buttons above observation lists in explore

* Use queryparams for API calls; add loading state to each view
2023-08-08 12:29:17 -07:00
Ken-ichi Ueda
5f55285ee4 Try to make sure dummy model files are available before trying to build 2023-08-07 09:49:25 -07:00
Johannes Klein
2e8665047c Cv model 2.4 (#729)
* Use env var for cv model version

* Reorder code

* Specify tensorflow version to use
2023-08-07 16:44:58 +02:00
Ken-ichi Ueda
393bf767cf Link iOS CV model files in a build phase
iOS bundle files *must* be referenced in the xcode projects, which means that
updating the filenames in .env is not enough, you also have to add them to
the xcode project. This attempts to simplify this by assuming the named files
in the xcode project remain the same, but they are actually hard links to the
files specified in .env.
2023-08-03 21:24:16 -07:00
Angie Ta
082bd4661b Merge branch 'main' into 580-on-smaller-screen-sizes-the-lowest-part-of-obscreate-is-not-reachable 2023-08-02 19:00:24 -07:00
Angie Ta
c41b9547c5 Added padding to offset bottom buttons 2023-08-02 17:39:48 -07:00
Johannes Klein
4548ca93e5 Add default options to capture high quality photos 2023-08-02 14:15:07 +02:00
Johannes Klein
67a8552562 Upgrade vision plugin, breaking changes 2023-08-02 12:45:11 +02:00
Ken-ichi Ueda
3fa9bf38bc Several fixes for ARCamera build
* updated vision-camera-plugin-inatvision and adjusted iOS code to fit
* added generic model and taxonomy names to project.pbxproj... because
  apparently you need to have files in there to access them from within the
  app; I hope there's a better way to do this but for now symlinks work
* fixed a bug with DisplayTaxonName when taxon has no rank
2023-07-31 17:24:00 -07:00
Ken-ichi Ueda
af2a5fbcb8 Replace current loc button w/ loading; make lower right interactive 2023-07-31 13:19:32 -07:00
budowski
4db5498e6e #710 - current location fetching timeout; fix crash when reaching location picker before current location was fetched in observation viewer (#727) 2023-07-31 12:22:42 -07:00
Ken-ichi
7ae95519ea Iconic taxa icons (#723)
* Added iconic taxa icons; cleaned up some other icon files
* Updated snapshots
* Renamed ban icon to match fontawesome convention we use on the web
2023-07-28 10:22:34 -07:00
Angie Ta
be331bb14a Add icon to new id 2023-07-26 17:12:24 -07:00
Angie Ta
f561497340 Cleanup 2023-07-26 16:30:15 -07:00
Angie Ta
c803836ad8 Merge branch 'main' into obs-detail 2023-07-26 16:03:14 -07:00
Angie Ta
caeeca2feb Merge branch 'main' into obs-detail 2023-07-26 16:01:47 -07:00
Amanda Bullington
c8e96d9584 Add UserText to shared components index (#715) 2023-07-26 08:57:36 -07:00
Angie Ta
dd2b17f6dc DQA Tests, Id withdraw icon change 2023-07-25 17:55:49 -07:00
Amanda Bullington
82c6e5fd21 Fix agree with ID bottom sheet visibility; closes #709 (#713) 2023-07-25 15:13:41 -07:00
Amanda Bullington
df5b4132fa Location picker improvements (#692)
* Improvements & bug fixes for location picker; closes #628

* Styling changes

* Refactor location picker to use container and get tests passing
2023-07-25 10:38:06 -07:00
Angie Ta
afd9ce0579 Merge branch 'main' into obs-detail 2023-07-24 17:59:23 -07:00
budowski
f62ec5c1b7 #634 - my observations header is jittery on Android when slow scrolling (#711) 2023-07-24 17:20:40 -07:00
budowski
6d61cec5fe #579 - font weights fixes for obs list (#703) 2023-07-24 17:05:36 -07:00
budowski
423df6c22d #591 - Android UI update for photo count in my obs list (#712) 2023-07-24 17:05:05 -07:00
Yaron Budowski
66ddf7e9c8 Revert "#591 - Android UI update for photo count in my obs list"
This reverts commit 73f4b50870.
2023-07-22 00:21:15 -06:00
Yaron Budowski
73f4b50870 #591 - Android UI update for photo count in my obs list 2023-07-22 00:16:56 -06:00
Angie Ta
6da79d4df0 ActivityItem, DetailsTab tests. TaxonImage and DisplayTaxonName withdrawn id styling. 2023-07-21 18:29:08 -07:00
Amanda Bullington
0356e05a6f Add error message alerts; closes #690 (#708) 2023-07-21 10:49:23 -07:00
Amanda Bullington
3e340b72e0 Update styling for AddObsModel; closes #700 (#707) 2023-07-20 14:56:48 -07:00
Amanda Bullington
14ae109ffd Add zoom button to camera; standardize opacity around buttons; closes #687 (#706) 2023-07-19 17:16:49 -07:00
Angie Ta
ea98b8bf65 Faves bugfix 2023-07-19 16:31:54 -07:00
Angie Ta
1a14134c6d ID Withdraw, withdraw icon added 2023-07-19 16:09:26 -07:00
Amanda Bullington
333ae489cd AR Camera UI (#705)
* Refactor camera buttons into their own components

* Standardize camera buttons & make TaxonResult a reusable component

* Fix button styling in tablet landscape; create confidence interval

* Create camera container with shared functionality for both cameras; fix tests

* Connect results & loading status from native predictions; standardize results on iOS/Android

* Fix Camera test by mocking CameraView and FrameProcessor components
2023-07-19 10:14:30 -07:00
budowski
d113325d61 #618 - fix: missing evidence when importing photo (#704) 2023-07-19 10:02:35 -07:00
Johannes Klein
5f81c49f85 ARCamera MVP: Basic screen with full screen camera and prediction labels (#684) 2023-07-15 07:53:18 +02:00
budowski
5166647b83 #629 - wait for bottom sheet to dismiss before navigating away to next screen (#698)
* #629 - wait for bottom sheet to dismiss before navigating away to next screen
* Fix accessibility test failure

---------

Co-authored-by: Ken-ichi Ueda <kenichi.ueda@gmail.com>
2023-07-14 22:41:46 -04:00
Ken-ichi Ueda
5717b84718 Minor test updates 2023-07-13 16:20:41 -07:00