Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fields modifications including trait statistics graphs #985

Merged
merged 322 commits into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
322 commits
Select commit Hold shift + click to select a range
5c038a3
minor lint fixes
chaneylc May 14, 2024
cb52560
Merge branch 'offbeat_camera_canon' into offbeat_camera
chaneylc May 14, 2024
876c930
merged canon camera updates
chaneylc May 15, 2024
95e7132
move field import to new field FAB
bellerbrock May 15, 2024
80f52ec
fix newField FAB on click behavior
bellerbrock May 16, 2024
a90d09b
move create field to new field dialog opened by FAB
bellerbrock May 16, 2024
f8231b1
init temporary commit
chaneylc May 17, 2024
430a20b
generify trait list sort dialog, add field list sort
bellerbrock May 17, 2024
60aa04c
add observation histograms to field detail fragment
bellerbrock May 21, 2024
217a364
refine field detail histograms
bellerbrock May 23, 2024
892ddd6
renamed canontrait -> canontraitlayout
chaneylc May 23, 2024
2d3bbc5
include piechart icon to display trait completeness
bellerbrock May 24, 2024
4ae7edd
fix x-axis label counts
bellerbrock May 28, 2024
655d314
include icons in import list
bellerbrock May 28, 2024
9bce9dd
move create new to end of options list
bellerbrock May 28, 2024
a13069b
Merge branch 'main' into fields_modifications
bellerbrock May 29, 2024
ac019ff
fixed canon image transfer corruption, saved based on offsets of data
chaneylc May 29, 2024
7e316ff
update list sorts to highlight current sort and include reset
bellerbrock May 29, 2024
b83b2ce
add additional chart type for non-numeric data
bellerbrock May 31, 2024
5d95913
use util for category trait value processing
bellerbrock Jun 4, 2024
921330b
refine chart axes, messages, visibility
bellerbrock Jun 4, 2024
04cb2e0
Merge branch 'main' into fields_modifications
bellerbrock Jun 4, 2024
725616e
remove uneeded tint style
bellerbrock Jun 4, 2024
c421b42
center trait format icons in dialog
bellerbrock Jun 6, 2024
01fc265
config listview to bottom of parent with FAB on top
bellerbrock Jun 6, 2024
3307444
fix scalability/readability of field names with large fonts
bellerbrock Jun 6, 2024
813a7f9
fix fields list action mode theming
bellerbrock Jun 7, 2024
da31cd8
refactor brapi export observation handling to avoid obsunitpropertyview
bellerbrock Jun 7, 2024
feb2a9d
refine multiple brapi export
bellerbrock Jun 10, 2024
007f3bd
remove old FieldEditorActivity
bellerbrock Jun 10, 2024
3ab28ba
batch rename settings
bellerbrock Jun 11, 2024
fd881f9
move database prefs to system and location to location
bellerbrock Jun 11, 2024
651b055
move collect toolbar features to appearance settings
bellerbrock Jun 17, 2024
4b5136f
simplify strings and reorder profile settings
bellerbrock Jun 17, 2024
5bf2938
reorganize behavior settigns
bellerbrock Jun 17, 2024
2210729
update volume key advancement setting
bellerbrock Jun 17, 2024
9c5c777
simplify sound settings
bellerbrock Jun 17, 2024
42dd88d
convert disable sharing pref to enable sharing pref
bellerbrock Jun 17, 2024
c1f0e12
move brapi auto-configure to toolbar
bellerbrock Jun 17, 2024
59a92e1
move community servers to auto-configure longpress
bellerbrock Jun 17, 2024
050828c
reorganize brapi settings
bellerbrock Jun 17, 2024
7c38118
ensure use of appAlertDialogs
bellerbrock Jun 17, 2024
9e5b6de
reorder location collection options
bellerbrock Jun 18, 2024
2d0e021
add sound prompt to cycling traits advances entry
bellerbrock Jun 18, 2024
77fb96e
Add setting to collect coordiantes in ISO 6709 or GeoJSON format
bellerbrock Jun 18, 2024
a4c7117
refine location preferences
bellerbrock Jun 18, 2024
60b6f99
standardize and clarify preference strings
bellerbrock Jun 18, 2024
ce7460b
refine profile preferences
bellerbrock Jun 19, 2024
101374b
reorg appearance and collect and simplify summaries
bellerbrock Jun 20, 2024
147ad13
chart refinements
bellerbrock Jun 25, 2024
ab7fda2
fix 0-indexed default values
bellerbrock Jun 26, 2024
0f5f61b
array and summary refinements
bellerbrock Jun 26, 2024
592d5f9
fix profile verification
bellerbrock Jun 26, 2024
2a76551
Load sample data
kamathprasad9 Jun 27, 2024
4cb29cc
Show tutorial icon
kamathprasad9 Jun 28, 2024
6543cca
Update intro slides
kamathprasad9 Jun 28, 2024
c0cf505
Add required setup slide
kamathprasad9 Jul 5, 2024
db04585
Redesign optional setup
kamathprasad9 Jul 6, 2024
2e8f4e4
Select first field on import db
kamathprasad9 Jul 8, 2024
fbf7116
better adjustment of chart bars and labels
bellerbrock Jul 8, 2024
6c9d04e
Fix post callback completion
kamathprasad9 Jul 8, 2024
0216e6b
Change optional setup layout
kamathprasad9 Jul 8, 2024
f9bce5d
Merge branch 'refs/heads/main' into brapi_workflows
chaneylc Jul 9, 2024
4988313
fix histogram binning, labels, and axes
bellerbrock Jul 10, 2024
0897a99
convert to horizontal barchart to prevent bar number limits
bellerbrock Jul 10, 2024
60885ad
Add condition to check storage
kamathprasad9 Jul 11, 2024
4682a87
consistent chart label ordering
bellerbrock Jul 11, 2024
2bdd58e
fix horizontal bar chart scaling and single bar charts
bellerbrock Jul 11, 2024
03e3674
scale piechart by textsize and eliminate need for utils
bellerbrock Jul 12, 2024
a10ee20
update maxbincount calc to include Freedman-Diaconis rule
bellerbrock Jul 12, 2024
a1ef468
ensure trait cards are sorted
bellerbrock Jul 12, 2024
389df17
simplify verification interval strings
bellerbrock Jul 15, 2024
c45be27
prevent use of BrAPI as default source if it is disabled
bellerbrock Jul 15, 2024
57ea293
fix text theme indexing in themed activity
bellerbrock Jul 16, 2024
69f3a98
update collect toolbar default indexes
bellerbrock Jul 16, 2024
56661ef
custom skip message to context
bellerbrock Jul 16, 2024
b516a32
Display intro on first run
kamathprasad9 Jul 19, 2024
7b5dc0e
Change background, text colors
kamathprasad9 Jul 19, 2024
d93cafc
Edit string resources
kamathprasad9 Jul 19, 2024
0926993
Add comments for debug mode
kamathprasad9 Jul 19, 2024
20ceaf0
Merge branch 'fields_modifications' into app-intro
kamathprasad9 Jul 19, 2024
ab63a5e
make traits and fields sort case insensitive
bellerbrock Jul 30, 2024
5552e4a
fix exclusion logic as suggested in #403
bellerbrock Jul 30, 2024
2148dc1
uncomment change
bellerbrock Jul 30, 2024
b7140cb
delete all traits fix
chaneylc Aug 1, 2024
64358cb
merge main
bellerbrock Aug 2, 2024
8e77059
Merge branch 'main' into fields_modifications
bellerbrock Aug 2, 2024
ff15f03
merge fields_modifications
bellerbrock Aug 2, 2024
175112b
change advance to navigate for volume keys
bellerbrock Aug 2, 2024
2e52df0
update SearchPreference to newest version
bellerbrock Aug 2, 2024
61fcaaf
fix location collection format visibility logic
bellerbrock Aug 2, 2024
e108b5c
unify sort icons
bellerbrock Aug 2, 2024
3f0b5ba
add icons, update padding, make data card collapsible
bellerbrock Aug 2, 2024
630f345
string updates
trife Aug 3, 2024
8990ae5
convert narrative and data card text to chips
bellerbrock Aug 5, 2024
a204564
update icons and use bridge theme
bellerbrock Aug 6, 2024
ecd70f7
make trait charts expanded by default, hide obs chip if no obs
bellerbrock Aug 6, 2024
af1dcdc
revert padding and use single chip group
bellerbrock Aug 6, 2024
23badc0
color chips
bellerbrock Aug 6, 2024
121dc51
change default sort order to DESC for dates
bellerbrock Aug 6, 2024
7cf4375
auto scroll to top of field list when refreshed
bellerbrock Aug 7, 2024
df02edf
fix default sort order display
bellerbrock Aug 7, 2024
c401c31
filter out zero-length trait observations before charting
bellerbrock Aug 7, 2024
8681b69
move rename and sort onclick funcitons to chips
bellerbrock Aug 7, 2024
f9ef767
Add gallery slide, boox high contrast setting
kamathprasad9 Aug 7, 2024
be52eee
string updates
trife Aug 7, 2024
013a5f1
Fix storage definer theming issue
kamathprasad9 Aug 7, 2024
11bb70f
Remove app intro from experimental
kamathprasad9 Aug 7, 2024
407f286
remove NAs
bellerbrock Aug 7, 2024
d0e80c1
move active chips and use color primary outline
bellerbrock Aug 7, 2024
cbe3cf3
ensure field detail clicks do not register in underlying fields list
bellerbrock Aug 7, 2024
bf19471
Merge branch 'main' into fields_modifications
bellerbrock Aug 7, 2024
2b99cbf
move data chips below title
bellerbrock Aug 7, 2024
0fdf974
Resize intro img
kamathprasad9 Aug 7, 2024
b023159
Remove storage definer theme dialog for boox
kamathprasad9 Aug 8, 2024
502a6c2
Merge branch 'fields_modifications' into app-intro
kamathprasad9 Aug 8, 2024
cf9ef87
strings and gallery
trife Aug 8, 2024
336f3a7
Fix dialog initialization, dismiss on destroy
kamathprasad9 Aug 8, 2024
6258f88
Update preferences_experimental.xml
trife Aug 8, 2024
6e006f1
updated storage definer to skip UI
chaneylc Aug 9, 2024
6d0d6f9
removed storage definer fragment call from app intro
chaneylc Aug 12, 2024
1e69984
move rename and sort back to toolbar
bellerbrock Aug 12, 2024
be32656
add missing icon
bellerbrock Aug 12, 2024
c5443a1
Revert "move rename and sort back to toolbar"
bellerbrock Aug 12, 2024
af8f9a1
convert rename and sort to button-like chips
bellerbrock Aug 12, 2024
b23c229
Merge pull request #992 from PhenoApps/app-intro
trife Aug 16, 2024
3cf6210
Rename .java to .kt
chaneylc Aug 19, 2024
f59409d
converted file explorer activity to kotlin
chaneylc Aug 19, 2024
ee796f8
Rename .java to .kt
chaneylc Aug 23, 2024
0dccfaf
init commit
chaneylc Aug 23, 2024
5aef6cb
Merge remote-tracking branch 'refs/remotes/origin/offbeat_camera' int…
chaneylc Aug 26, 2024
b7ca223
update strings
bellerbrock Aug 27, 2024
1ad4873
location preferences updates
bellerbrock Aug 27, 2024
e62034f
remove base pref fragment from search index
bellerbrock Aug 27, 2024
f7687af
fix community server longpress listener
bellerbrock Aug 28, 2024
75d48f9
refactored offbeat into trait package
chaneylc Aug 29, 2024
388e813
Merge branch 'main' into alert-dialogs
kamathprasad9 Sep 5, 2024
6b46d3e
init commit
chaneylc Sep 9, 2024
9f6ec26
Merge remote-tracking branch 'origin/brapi_workflows' into brapi_work…
chaneylc Sep 9, 2024
4db2297
replace require user with never option in verification interval
bellerbrock Sep 11, 2024
5334fd6
set default verification interval to 24hr
bellerbrock Sep 11, 2024
9f80988
fixed heatmap color issue and changed icons
akshat22 Sep 12, 2024
aa449df
fixed merge conflicts
akshat22 Sep 12, 2024
2c193fd
init commit
chaneylc Sep 13, 2024
4293c2b
added NA handling to new photo trait layouts
chaneylc Sep 16, 2024
a72bec8
show delete dialog when setting image to NA
chaneylc Sep 17, 2024
b77b4cf
improved viewing / deleting NA images
chaneylc Sep 18, 2024
237da00
added delete sweep / total result number chip in study filter
chaneylc Sep 20, 2024
764c9fa
fixed clearing all filter preferences
chaneylc Sep 20, 2024
5bbe25e
added ui flow to go back to study filter if the importer found 0 plot…
chaneylc Sep 20, 2024
a6d216d
minor ui fixes
chaneylc Sep 24, 2024
4123d87
slightly decreased shading around search bar
chaneylc Sep 24, 2024
06dba8a
search bar shadow fix
trife Oct 3, 2024
67f6326
Replace traits progress bar with status
kamathprasad9 Oct 6, 2024
ed7c6db
Fix plot observation status
kamathprasad9 Oct 7, 2024
3e47d00
Fix scrolling animation
kamathprasad9 Oct 7, 2024
b93eedf
Rename adapter
kamathprasad9 Oct 9, 2024
d3d3dd7
Update status for images
kamathprasad9 Oct 10, 2024
f095acc
Update trait status for multi measures, delete bottom bar
kamathprasad9 Oct 10, 2024
fc0f8d0
Change current trait status icon
kamathprasad9 Oct 10, 2024
5a8eef4
added invalidate brapi import cache interval preference
chaneylc Oct 10, 2024
bd1d8f3
Merge remote-tracking branch 'origin/brapi_workflows' into brapi_work…
chaneylc Oct 10, 2024
28a3d66
add icons
bellerbrock Oct 15, 2024
e5407c3
fix handling null seasons and location names
chaneylc Oct 21, 2024
e4852e0
minor refactoring
chaneylc Oct 21, 2024
6c73218
minor refactoring
chaneylc Oct 21, 2024
96dbf6f
Merge branch 'main' into brapi_workflows
chaneylc Oct 21, 2024
97c7af4
updated filter/import/save button text color to dark, added extra col…
chaneylc Oct 24, 2024
c74e69d
fixed invalidation preference skipping
chaneylc Oct 24, 2024
af42082
moved reset cache button to overflow menu
chaneylc Oct 24, 2024
5db2e81
fixed various issues with 'every' clear and preferences (search prefe…
chaneylc Oct 24, 2024
362348d
fix hanging study import progress bar when 0 traits exist for a study
chaneylc Oct 25, 2024
89b0b21
move db and storage loc settings to storage section
bellerbrock Oct 28, 2024
9efd0ba
add features section
bellerbrock Oct 28, 2024
7fbf23b
removed unused file
chaneylc Oct 28, 2024
a85176b
init commit for new brapi trait import
chaneylc Oct 29, 2024
c06f14a
move crashlytics preference
bellerbrock Oct 29, 2024
add74f7
use action words in positive buttons
bellerbrock Oct 29, 2024
fca0b6d
Revert back range box progress bar
kamathprasad9 Oct 30, 2024
b7aabaf
Use attr colors
kamathprasad9 Oct 30, 2024
8758ca7
Use dimen resource for max size
kamathprasad9 Oct 30, 2024
0ac8a09
added filters relative to 'filterer' such as traits and studies importer
chaneylc Oct 30, 2024
c46bec9
Use alert dialog in field sort
kamathprasad9 Oct 31, 2024
4702610
Merge fields_modifications
kamathprasad9 Oct 31, 2024
5624f3c
Brapi field import load alert dialog
kamathprasad9 Nov 2, 2024
2883120
Use alert dialog for Brapi Auth dialog
kamathprasad9 Nov 2, 2024
1264fc7
Field creator alert dialog
kamathprasad9 Nov 3, 2024
6a36ba6
Rename FieldSortDialog
kamathprasad9 Nov 3, 2024
ff39494
refactoring
chaneylc Nov 4, 2024
dbe5fec
Merge branch 'refs/heads/fields_modifications' into brapi_workflows_t…
chaneylc Nov 4, 2024
1ffdfc1
updated trait dialog options to return format
chaneylc Nov 4, 2024
3a4f4f3
added basic trait import from brapi
chaneylc Nov 4, 2024
1398c1d
fix phenolib dep
chaneylc Nov 6, 2024
6851f3c
refactoring
chaneylc Nov 6, 2024
e52aff8
Merge branch 'refs/heads/fields_modifications' into issue/871
chaneylc Nov 6, 2024
0dcfdba
set correct theme colors for stats heatmap and calendar range picker
chaneylc Nov 7, 2024
acd9b46
fixed image counting
chaneylc Nov 7, 2024
f2a940d
Fix brapi sync on invalid source
kamathprasad9 Nov 8, 2024
8e70c1b
Use AppAlertDialog style for export dialogs
kamathprasad9 Nov 8, 2024
aaa4430
Use AppAlertDialog in dialogs
kamathprasad9 Nov 8, 2024
57a75b2
various fixes
chaneylc Nov 13, 2024
a1a21f0
updated page size to use preferences
chaneylc Nov 14, 2024
1c84197
added filter count preview in dialogs
chaneylc Nov 14, 2024
beadac1
Toggle word wrap on long press
kamathprasad9 Nov 16, 2024
796e36e
Add hide prefix preference
kamathprasad9 Nov 16, 2024
d399253
Fix sizing bug when editing active traits from Collect
kamathprasad9 Nov 18, 2024
17c140f
Change inactive color
kamathprasad9 Nov 18, 2024
fc84a0b
merge main
bellerbrock Nov 20, 2024
90477e5
Merge branch 'fields_modifications' into settings_reorganization
bellerbrock Nov 20, 2024
a1b6be2
minor refactoring
chaneylc Nov 20, 2024
2399ade
fixed phenolib dep, gradle build was failing,
chaneylc Nov 20, 2024
cc2567b
Merge pull request #1075 from PhenoApps/alert-dialogs
trife Nov 20, 2024
cca5d85
Add valueText onCLick dialog when prefix hidden
kamathprasad9 Nov 20, 2024
ff8c71e
Vertically center icon with value
kamathprasad9 Nov 20, 2024
f264762
Add padding
kamathprasad9 Nov 20, 2024
8996ba5
Add outline icons
kamathprasad9 Nov 20, 2024
80e817c
Persist storage uri permissions
kamathprasad9 Nov 21, 2024
245ee36
Fix sample db file name
kamathprasad9 Nov 21, 2024
a649203
Merge branch 'fields_modifications' into settings_reorganization
trife Nov 21, 2024
8912596
minor organizational changes
trife Nov 21, 2024
fcbee97
Merge pull request #986 from PhenoApps/settings_reorganization
trife Nov 21, 2024
62e2d26
Merge pull request #1059 from PhenoApps/progress-bar-changes
trife Nov 21, 2024
36454aa
Merge branch 'fields_modifications' into infobar-changes
kamathprasad9 Nov 21, 2024
c4a70bc
added string resource for "Up" action
chaneylc Nov 21, 2024
b77b956
minor fixes
chaneylc Nov 21, 2024
d44555a
fix uri presenter presenting uris that don't exist
chaneylc Nov 21, 2024
734814d
Merge pull request #940 from PhenoApps/issue/871
trife Nov 22, 2024
53afd4e
Merge pull request #1076 from PhenoApps/infobar-changes
trife Nov 22, 2024
3a44d90
Merge branch 'fields_modifications' into file_explore_cleanup
trife Nov 22, 2024
5a83517
Merge pull request #1022 from PhenoApps/file_explore_cleanup
trife Nov 22, 2024
2ce0307
Merge branch 'fields_modifications' into fix-intro-asset-storage
trife Nov 22, 2024
420c8d0
Merge pull request #1079 from PhenoApps/fix-intro-asset-storage
trife Nov 22, 2024
586ea32
changelog and version
trife Nov 22, 2024
655d91c
remove Tips true from pref defaults during installs in new folders
bellerbrock Nov 26, 2024
af7f812
merge rather than overwrite default prefs to keep expected toolbar pr…
bellerbrock Nov 26, 2024
3bcdfd5
fix skip entries default values
bellerbrock Nov 26, 2024
b77298d
persist selection state of traits in brapi import
chaneylc Nov 26, 2024
8a1cafc
updated brapi field and trait import toolbar title strings
chaneylc Nov 26, 2024
3c20e66
fixed patch version
chaneylc Nov 26, 2024
8841187
fixed obs. level selection when levels exist but aren't used in obs. …
chaneylc Nov 26, 2024
74fd046
remove pref file from sample db and revert ZipUtil changes (but retai…
bellerbrock Nov 27, 2024
0ffad6c
Merge branch 'fields_modifications' into brapi_workflows_traits
trife Nov 27, 2024
52e76dc
refine logging and prevent input stream error
bellerbrock Nov 27, 2024
ae56e5e
merge main
bellerbrock Nov 27, 2024
5d40874
additional merge conflict fix
bellerbrock Nov 27, 2024
f07faaa
update sample_db field import order
bellerbrock Nov 27, 2024
68714ae
adjusted implementation to track running list of selected traits/stud…
chaneylc Nov 27, 2024
8dfa7d2
Merge remote-tracking branch 'origin/brapi_workflows_traits' into bra…
chaneylc Nov 27, 2024
a0c7986
fixed selection not clearing
chaneylc Nov 28, 2024
f968372
Merge pull request #1073 from PhenoApps/brapi_workflows_traits
trife Dec 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 27 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,14 @@ dependencies {

implementation 'com.google.zxing:core:3.4.1'

implementation('com.github.phenoapps:phenolib:v0.9.50')
implementation('com.github.phenoapps:phenolib:0.9.51')

implementation 'com.google.android.exoplayer:exoplayer:2.19.1'
implementation 'androidx.media3:media3-exoplayer:1.3.0'
implementation 'androidx.media3:media3-exoplayer-dash:1.3.0'
implementation 'androidx.media3:media3-ui:1.3.0'
implementation 'androidx.media3:media3-common:1.3.0'

implementation 'com.arthenica:ffmpeg-kit-min:5.1.LTS'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'

Expand All @@ -175,7 +180,7 @@ dependencies {
//noinspection GradleDependency
implementation "com.mikepenz:aboutlibraries:6.2.3"
implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.2'
implementation 'com.github.ByteHamster:SearchPreference:v2.0.0'
implementation 'com.github.ByteHamster:SearchPreference:v2.5.1'
implementation "com.github.skydoves:colorpickerpreference:2.0.4"
implementation 'com.github.evrencoskun:TableView:v0.8.9.4'

Expand Down Expand Up @@ -204,6 +209,12 @@ dependencies {

kapt 'com.android.databinding:compiler:3.1.4'

// Retrofit
implementation "com.squareup.retrofit2:retrofit:2.9.0"
// Retrofit with Scalar Converter
implementation "com.squareup.retrofit2:converter-scalars:2.9.0"
implementation "com.squareup.retrofit2:converter-gson:2.9.0"

testImplementation 'androidx.test:core:1.5.0'
testImplementation 'org.robolectric:robolectric:4.3.1'
testImplementation 'junit:junit:4.13.2'
Expand All @@ -215,12 +226,22 @@ dependencies {
implementation "androidx.exifinterface:exifinterface:1.3.6"

//camerax
def camerax_version = "1.2.0"
def camerax_version = "1.3.3"
implementation "androidx.camera:camera-camera2:$camerax_version"
implementation "androidx.camera:camera-lifecycle:$camerax_version"
implementation "androidx.camera:camera-view:$camerax_version"
implementation "androidx.camera:camera-core:$camerax_version"

// The view and compose calendar library
implementation 'com.kizitonwose.calendar:view:2.5.0'
implementation 'com.kizitonwose.calendar:compose:2.5.0'

// Calendar date range picker library
implementation 'io.github.architshah248.calendar:awesome-calendar:2.0.0'

//AppIntro
implementation 'com.github.AppIntro:AppIntro:6.3.1'

// Core library
androidTestImplementation "androidx.test:core:$coreVersion"

Expand Down Expand Up @@ -251,6 +272,8 @@ dependencies {
// ...with Kotlin.
kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.49'

// For trait data charts
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
}
Expand All @@ -262,6 +285,7 @@ kapt {

repositories {
mavenCentral()
maven { url "https://jitpack.io" }
}

task prepareKotlinBuildScriptModel {}
Expand Down
26 changes: 15 additions & 11 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:label">

<activity
android:name=".activities.StatisticsActivity"
android:exported="false" />
<activity
android:name=".activities.ScannerActivity"
android:exported="false" />
Expand Down Expand Up @@ -45,14 +47,6 @@
android:launchMode="singleTop"
android:screenOrientation="portrait" />

<activity
android:name=".activities.FieldEditorActivityOld"
android:alwaysRetainTaskState="false"
android:configChanges="keyboardHidden|orientation"
android:finishOnTaskLaunch="true"
android:launchMode="singleTop"
android:screenOrientation="portrait" />

<!-- Trait manager, for importing .trt files -->
<activity
android:name=".activities.TraitEditorActivity"
Expand Down Expand Up @@ -194,6 +188,10 @@
android:exported="true"
android:theme="@style/AppTheme" />

<!-- AppIntroActivity uses the AppIntro package -->
<activity android:name=".activities.AppIntroActivity"
android:label="My Custom AppIntro" />

<provider
android:name=".provider.GenericFileProvider"
android:authorities="${applicationId}.fileprovider"
Expand All @@ -219,6 +217,7 @@
<action android:name="android.intent.action.GET_CONTENT" />
</intent>
</queries>

<supports-screens
android:anyDensity="true"
android:largeScreens="true"
Expand All @@ -232,6 +231,11 @@
<uses-feature
android:name="android.hardware.camera"
android:required="false" />

<uses-feature android:name="android.software.companion_device_setup" />

<uses-feature android:name="android.hardware.usb.host" android:required="false"/>

<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
Expand All @@ -250,10 +254,10 @@
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />

<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>

<uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />

Expand Down
Binary file added app/src/main/assets/na_placeholder.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading