Skip to content

Commit

Permalink
Squashed commits from main
Browse files Browse the repository at this point in the history 
commit 83b4da55d69e8be15f61e3fe39d7d2bd60eb9d6d
Author: Git Action Bot <git-action-bot@example.com>
Date:   Mon Sep 11 20:44:26 2023 +0000

    Bump patchVersion

commit ffe5f8c922d006a4a340c9c4c5a579ef3bed3832
Merge: b2f98ca6 08a2d784
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Mon Sep 11 16:29:46 2023 -0400

    Merge pull request #724 from PhenoApps/return_to_first_trait

    adds preference to return to first trait

commit b2f98ca6ac722edd379a1b1b2b4b11b9d309aa99
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Mon Sep 11 15:28:21 2023 -0500

    Update github-release.yml

commit 08a2d784b317ec4f08f53a921a8bf685d130b18c
Author: trife <twrife@clemson.edu>
Date:   Mon Sep 11 16:27:32 2023 -0400

    changelog

commit c46b5110e88ba55f6b68e13ca8c15b0aa241db0e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Mon Sep 11 15:26:08 2023 -0500

    Update README.md

commit 0993a3b580ad809db5dc0827f795cf651306c3ec
Author: bellerbrock <bje24@cornell.edu>
Date:   Fri Sep 8 11:11:11 2023 -0400

    remove redundant BoxView code and comment

commit 77abd20623006b9373fcf131f3d2c6301702d2b9
Author: bellerbrock <bje24@cornell.edu>
Date:   Wed Sep 6 16:47:55 2023 -0400

    adds preference to return to first trait

commit bc888da426cad6226c9ddc8c83a08e9caa360786
Author: Git Action Bot <git-action-bot@example.com>
Date:   Fri Sep 1 20:14:12 2023 +0000

    Bump patchVersion

commit 7716e27f03c996daf0380e99852b43b72c5c4327
Merge: a2680db1 5afeec8b
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Sep 1 10:59:41 2023 -0400

    Merge pull request #705 from PhenoApps/v5.5/geonav

    V5.5/geonav

commit 5afeec8bb1ae87242f642462691bbb5daece1f10
Author: trife <twrife@clemson.edu>
Date:   Fri Sep 1 10:56:56 2023 -0400

    strings and changelog

commit 9ed2390d6624770bd57073dbcf9d111755fa3814
Merge: ff10bed5 a2680db1
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Sep 1 10:51:59 2023 -0400

    Merge branch 'main' into v5.5/geonav

commit ff10bed5d2bf61d3fa9aa9714bbaae0255213bbc
Author: chaneylc <chaneylc@gmail.com>
Date:   Thu Aug 31 14:04:01 2023 -0500

    added progress bar to gnss trait when connection drops or location hasn't been received from a source yet

    updated connection check interval to 5seconds to work with default emlid settings better

    fixed geonav bug making snackbar message reappear

    added sound warning when fix requirement is not met

    significant gnss trait layout reworks to handle internal GPS sensor better

    fix bug in connect thread

    updated get location function in collect to retrieve more up to date location

commit 1d8ae1135d19e03f9810e53804770bc2c3b9d40a
Author: chaneylc <chaneylc@gmail.com>
Date:   Wed Aug 30 12:13:21 2023 -0500

    updated gnss trait to show location updates even if precision quality is not met

commit ee6e7bbcc63be393ca1607f902d862f7e60ab8f5
Author: chaneylc <chaneylc@gmail.com>
Date:   Wed Aug 30 10:31:59 2023 -0500

    aligned checkboxes with spinner arrow

commit c963effa62daf5750f8c03fab08ee5682083fd27
Author: chaneylc <chaneylc@gmail.com>
Date:   Wed Aug 30 10:30:00 2023 -0500

    fixed layout width warning

commit edcdb31e7d2a3c4630c6437abebc0c314f5b5431
Author: chaneylc <chaneylc@gmail.com>
Date:   Wed Aug 30 10:29:35 2023 -0500

    right-aligned checkboxes in geonav collect settings dialog

commit a2680db162d8d5dcecd00034215d44cb45572e77
Merge: b4f94176 364ae776
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 24 17:43:47 2023 -0400

    Merge pull request #714 from PhenoApps/schedule_release_action

    run release action once daily, only build if changes to app/ since last release

commit b4f94176ca0511084c9102e0c91dd7c7a2aaf56b
Author: Git Action Bot <git-action-bot@example.com>
Date:   Wed Aug 23 13:49:32 2023 +0000

    Bump patchVersion

commit 9b95171442caff734d97e0fc563177158fd22159
Merge: d4d6a9c0 ca106cbd
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Wed Aug 23 09:48:22 2023 -0400

    Merge pull request #711 from abatac/bms_integration_fix

    Bms integration fix

commit 364ae776d75eacd786daddb28344b06b457c4771
Author: bellerbrock <bje24@cornell.edu>
Date:   Tue Aug 22 16:09:41 2023 -0400

    require app changes for both  manual and scheduled builds

commit 68eb5d09ccba2f2f9809affb78cc19e7624aca0a
Author: chaneylc <chaneylc@gmail.com>
Date:   Mon Aug 21 17:36:44 2023 -0500

    updated connection check to skip when using internal gps

commit 238a86623b3da7f29b9fca8ce8f7c85f5ecd60ee
Author: chaneylc <chaneylc@gmail.com>
Date:   Mon Aug 21 17:29:04 2023 -0500

    moved gps tracker to collect to persist data in gnss trait layout
    disabled collect when precision does not meet threshold
    added fix to gps observations
    removed last plot id from geonav

commit 4ae8c3f3a2b7481492f33966e15a4b3932a4ea84
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Aug 21 16:14:25 2023 -0400

    clarify conditions in which to run build-and-release job

commit 97121c06ca7c875ed69d0d94926f306efbeefb90
Author: chaneylc <chaneylc@gmail.com>
Date:   Mon Aug 21 13:03:20 2023 -0500

    fix field editor navigate to closest field snack message

commit d4d6a9c03aaf85322c596b0959161d95f51a4929
Author: Git Action Bot <git-action-bot@example.com>
Date:   Mon Aug 21 10:16:52 2023 +0000

    Bump patchVersion

commit 90597b9466fe092b1eff757367561357738f99f0
Merge: a67cf49a 2b262f4d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Mon Aug 21 06:15:25 2023 -0400

    Merge pull request #707 from PhenoApps/merge_scan_tools

    Merged move to unique id tools

commit 2b262f4daa78c45b44c13f1835d4b7db0eb78a9b
Author: trife <twrife@clemson.edu>
Date:   Mon Aug 21 06:14:44 2023 -0400

    changelog

commit 525376e5ce93c6d78e43ab7ec10dc8f73523dcb5
Author: bellerbrock <bje24@cornell.edu>
Date:   Fri Aug 18 16:51:04 2023 -0400

    make release workflow once daily and dependent on app changes since last release

commit d5778339a0cb51e939a16c2025f29c0cfe99fd75
Author: bellerbrock <bje24@cornell.edu>
Date:   Wed Aug 16 15:06:07 2023 -0400

    fix changed string id

commit 743813055f361261e3d1c90047874f6a73be973c
Author: bellerbrock <bje24@cornell.edu>
Date:   Wed Aug 16 14:24:58 2023 -0400

    add back missing strings and rearrange general setting order

commit 56b45c027ef461f2ce9c1ac45718f3661024ba32
Merge: d720cbe3 a67cf49a
Author: bellerbrock <bje24@cornell.edu>
Date:   Wed Aug 16 13:50:30 2023 -0400

    merge main

commit a67cf49afb91de8ff9171876e3b75fa5141b17cf
Author: Git Action Bot <git-action-bot@example.com>
Date:   Tue Aug 15 21:19:00 2023 +0000

    Bump patchVersion

commit 37a468bf0b2cb3479a2b9ca6671ff49d53654437
Merge: c34c0e6d e9791d28
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Tue Aug 15 17:17:40 2023 -0400

    Merge pull request #710 from PhenoApps/transfer_training_sample

    transfer training_sample.csv along with other sample fields

commit e9791d286ce9646541ef6bfcfd02b722df4a638d
Author: trife <twrife@clemson.edu>
Date:   Tue Aug 15 17:16:59 2023 -0400

    update docs

commit c34c0e6dc68b73ed0a4bff5dee091f2dd9225dae
Author: Git Action Bot <git-action-bot@example.com>
Date:   Tue Aug 15 20:56:40 2023 +0000

    Bump patchVersion

commit 6324feca5ed5d9262fa98343811689c709440b7c
Merge: cbf24f8b aa918da4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Tue Aug 15 16:55:27 2023 -0400

    Merge pull request #709 from PhenoApps/bugs/678/5.5cleanup

    fix #678

commit aa918da46c55d5b7b849d57f4cd755edbda9b306
Merge: be3cfe13 cbf24f8b
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Tue Aug 15 16:54:57 2023 -0400

    Merge branch 'main' into bugs/678/5.5cleanup

commit be3cfe134fe25b827566477bb061466513263abf
Author: trife <twrife@clemson.edu>
Date:   Tue Aug 15 16:54:15 2023 -0400

    disable minify

commit 5dced80d4585b41bac7f8dc8720fd7a435590d03
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Aug 14 17:01:40 2023 -0400

    add training section to docs

commit bdfce7b8362eddd54689dac4e5f75191c6b4adf2
Author: bellerbrock <bje24@cornell.edu>
Date:   Fri Aug 11 15:54:34 2023 -0400

    alter germplasm_name header that fails to import

commit 6af857867964333228a1f9f3d46a538ae60824e8
Author: bellerbrock <bje24@cornell.edu>
Date:   Thu Aug 10 14:23:47 2023 -0400

    transfer training_sample.csv along with other sample fields

commit 976edfb7da6547d6724fd6819997e96b2946b39f
Author: chaneylc <chaneylc@gmail.com>
Date:   Thu Aug 10 11:37:25 2023 -0500

    fix #678

commit ca106cbd9275b1ace1cdcdc017446f800ede29bd
Author: Aldrin Batac <aldrin.batac@leafnode.io>
Date:   Thu Aug 10 11:25:26 2023 +0800

    Ignore case when comparing the selected observation level name with traits' observation level names.

commit 43d5d6340332d6037a882e3f910db215fd128426
Author: chaneylc <chaneylc@gmail.com>
Date:   Tue Aug 8 15:12:35 2023 -0500

    moved geonav/barcode search collect activity snackbar to top of the bottom toolbar #529

commit a20bb8072d7766f7e7a960bbc7e96820bb678c38
Author: Aldrin Batac <aldrin.batac@leafnode.io>
Date:   Tue Aug 8 11:18:41 2023 +0800

    Add null handling.

commit 0c5ac87daa1725a335bd5e77c3434ec23c3d7e52
Author: Aldrin Batac <aldrin.batac@leafnode.io>
Date:   Tue Aug 8 11:12:14 2023 +0800

    This is a BMS specific feature. During BrAPI Field Import, only the traits relevant to the selected Observation Level should be added in the app.

commit d720cbe345b9246407de293437bed875669572dd
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Aug 7 17:23:46 2023 -0400

    remove deprecated code

commit f5a03c3a84dad4a1ac82ea49ad4366fa1dc61275
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Aug 7 16:55:55 2023 -0400

    simplify value check and remove logging

commit 80e4019a9f55d7cdb75e7c183adc0bec86e104c1
Author: chaneylc <chaneylc@gmail.com>
Date:   Mon Aug 7 15:03:12 2023 -0500

    geonav changes for v5.5

commit efa779d122571a2643a72b125d7f27dd5092030f
Author: chaneylc <chaneylc@gmail.com>
Date:   Fri Aug 4 11:34:00 2023 -0500

    Added fix to observation unit geo json properties

commit 841107d28cddf3329cfc42c1a1e2d097cb25e368
Author: chaneylc <chaneylc@gmail.com>
Date:   Thu Aug 3 16:08:32 2023 -0500

    Updated GNSS trait with user-choosable required fix.

commit 3b8e4576b9cbfa0a4a53364d57138772dd7ff469
Author: chaneylc <chaneylc@gmail.com>
Date:   Thu Aug 3 11:20:49 2023 -0500

    Updated field editor location based field switch snackbar to geonav's snackbar

commit 5164bd41b6081db714b6c03324fb8c778773edc0
Author: chaneylc <chaneylc@gmail.com>
Date:   Wed Aug 2 16:32:59 2023 -0500

    Fix minor ui bug in gnss trait making user press disconnect twice.
    Added check to clear gnss ui if new coordinate is not found within 3s

commit 5ffbd443f7bbf2c2a85ecc05775550e5e698f3e0
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Aug 7 15:43:48 2023 -0400

    handle option-specific descriptions

commit af846809595fe65445b45b01d0f4278a14a5a05c
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Aug 7 14:53:46 2023 -0400

    handle merged unique id settings in collect activity

commit cbf24f8bcb7888c2e3bbae2c5eee22414bc633a9
Author: Git Action Bot <git-action-bot@example.com>
Date:   Fri Aug 4 18:11:47 2023 +0000

    Bump patchVersion

commit a7d46d276f07f19df92e44f5058e9e27d2add09f
Merge: 0affd477 9eb975cd
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 14:10:41 2023 -0400

    Merge pull request #704 from PhenoApps/l10n_main

    Localization updates

commit 9eb975cdfa92b99309a4f0eb631abc6ef9c6207e
Author: trife <twrife@clemson.edu>
Date:   Fri Aug 4 14:10:04 2023 -0400

    changelog

commit 9acd81039c6a7f4c5038faa2ef69eb7456a0675c
Author: trife <twrife@clemson.edu>
Date:   Fri Aug 4 14:08:00 2023 -0400

    add vietnamese and swedish

commit 3fba1ec88ccd3df9133b56a46c49b763f77d928e
Merge: 2a1e2adf 7287b478
Author: trife <twrife@clemson.edu>
Date:   Fri Aug 4 11:37:39 2023 -0400

    Merge remote-tracking branch 'origin/l10n_main' into l10n_main

    # Conflicts:
    #	app/src/main/res/values-am-rET/strings.xml
    #	app/src/main/res/values-ar-rSA/strings.xml
    #	app/src/main/res/values-bn-rBD/strings.xml
    #	app/src/main/res/values-de-rDE/strings.xml
    #	app/src/main/res/values-es-rMX/strings.xml
    #	app/src/main/res/values-fr-rFR/strings.xml
    #	app/src/main/res/values-hi-rIN/strings.xml
    #	app/src/main/res/values-it-rIT/strings.xml
    #	app/src/main/res/values-ja-rJP/strings.xml
    #	app/src/main/res/values-om-rET/strings.xml
    #	app/src/main/res/values-pa-rIN/strings.xml
    #	app/src/main/res/values-pt-rBR/strings.xml
    #	app/src/main/res/values-ru-rRU/strings.xml
    #	app/src/main/res/values-zh-rCN/strings.xml

commit 7287b478a0e4a666e79852f4a95495e98806c2d0
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:58 2023 -0400

    New translations strings.xml (Vietnamese)

commit 077f369c2c5275ea83871681db2cbfd3b4665256
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:57 2023 -0400

    New translations strings.xml (Swedish)

commit 9bf6e060a5b47be7ed7c4f02457042a609c5bf62
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:56 2023 -0400

    New translations strings.xml (Oromo)

commit b589c7e5c0176334e3fa047357136b92b6e8586e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:55 2023 -0400

    New translations strings.xml (Amharic)

commit 749997b56e97964be8376bfdb555d8b40999554f
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:54 2023 -0400

    New translations strings.xml (Hindi)

commit 255e96d8249a05e886d5ae4f33709a8ef134d11c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:53 2023 -0400

    New translations strings.xml (Bengali)

commit 96c1d16857a1b0f83725e3e5d3e92726308b2db1
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:52 2023 -0400

    New translations strings.xml (Spanish, Mexico)

commit f88aebb3f620f5274e1956e3296249ab7fef436e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:51 2023 -0400

    New translations strings.xml (Portuguese, Brazilian)

commit fe0e3456ec7bc19a3a11ada5e449f459841dd3c1
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:50 2023 -0400

    New translations strings.xml (Chinese Simplified)

commit 2baa5220e512fff9e7763c379de7ae0c2dacbbd4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:49 2023 -0400

    New translations strings.xml (Russian)

commit 9d2dcc76c0c02ba943d5cb5ef802ecde9d64dfb2
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:48 2023 -0400

    New translations strings.xml (Punjabi)

commit 3a7201b22b6df9b25f936399102723d176e4ad7d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:46 2023 -0400

    New translations strings.xml (Japanese)

commit 87282c827745e309f6fcc8b47162d17638f9b9df
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:46 2023 -0400

    New translations strings.xml (Italian)

commit 373042fb54d8077f0af35751925fb60aa682114a
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:45 2023 -0400

    New translations strings.xml (German)

commit 2398084b6421be3cc099f03b0f04f377870d44f5
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:43 2023 -0400

    New translations strings.xml (Arabic)

commit 7258020243020065a4c6f57b15eadaa098fb000a
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:35:42 2023 -0400

    New translations strings.xml (French)

commit 6fb239b54591b3457f1e072a881f36a95fad21e0
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:10 2023 -0400

    New translations strings.xml (Oromo)

commit 1bc3feee6d9787b6cf8a0d3c97898b61866b53e1
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:09 2023 -0400

    New translations strings.xml (Amharic)

commit fd827159116abc5ed847b9044ff4971084d2be2d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:09 2023 -0400

    New translations strings.xml (Hindi)

commit 9730aadb5ae1715cbd9ff9efd1fd1975aa0650d4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:08 2023 -0400

    New translations strings.xml (Bengali)

commit e15a77c8cfb9148a9bab9c6736fc60ab8aef733f
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:07 2023 -0400

    New translations strings.xml (Spanish, Mexico)

commit 16e24ae26bd83362783a4d5f188ea4a0948c209b
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:06 2023 -0400

    New translations strings.xml (Portuguese, Brazilian)

commit f50dbb6a886a76a43d77e49ebfc99de217ffcc28
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:04 2023 -0400

    New translations strings.xml (Chinese Simplified)

commit 0c466cc3a6584464f3adf839f8271b28984d785f
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:03 2023 -0400

    New translations strings.xml (Russian)

commit 8384cbc110cd766f0d75069962f3766a9a3f361c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:02 2023 -0400

    New translations strings.xml (Punjabi)

commit cda3d9e3077c045df6a4aa82683b18025eb09319
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:01 2023 -0400

    New translations strings.xml (Japanese)

commit 0b0d375fd5e7d64ed653c50e212d3ae165417c0f
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:07:00 2023 -0400

    New translations strings.xml (Italian)

commit c4ff57d99a61add4f0a4c9a9c80d4ad428607597
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:06:59 2023 -0400

    New translations strings.xml (German)

commit 96d323c168e921ea50e35d46cca993472a2d0341
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:06:58 2023 -0400

    New translations strings.xml (Arabic)

commit 5223b2a4c1870a59475cbaaa2c89f4ef2514f07d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:06:57 2023 -0400

    New translations strings.xml (French)

commit 2b9d47c2aa0097170aa3c7d69c7bebfc5900ad25
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:28 2023 -0400

    New translations strings.xml (Oromo)

commit 636a524c8eeefa024010dbafecb8f2723500063e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:27 2023 -0400

    New translations strings.xml (Amharic)

commit c029c5eac42b40f3b0e005010b6768fed69f85b4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:26 2023 -0400

    New translations strings.xml (Hindi)

commit 5f80e3e3d057c2bb3d08026c5d36371bf5726234
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:25 2023 -0400

    New translations strings.xml (Bengali)

commit 9226760ee2d53f13d8f2dee8f4bfb4f91a62dc17
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:25 2023 -0400

    New translations strings.xml (Spanish, Mexico)

commit 4d2f47ab9deaf9522764adbd1b44cb0b8f1e1532
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:24 2023 -0400

    New translations strings.xml (Portuguese, Brazilian)

commit 27cc33a51218d76550e536156bee25c4bca9b902
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:23 2023 -0400

    New translations strings.xml (Chinese Simplified)

commit 844243d251f2ed8993d9d968577396bdb099545d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:22 2023 -0400

    New translations strings.xml (Russian)

commit 938380cc48aedf6941f0b5ef0477c00a21c62c68
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:22 2023 -0400

    New translations strings.xml (Punjabi)

commit 7eb1240897e887472cb064297dd28b76f2ef81e4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:21 2023 -0400

    New translations strings.xml (Japanese)

commit 31a635d218b27e08e7ef13584d56539cda95ff60
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:20 2023 -0400

    New translations strings.xml (Italian)

commit 83833062c6910964ea232fe86c0c7ae7c878e9cb
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:19 2023 -0400

    New translations strings.xml (German)

commit b2dfc58e2d5533d26cd445795802cf809b0ae8b2
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:19 2023 -0400

    New translations strings.xml (Arabic)

commit 3b2290b2e2231eac27d6d9b5c173e83f32c81d10
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 11:05:18 2023 -0400

    New translations strings.xml (French)

commit 0affd4778348de669a795b274e692e629c360d2f
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 10:57:34 2023 -0400

    Update Crowdin configuration file

commit 4d9c928072dc150e7866551d0a2c1e16b7eb5c09
Author: Git Action Bot <git-action-bot@example.com>
Date:   Fri Aug 4 14:56:37 2023 +0000

    Bump patchVersion

commit 1301ae4ca56cd56a921b50fad67fdf4ed7f11f20
Merge: 7781a494 10d37735
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 10:55:54 2023 -0400

    Merge pull request #702 from PhenoApps/string-and-minify-fixes

    strings and minify

commit 10d377352b349ac25320cf8ea9f7a15acb67ae6a
Author: trife <twrife@clemson.edu>
Date:   Fri Aug 4 10:54:07 2023 -0400

    strings and minify

commit 7781a4943962b86fa874fb66a2ef2defcab29a01
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Fri Aug 4 10:19:10 2023 -0400

    Update Crowdin configuration file

commit 2a1e2adfbac658dd16fffd334a47aa7e04941c80
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:35:04 2023 -0400

    New translations strings_tutorial.xml (Oromo)

commit 66a5c14e28f4915e9029fb9230824b12a3a0aef2
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:35:04 2023 -0400

    New translations strings_tutorial.xml (Amharic)

commit 16ab41c4767d38c5e8a79afbcfd3c4bef30de48c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:35:03 2023 -0400

    New translations strings_tutorial.xml (Hindi)

commit ed07c28ff856f494651dfc261b24b40636e57f15
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:35:02 2023 -0400

    New translations strings_tutorial.xml (Bengali)

commit 3584e042da1e9f618df26e1cc20818198badac6d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:35:02 2023 -0400

    New translations strings_tutorial.xml (Spanish, Mexico)

commit 5f3fbb8f99d6b10a36b73f8caf13dc8467ff2bbf
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:35:01 2023 -0400

    New translations strings_tutorial.xml (Portuguese, Brazilian)

commit 7a896434e85268c13f46ed5891e8e8e0b1e2d0cc
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:35:00 2023 -0400

    New translations strings_tutorial.xml (Chinese Simplified)

commit d3b79c2f449261d85f25bfb35a3e45fcf5ba140f
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:35:00 2023 -0400

    New translations strings_tutorial.xml (Russian)

commit f6af184e91973b287f528c6e0d283d12b4aa5d16
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:59 2023 -0400

    New translations strings_tutorial.xml (Punjabi)

commit a3e30a3142ffca6fcac32db698e1e1790a5beed6
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:59 2023 -0400

    New translations strings_tutorial.xml (Japanese)

commit 0427e42b10c80876aded60e4a0b7e1ae54e15aae
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:58 2023 -0400

    New translations strings_tutorial.xml (Italian)

commit 0744eb69a219ea7412acd0aaf2a2016eed210d09
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:57 2023 -0400

    New translations strings_tutorial.xml (German)

commit a28984143a6e4f70eea6e7f2491df8eadd66399e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:56 2023 -0400

    New translations strings_tutorial.xml (Arabic)

commit 3f3a74ed082c0ffa40d19cd5401898d0c8f01466
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:56 2023 -0400

    New translations strings_tutorial.xml (French)

commit 538496ea82dbfff04b7b3a54b4c8bc70bfcd9e74
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:55 2023 -0400

    New translations strings_traits.xml (Oromo)

commit 5207caed1447ed29224b910cdbf04240789d2035
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:54 2023 -0400

    New translations strings_traits.xml (Amharic)

commit 6816c25018f5c7dcaba9c88984c546306d95bd53
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:54 2023 -0400

    New translations strings_traits.xml (Hindi)

commit 626839bf6c24f6f8c39becc95c208e27d6625e63
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:53 2023 -0400

    New translations strings_traits.xml (Bengali)

commit b986ff80e173ffcc0c58670f9af884e7ed44ecbb
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:52 2023 -0400

    New translations strings_traits.xml (Spanish, Mexico)

commit 5a91f620a6f0cda4ca04219e1cb9fd9026dce0ea
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:52 2023 -0400

    New translations strings_traits.xml (Portuguese, Brazilian)

commit 6790ef9c356b01c1bd8f795b92b717ae231265c4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:51 2023 -0400

    New translations strings_traits.xml (Chinese Simplified)

commit 5d1b94ea3e7807b5df9e947f65cd4e7b51ef70c7
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:51 2023 -0400

    New translations strings_traits.xml (Russian)

commit f29bd86e68d23e3d0f5a13af6bca61492e6db9b3
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:50 2023 -0400

    New translations strings_traits.xml (Punjabi)

commit 15b778561b18ce638dc50ac601b035d5ab455212
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:49 2023 -0400

    New translations strings_traits.xml (Japanese)

commit ae85f0ea634cc10d16bbe03dff613fe562cd0b30
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:48 2023 -0400

    New translations strings_traits.xml (Italian)

commit a1ffc0e59906ee7de6a4d8599e9f6b5b3db025f5
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:48 2023 -0400

    New translations strings_traits.xml (German)

commit 0c0f633dbad6c94179aecedeb658ed614c0b9534
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:47 2023 -0400

    New translations strings_traits.xml (Arabic)

commit 575afd24a2dc6e6a04bac94afe80b2b2d333479e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:47 2023 -0400

    New translations strings_traits.xml (French)

commit 907bcd26b2fb7edd81ef32723869b0a7530a59ca
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:46 2023 -0400

    New translations strings_settings.xml (Oromo)

commit 81b60d33bfe17850614630b55e5d7a6cc37073c7
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:46 2023 -0400

    New translations strings_settings.xml (Amharic)

commit 51a02674b1acaa1c4b67713aee13ecfd893640bd
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:45 2023 -0400

    New translations strings_settings.xml (Hindi)

commit ae754d53c1330ffc8bbc36d93009e786926a73d4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:44 2023 -0400

    New translations strings_settings.xml (Bengali)

commit a04dee52d115cdeeeae8a588b1b141ff0ac11e8c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:44 2023 -0400

    New translations strings_settings.xml (Spanish, Mexico)

commit c473da2c58463d2541ef8c0c69f444e6a177e0bf
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:43 2023 -0400

    New translations strings_settings.xml (Portuguese, Brazilian)

commit 3db1c44edf845d136b93c86843de58edf77ba75d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:43 2023 -0400

    New translations strings_settings.xml (Chinese Simplified)

commit 6ddac7e3e28b17577d2ff6f6f0cf71894b081c79
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:42 2023 -0400

    New translations strings_settings.xml (Russian)

commit a375a8aaf953f2f02d044977bee79f2a80ff8097
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:42 2023 -0400

    New translations strings_settings.xml (Punjabi)

commit c8142bc641d56e619cf53c69bda26bffda41db51
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:41 2023 -0400

    New translations strings_settings.xml (Japanese)

commit 34cbaaa2c8ba5e96468f8680dd7c0b7948ba08df
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:40 2023 -0400

    New translations strings_settings.xml (Italian)

commit efb9b9bcabe80639c2ccc24ba4589186d907627d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:40 2023 -0400

    New translations strings_settings.xml (German)

commit c42ffe7cdd7f25dae67581cb5d350b85504d959b
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:39 2023 -0400

    New translations strings_settings.xml (Arabic)

commit 3c55e6a4224cdb26845ebc3c671eddd37d78795c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:38 2023 -0400

    New translations strings_settings.xml (French)

commit 5268609ac34e614aa075e94493dc14d76ea2be6c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:38 2023 -0400

    New translations strings_fields.xml (Oromo)

commit 09a5e2a4093a55ea2cb83d4c35754badb65a5979
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:37 2023 -0400

    New translations strings_fields.xml (Amharic)

commit 4ca0eb23a327bc35e5cbf9fd9ad099bc2d569eb2
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:36 2023 -0400

    New translations strings_fields.xml (Hindi)

commit 8247c85b19fe2a0d8af23538862b83ec80e14d6d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:36 2023 -0400

    New translations strings_fields.xml (Bengali)

commit 3787d4977d65679b362ce0b5799daf13af4f429c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:35 2023 -0400

    New translations strings_fields.xml (Spanish, Mexico)

commit 6905e6841aaa915b10ee3a36ee0c9b8a6e055773
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:34 2023 -0400

    New translations strings_fields.xml (Portuguese, Brazilian)

commit a2d8eee0324489c44300056512743c576c1a0ba0
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:34 2023 -0400

    New translations strings_fields.xml (Chinese Simplified)

commit 9d6356c10943871a98be3e2ee09d8585c5525045
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:33 2023 -0400

    New translations strings_fields.xml (Russian)

commit 5dfd1aa939c49c6b686fd987ed8a291243b93d0e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:33 2023 -0400

    New translations strings_fields.xml (Punjabi)

commit 435614a06e03d3e7ad05a80be613717d69019940
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:32 2023 -0400

    New translations strings_fields.xml (Japanese)

commit 6994e8b8a2b285db25b0740b793e0617ea98f0f6
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:32 2023 -0400

    New translations strings_fields.xml (Italian)

commit 0e908c19e6b3ba8c19af5be3e9d4e3245bd740d2
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:31 2023 -0400

    New translations strings_fields.xml (German)

commit 711b3bb9149d74dc2b5d52e577637971ff0cfc3c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:31 2023 -0400

    New translations strings_fields.xml (Arabic)

commit c74146e52d1fb86030ef9fd280b75ca2f737a6d5
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:30 2023 -0400

    New translations strings_fields.xml (French)

commit 16bfcb3c489312ccd98288b8573060f62ee887ac
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:29 2023 -0400

    New translations strings_export.xml (Oromo)

commit 0eebda3ad62928f1a42de25841b667a9200919de
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:29 2023 -0400

    New translations strings_export.xml (Amharic)

commit d258ec7b5b11069d323abfc57297999626406230
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:28 2023 -0400

    New translations strings_export.xml (Hindi)

commit 1493cd588856b5cd838ff0939802f27a8f18de33
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:28 2023 -0400

    New translations strings_export.xml (Bengali)

commit 2a5916f690da270dc313a46a2a488a36d1ef91d2
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:27 2023 -0400

    New translations strings_export.xml (Spanish, Mexico)

commit c29a25b3c6c5f6100c11356de498a8f46afd01ef
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:26 2023 -0400

    New translations strings_export.xml (Portuguese, Brazilian)

commit 9022eca178661c9031cf93d5a781b65f396db192
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:26 2023 -0400

    New translations strings_export.xml (Chinese Simplified)

commit 967a16774d4a51cd928130339d0cc33ea14575b1
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:25 2023 -0400

    New translations strings_export.xml (Russian)

commit 6eef10ec7560e64adb68defa13f6be3f0ab03fe8
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:24 2023 -0400

    New translations strings_export.xml (Punjabi)

commit 087691becf1e77bd5d36d441659f53316ff88cb4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:24 2023 -0400

    New translations strings_export.xml (Japanese)

commit 2341cd65ec2add17a671679cee540f289df376a1
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:23 2023 -0400

    New translations strings_export.xml (Italian)

commit dd125ffb2727765c47456d56bec132b3d2855e8d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:23 2023 -0400

    New translations strings_export.xml (German)

commit 125542612066083a58aa9302b75d2ab57db1c6a0
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:22 2023 -0400

    New translations strings_export.xml (Arabic)

commit 78d7c7bd75baf29d3afa03447a9c7664cf1b1ab5
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:21 2023 -0400

    New translations strings_export.xml (French)

commit 93c818a9edbefe6bd70045b723f840007624065d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:21 2023 -0400

    New translations strings_collect.xml (Oromo)

commit c4d3a5cd678f0000ee91217c7dccd28975378942
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:20 2023 -0400

    New translations strings_collect.xml (Amharic)

commit 546cea608db1fb80a9865ddcbbcaff3e725f1adc
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:20 2023 -0400

    New translations strings_collect.xml (Hindi)

commit e3837e845e243422dfb13ec6a2576d92a10f7b72
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:19 2023 -0400

    New translations strings_collect.xml (Bengali)

commit dc5e9907eef66980f16bd619a3de22742ffbb166
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:18 2023 -0400

    New translations strings_collect.xml (Spanish, Mexico)

commit 6813baaa11409bc5f7f39d51adf325a41c4801cf
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:18 2023 -0400

    New translations strings_collect.xml (Portuguese, Brazilian)

commit 9a0866beea4a66f0544ec83b74a6e65b5271734c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:17 2023 -0400

    New translations strings_collect.xml (Chinese Simplified)

commit c2b542a3b17e8a7f11b1eb5813ba9426fc6b9ea5
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:17 2023 -0400

    New translations strings_collect.xml (Russian)

commit 36b90fac4caccce608cd266b5d529acfc609dfa9
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:16 2023 -0400

    New translations strings_collect.xml (Punjabi)

commit f9b059e25869aab1d1b559f41b684e7fbe99c4fe
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:16 2023 -0400

    New translations strings_collect.xml (Japanese)

commit 7ab3c89d4831e2a008f464a386137b0a62687a1d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:15 2023 -0400

    New translations strings_collect.xml (Italian)

commit 64fa9dd13d39949d824db0e027b293a2f16677c5
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:14 2023 -0400

    New translations strings_collect.xml (German)

commit 558956e1e675d1d82c7dabf23715ff95c2ddd46d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:14 2023 -0400

    New translations strings_collect.xml (Arabic)

commit 6e4d1bc465f11fb2098b317b07a36bba0ea7e9f2
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:13 2023 -0400

    New translations strings_collect.xml (French)

commit 1166592a2069f9df5604e5b30e40e99f26cf0990
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:11 2023 -0400

    New translations strings_brapi.xml (Oromo)

commit 6b12e0d574a28b26c8a777db594338b09fadee06
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:10 2023 -0400

    New translations strings_brapi.xml (Amharic)

commit b42feafe178f82dd661f55279067f89f22474fe2
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:10 2023 -0400

    New translations strings_brapi.xml (Hindi)

commit 2c376fa46552e9aea0e8c351f384c9543aad9435
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:09 2023 -0400

    New translations strings_brapi.xml (Bengali)

commit e1371175283d6f0df9c9c0945574da6779648c9d
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:08 2023 -0400

    New translations strings_brapi.xml (Spanish, Mexico)

commit 7b207932eeef6150b0ef25ce1ce668fa51484210
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:08 2023 -0400

    New translations strings_brapi.xml (Portuguese, Brazilian)

commit 91f4bdb923daa346c4438b4cee07daf460850a49
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:07 2023 -0400

    New translations strings_brapi.xml (Chinese Simplified)

commit 0d1b8c6c34bbc547e66bdafd9f5d776ef7585087
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:06 2023 -0400

    New translations strings_brapi.xml (Russian)

commit eeae540078e05594ec1caafbc7ab1386ea8b4d7b
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:06 2023 -0400

    New translations strings_brapi.xml (Punjabi)

commit 8e0e17b2d4a3966d9e6d172ab690a67b0392499a
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:05 2023 -0400

    New translations strings_brapi.xml (Japanese)

commit cb4d182edd55d31d235c3b2d36e3f5dbe85b2225
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:05 2023 -0400

    New translations strings_brapi.xml (Italian)

commit 0d4607a53b7c922e8f239687e36b553c9380f3c1
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:04 2023 -0400

    New translations strings_brapi.xml (German)

commit d1b1d9ab5aa72ca055c243d05d9c1a1fd10e2ce4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:04 2023 -0400

    New translations strings_brapi.xml (Arabic)

commit c8c95df57e01d89dda6c96869d4df4b6acb7e924
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:03 2023 -0400

    New translations strings_brapi.xml (French)

commit a3633df0590e9ff6a94c82872c6136a9374c8c3e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:02 2023 -0400

    New translations strings_about.xml (Oromo)

commit c0a005e9be2132073d4f9f68511a2018b4806bc6
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:02 2023 -0400

    New translations strings_about.xml (Amharic)

commit 3c7326dc8982d30841c2b4869cb70f09ab7373ed
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:01 2023 -0400

    New translations strings_about.xml (Hindi)

commit 506c6a3bf8edd523546c076f1e48adb9b86ed9f8
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:00 2023 -0400

    New translations strings_about.xml (Bengali)

commit 8a8d5304e536c6955520e9c8febdc5fa1b969cc1
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:34:00 2023 -0400

    New translations strings_about.xml (Spanish, Mexico)

commit 4f78053d566060040b9c73f53162f3ff448ab4c9
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:59 2023 -0400

    New translations strings_about.xml (Portuguese, Brazilian)

commit b91125b80136ffdeb36d7ef87b2b93d6125a7ccc
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:58 2023 -0400

    New translations strings_about.xml (Chinese Simplified)

commit 214db4907a5d254dec7dad8b11adb37ad06178df
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:58 2023 -0400

    New translations strings_about.xml (Russian)

commit 8cebfb399676f8d7b66d14e500aa3bf3391f00be
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:57 2023 -0400

    New translations strings_about.xml (Punjabi)

commit 85c8d2e20edb05d546aa464431590032b31c26a4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:57 2023 -0400

    New translations strings_about.xml (Japanese)

commit 1fc9fdca5aef7576fb569f6cd4aaedb7b6d9365e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:56 2023 -0400

    New translations strings_about.xml (Italian)

commit 505ba4fd0611c57964f24eb7168f5157f86bc2ab
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:56 2023 -0400

    New translations strings_about.xml (German)

commit 4ccdd84f28909441974db510cba0be06a7c74726
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:55 2023 -0400

    New translations strings_about.xml (Arabic)

commit 6d05f312f0bff1e8afe8c86a23211ebc39782e38
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:54 2023 -0400

    New translations strings_about.xml (French)

commit e083c23dee6bb74b57ee53328085e172bb10873a
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:54 2023 -0400

    New translations strings.xml (Oromo)

commit a761dafbc601c4b203912570fdf2ddf4155ccc53
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:53 2023 -0400

    New translations strings.xml (Amharic)

commit 7a68b20065720c6ab1e3e7cb46af9874232e51cc
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:52 2023 -0400

    New translations strings.xml (Hindi)

commit e219bc1f024920456e46855c80027a10cf749227
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:51 2023 -0400

    New translations strings.xml (Bengali)

commit 0c758e94eb359e4c7b5cfb273832ec6ac9223aed
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:50 2023 -0400

    New translations strings.xml (Spanish, Mexico)

commit d5b727628752539b68c628745eb5ccf31e84beb1
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:50 2023 -0400

    New translations strings.xml (Portuguese, Brazilian)

commit ecbbb5c809d68b4dea05a20b58632bc15a81597a
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:49 2023 -0400

    New translations strings.xml (Chinese Simplified)

commit 31267896ed3e7935aa975dce2d2ec6a4160f5161
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:48 2023 -0400

    New translations strings.xml (Russian)

commit 450ce47afffb0e8411d551dc0bb141a899191384
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:48 2023 -0400

    New translations strings.xml (Punjabi)

commit f85e3f0b09d43bf1132c83f334863b613479252c
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:47 2023 -0400

    New translations strings.xml (Japanese)

commit 22b8335ee0d3bc180ac4be9657eb6baa1fdd8c8e
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:46 2023 -0400

    New translations strings.xml (Italian)

commit ab36cfba36e6636289991bd61d634a89fe766323
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:45 2023 -0400

    New translations strings.xml (German)

commit 36e592ad2063fffff17e5dcf20c96fc55fe3ba84
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:45 2023 -0400

    New translations strings.xml (Arabic)

commit a39029f8b57114793784e16008b94acad0ad0d18
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:33:44 2023 -0400

    New translations strings.xml (French)

commit eb15c2d728a3159d0b91d1416a8b51497ca4aea5
Author: Git Action Bot <git-action-bot@example.com>
Date:   Thu Aug 3 22:15:45 2023 +0000

    Bump patchVersion

commit 21309d37a5db119353eeea2569c0de1b665437c6
Merge: 90e1e6fd 2269f0a4
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:15:43 2023 -0400

    Merge pull request #697 from PhenoApps/remove_db_duplicate

    remove duplicate yellow category from sample db

commit 90e1e6fdc254d1cbbd1b9cbeeb4fba555c2b55b1
Merge: 1318a454 7a478c24
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:14:28 2023 -0400

    Merge pull request #692 from PhenoApps/5.5cleanup

     Assorted string and setting updates

commit 7a478c24e5adc9ba20ba46894444a0497dfea436
Merge: f590fdae 1318a454
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 18:13:12 2023 -0400

    Merge branch 'main' into 5.5cleanup

commit f590fdae8edeac3be48b2239fe47c04bfb236be1
Author: trife <twrife@clemson.edu>
Date:   Thu Aug 3 18:10:17 2023 -0400

    localization updates

commit 335c399caaad47c1ecb4cc164df02b86f5d8e58f
Author: trife <twrife@clemson.edu>
Date:   Thu Aug 3 17:51:48 2023 -0400

    string updates

commit 9b27f7e18dbfc6ad06e16886c5973384551d45cd
Author: bellerbrock <bje24@cornell.edu>
Date:   Thu Aug 3 16:56:58 2023 -0400

    merge scan preferences ui

commit 99ce473bdad446e0c2df78ec7d3f42a427152c4f
Author: chaneylc <chaneylc@gmail.com>
Date:   Thu Aug 3 15:07:36 2023 -0500

    Added precision threshold to GeoNav.

commit 6462acceef9435c870544d54db143452163d4a50
Author: trife <twrife@clemson.edu>
Date:   Thu Aug 3 14:17:27 2023 -0400

    fix directory icon

commit 1ba8da80e7e2c188ea2db088152351067da476d8
Author: trife <twrife@clemson.edu>
Date:   Thu Aug 3 14:08:07 2023 -0400

    AboutActivity updates

commit 2269f0a49c6abcb2ffe77cbfb028c061205b4bff
Author: bellerbrock <bje24@cornell.edu>
Date:   Thu Aug 3 14:06:52 2023 -0400

    remove duplicate yellow category from sample db

commit 6536644052307b68130691503e579fac96f71c0d
Merge: 237b1e3d cffaf4e7
Author: trife <twrife@clemson.edu>
Date:   Thu Aug 3 14:06:41 2023 -0400

    Merge remote-tracking branch 'origin/5.5cleanup' into 5.5cleanup

    # Conflicts:
    #	app/src/main/java/com/fieldbook/tracker/activities/AboutActivity.java
    #	app/src/main/res/values/strings.xml

commit 1318a4546c3cc942270ddff62f652c5510211c95
Author: Git Action Bot <git-action-bot@example.com>
Date:   Thu Aug 3 18:02:03 2023 +0000

    Bump patchVersion

commit 10a32b2bbaf331222dedb8b5e07b93c1a5787519
Merge: 6820abd3 d029ea64
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 14:00:33 2023 -0400

    Merge pull request #696 from PhenoApps/persist_search_columns

    Search option selections saved for subsequent searches

commit d029ea641735aee0b81f3cea2fa9df5060fb56e2
Author: trife <twrife@clemson.edu>
Date:   Thu Aug 3 14:00:03 2023 -0400

    changelog

commit 83efbfb722a9998fb4a977fb14a3dd7e9f896dd9
Author: chaneylc <chaneylc@gmail.com>
Date:   Wed Aug 2 12:56:55 2023 -0500

    Replaced GeoNav Toggle with Dialog #690

commit 6820abd305e40c915fc462d742eca171e059360a
Author: Git Action Bot <git-action-bot@example.com>
Date:   Thu Aug 3 17:56:36 2023 +0000

    Bump patchVersion

commit 98c3e3b48ddf7e0c97b7cd8bce672b9484266ece
Merge: a3bee6f9 57c709a7
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 13:55:17 2023 -0400

    Merge pull request #694 from PhenoApps/trait_category_fix

    autosave final trait category during new trait creation

commit a3bee6f9dfe141ab2fd97592774838653cd8fb89
Author: Git Action Bot <git-action-bot@example.com>
Date:   Thu Aug 3 17:50:39 2023 +0000

    Bump patchVersion

commit 02d260d14fb5183d34ee7b0a095a88d92392611d
Merge: 5e53f6a8 07947e4f
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Thu Aug 3 13:49:15 2023 -0400

    Merge pull request #688 from PhenoApps/fix_tutorial_crashes

    Fix for tutorial crashes

commit 312f71f0f4929970ea69bcc2df2c21f64e1e0a5e
Author: bellerbrock <bje24@cornell.edu>
Date:   Wed Aug 2 17:11:03 2023 -0400

    load defaults when search rows added, save selected as default on search

commit 2afa014ff0181aa4c6e7e82bd9e40b54cd2f358b
Author: bellerbrock <bje24@cornell.edu>
Date:   Wed Aug 2 17:09:56 2023 -0400

    add shared prefs for search defaults

commit c89612c39a0a81291a1fbe9b7965a3c7954d29c9
Author: chaneylc <chaneylc@gmail.com>
Date:   Wed Aug 2 13:26:43 2023 -0500

    Added simple fix quality to geonav log

commit 57c709a74bae07aff094546d00cb52d0ff9619e8
Author: bellerbrock <bje24@cornell.edu>
Date:   Tue Aug 1 13:54:20 2023 -0400

    save final entered category if exists

commit cffaf4e724f43e858c051d9d9b2a4bc6bf008c77
Author: bellerbrock <bje24@cornell.edu>
Date:   Tue Aug 1 13:26:27 2023 -0400

    change summary view to word wrap long text values

commit 5e53f6a8734d4c06e712cdba10c9dc70cfb654d3
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Tue Aug 1 09:23:24 2023 -0500

    Update pr-prerelease.yml

commit 7451417f1263d7592feb8909e83e6fde6e1fef38
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Jul 31 15:40:21 2023 -0400

    simplify trait name to name

commit c5e14c5f8ac9a017e4e5f43d2406a89516be81d3
Merge: 8496e055 57282bb9
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Jul 31 12:16:14 2023 -0400

    Merge branch 'main' into 5.5cleanup

commit 8496e055abc31783f539f64aab9c7007867bedb1
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Jul 31 11:43:16 2023 -0400

    make brapi v2 default version

commit f24c2157eddf9463b310d5a5c9f54f232acc31e3
Author: bellerbrock <bje24@cornell.edu>
Date:   Mon Jul 31 11:39:10 2023 -0400

    clarify trait name field in create trait dialog

commit 237b1e3dd9ce5ba1e864997fbc83cc7a41b34715
Author: trife <twrife@clemson.edu>
Date:   Sat Jul 29 02:50:54 2023 -0400

    change brapi to v2 default

commit ddb2c288f43c9e6431aa72eb94f03be4669633d4
Merge: b73d2420 4b56b11a
Author: trife <twrife@clemson.edu>
Date:   Sat Jul 29 02:49:23 2023 -0400

    Merge remote-tracking branch 'origin/5.5cleanup' into 5.5cleanup

commit 4b56b11a3984d14921d708853d0be211e2578ef3
Author: chaneylc <chaneylc@gmail.com>
Date:   Fri Jul 28 14:45:12 2023 -0500

    added zoom/autofocus features to usb camera trait

commit 07947e4f9bca949c62ac7321a25453a811eab720
Author: bellerbrock <bje24@cornell.edu>
Date:   Fri Jul 28 15:08:50 2023 -0400

    fix high contrast theme collect nav arrow colors

commit fa22d1817bd7918b9d3fc1c66f23e82f4553fa40
Author: bellerbrock <bje24@cornell.edu>
Date:   Fri Jul 28 14:03:05 2023 -0400

    simplify taptargetutil usage and fix high contract collect tutorial colors

commit 0e9cde4f79f8ac15d6f783e948d3f264a4242d95
Author: bellerbrock <bje24@cornell.edu>
Date:   Fri Jul 28 11:55:50 2023 -0400

    update tutorial string to be color theme independent

commit 8c0ddc421e769bfe425a219f12468345cca49b23
Author: bellerbrock <bje24@cornell.edu>
Date:   Fri Jul 28 11:54:40 2023 -0400

    update CollectActivity taptargetviews to use themed colors

commit 0589d06804b952570896d83a0fab803bac34c2ce
Author: bellerbrock <bje24@cornell.edu>
Date:   Fri Jul 28 11:53:07 2023 -0400

    update TapTargetUtil to fix outercirclecolor resolution

commit b73d24209656e8b572b5f2741a37e85705152da5
Author: trife <twrife@clemson.edu>
Date:   Thu Jul 27 07:33:11 2023 -0400

    string updates

commit 2555b168290ec847727e60fe91fe9fd9c6b4f0c1
Author: chaneylc <chaneylc@gmail.com>
Date:   Wed Jul 26 12:22:08 2023 -0500

    fix read external storage permissions for api > 28

commit 8f4717ddb05c3de45e43e4d4430e6c2a71097091
Author: trife <twrife@clemson.edu>
Date:   Wed Jul 26 07:02:30 2023 -0400

    general updates to AboutActivity

commit acb866099cdd96a1b6019f247944f08d12b15bf4
Author: trife <twrife@clemson.edu>
Date:   Wed Jul 26 06:26:32 2023 -0400

    remove links to inventory and verify

commit f89b3698957351dd90224d2d1133c6c3f90f0080
Author: trife <twrife@clemson.edu>
Date:   Wed Jul 26 06:24:47 2023 -0400

    remove buildnumber from version name

commit b035ac2f20dac8d4c402f9bcd30bbea28d91c404
Merge: 55c843d4 0f25543a
Author: Trevor Rife <trife@users.noreply.github.com>
Date:   Wed Jul 26 04:15:39 2023 -0400

    Merge pull request #687 from PhenoApps/main

    update to main
  • Loading branch information
@kamathprasad9
kamathprasad9 committed Sep 12, 2023
1 parent 1182ac8 commit f360795
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 11 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/github-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@ jobs:
${{ steps.matching_release.outputs.body }}
${{ env.COMMIT_MSG }}
# - name: Release APK to Play Store
# uses: r0adkll/upload-google-play@v1
# with:
# serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
# packageName: com.fieldbook.tracker
# releaseFiles: app/build/outputs/apk/release/app-release-unsigned-signed.apk
# track: alpha
- name: Release APK to Play Store
uses: r0adkll/upload-google-play@v1
with:
serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
packageName: com.fieldbook.tracker
releaseFiles: app/build/outputs/apk/release/app-release-unsigned-signed.apk
track: alpha
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Check the [user manual](https://docs.fieldbook.phenoapps.org/en/latest/field-boo
Visit our [translation page](https://crowdin.com/project/field-book) to help translate Field Book to your language. To submit code or new features, please review our [contribution guidelines](https://github.com/PhenoApps/Field-Book/wiki/Contributing) before opening a [pull request](https://github.com/PhenoApps/Field-Book/pulls).

## ⬇️ Updates
Field Book regularly receives new updates to improve performance or add new features. To ensure these changes don't interfere with most field seasons, we do not update the [Google Play version](https://play.google.com/store/apps/details?id=com.fieldbook.tracker) of the app between May 1 and September 1. An up-to-date version can be downloaded from the `About` section within the app or through our [GitHub releases](https://github.com/PhenoApps/Field-Book/releases/latest).
Field Book regularly receives new updates to improve performance or add new features. To ensure these changes don't interfere with most field seasons, we do not update the [Google Play version](https://play.google.com/store/apps/details?id=com.fieldbook.tracker) of the app between April 15 and September 15. An up-to-date version can be downloaded from the `About` section within the app or through our [GitHub releases](https://github.com/PhenoApps/Field-Book/releases/latest).

## 💰 Funding
Development of Field Book is possible because of the support received from the following organizations:
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1989,6 +1989,10 @@ public boolean isCyclingTraitsAdvances() {
return ep.getBoolean(GeneralKeys.CYCLING_TRAITS_ADVANCES, false);
}

public boolean isReturnFirstTrait() {
return ep.getBoolean(GeneralKeys.RETURN_FIRST_TRAIT, false);
}

/**
* Inserts a user observation whenever a label is printed.
* See ResultReceiver onReceiveResult in LabelPrintLayout
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/fieldbook/tracker/dialogs/GeoNavCollectDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.content.Context
import android.util.Log
import android.view.LayoutInflater
import android.widget.ArrayAdapter
import android.view.LayoutInflater
import android.widget.CheckBox
import android.widget.Spinner
import androidx.appcompat.app.AlertDialog
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/fieldbook/tracker/interfaces/CollectRangeController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ interface CollectRangeController: CollectController {
fun cancelAndFinish()
fun callFinish()
fun refreshMain()
fun isReturnFirstTrait(): Boolean
fun getNonExistingTraits(plotIndex: Int): List<Int>
fun existsAllTraits(traitIndex: Int, plotIndex: Int): Int
fun existsTrait(plotIndex: Int): Boolean
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/fieldbook/tracker/preferences/GeneralKeys.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class GeneralKeys {
public static final String RETURN_CHARACTER = "RETURN_CHARACTER";
public static final String VOLUME_NAVIGATION = "VOLUME_NAVIGATION";
public static final String CYCLING_TRAITS_ADVANCES = "CycleTraits";
public static final String RETURN_FIRST_TRAIT = "ReturnFirst";
public static final String DISABLE_ENTRY_ARROW_NO_DATA = "DISABLE_ENTRY_ARROW_NO_DATA";

// General
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/com/fieldbook/tracker/views/RangeBoxView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@ class RangeBoxView : ConstraintLayout {
}

fun moveEntryRight() {
val traitBox = controller.getTraitBox()
if (!controller.validateData()) {
return
}
Expand All @@ -561,11 +562,15 @@ class RangeBoxView : ConstraintLayout {
}
val entryArrow =
controller.getPreferences().getString(GeneralKeys.DISABLE_ENTRY_ARROW_NO_DATA, "0")
if ((entryArrow == "2" || entryArrow == "3") && !controller.getTraitBox().existsTrait()) {
if ((entryArrow == "2" || entryArrow == "3") && !traitBox.existsTrait()) {
controller.getSoundHelper().playError()
} else {
if (rangeID.isNotEmpty()) {
//index.setEnabled(true);
// In addtion to advancing the entry, return to the first trait in the trait order if the preference is enabled
if (controller.isReturnFirstTrait()) {
traitBox.returnFirst()
}
paging = incrementPaging(paging)
controller.refreshMain()
}
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/com/fieldbook/tracker/views/TraitBoxView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,14 @@ class TraitBoxView : ConstraintLayout {
controller.getCollectInputView().resetInitialIndex()
}

fun returnFirst() {
if (controller.getPreferences().getBoolean(GeneralKeys.CYCLE_TRAITS_SOUND, false)) {
controller.getSoundHelper().playCycle()
}
traitType.setSelection(0)
controller.getCollectInputView().resetInitialIndex()
}

fun update(parent: String?, value: String) {
if (newTraits.containsKey(parent!!)) {
newTraits.remove(parent)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/drawable/ic_adv_return_first_trait.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!-- drawable/ray_start_arrow.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M23,12L19,16V13H6.83C6.42,14.17 5.31,15 4,15A3,3 0 0,1 1,12A3,3 0 0,1 4,9C5.31,9 6.42,9.83 6.83,11H19V8L23,12Z" /></vector>
1 change: 1 addition & 0 deletions app/src/main/res/raw/changelog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<new>Search selections persist</new>
<new>Updates available from About</new>
<new>Added Vietnamese and Swedish translations</new>
<new>Added option to return to first trait on entry navigation</new>
<info>Merged barcode and text unique ID search setting</info>
<info>Numerous GeoNav improvements</info>
<info>Merged duplicate settings</info>
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,9 @@
<string name="preferences_behavior_cycle_traits">Cycling traits advances entry</string>
<string name="preferences_behavior_cycle_traits_description">After going through all traits, Field Book goes to the next entry</string>

<string name="preferences_behavior_return_to_first_trait">Advancing entry returns to first trait</string>
<string name="preferences_behavior_return_to_first_trait_description">When moving to the next entry, Field Book also returns to the first trait</string>

<string name="preferences_behavior_volume_buttons_navigate">Map volume keys to entry navigation</string>
<string name="preferences_behavior_volume_buttons_navigate_description">Volume keys go to next or previous entry</string>

Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/xml/preferences_behavior.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
android:summary="@string/preferences_behavior_cycle_traits_description"
android:title="@string/preferences_behavior_cycle_traits" />

<CheckBoxPreference
android:defaultValue="false"
android:icon="@drawable/ic_adv_return_first_trait"
android:key="ReturnFirst"
android:summary="@string/preferences_behavior_return_to_first_trait_description"
android:title="@string/preferences_behavior_return_to_first_trait" />

<CheckBoxPreference
android:defaultValue="false"
android:icon="@drawable/ic_remap_volume_buttons"
Expand Down
4 changes: 2 additions & 2 deletions version.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
majorVersion=5
minorVersion=5
patchVersion=12
buildNumber=44
patchVersion=13
buildNumber=55

0 comments on commit f360795

Please sign in to comment.