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

Merge Playstore Tella code #11

Draft
wants to merge 144 commits into
base: develop
Choose a base branch
from
Draft

Merge Playstore Tella code #11

wants to merge 144 commits into from

Conversation

djordjemarusic
Copy link

No description provided.

wafalakhal and others added 30 commits January 24, 2023 17:58
* adding viewPager2 in onboarding views

* finish the onboarding sliding views 
refactoring the code

* handling old tab indicators for the other type of onboarding

* fixing ui display in the viewpager and tablayout

* Fix PR comments

* fix next and back button visibility

* fix PR comments

* fix binding issue
* start working on  progress bottomSheet 
 importing  files

* adding mutableLivedata to notify the bottomSheet

* add a handler to test the sheet display

* finish adding bottom sheet import files

* fix PR comments

* fix cancel action in import files bottom sheet

* fix PR comments

* fix PR comments
* init reports

* init implementation for report settings

* WIP implement server settings

* WIP settings

* WIP report settings

* WIP reports

* Remove ButterKnife lib (Horizontal-org#168)

Remove Butterknife library, remove MVP from ODK Forms, and code formatting.

* wip reports

* Finish settings setup

* WIP reports tabs + viewpager

* wip reports

* wip reports

* Wip get reports server

* wip save draft

* WIP save drafts

* Report Files RecyclerView WIP

* Save Draft Reports wip

* Report files view design

* Add files to report by import or with camera

* Complete new home navigation

* improve navigation

* some notes to refactor for later

* Unify entity status between uwazi and reports

* wip complete save drafts

* TODO: Fix files saving

* WIP list of reports insatnce

* Fix attachments handle

* WIP report listing

* Allow adding and deleting report attachments in multiple actions

* WIP reports listing

* Finish delete report

* Save file id-s along with report instance

* wip loading reports

* loading report instance

* List outbox

* load vault files with Report instance wip

* Improvements on files

* Edit reports from the outbox with files

* add reports to onboarding

* add audio to report wip

* navigate from reports server settings to reports list

* add back button to reports fragment

* Add file to report via audio recorder

* Use FragmentResult to get report audio result

* Add file to report via audio recorder fixes

* Do not put the same file in the report more than once

* set list servers in dropdown

* Finish dropdown design

* fix reports selection

* Hide navigation bar when recorder is called from reports

* Release "2.0.14" (136)

* Fix the bottom margins of the report buttons, center the "empty list" message for report list fragments

* T-And-926 - When drafting a report, the bottom buttons should be sticky;
T-And-923 - When creating a new report, the "Submit" button says "New Report"

* Report Entry fixes WIP

* Fix report attachments recyclerview

* Adjust sizes of report file attachments in the grid

* Adjust sizes of report file attachments in the grid

* WIP report submission

* WIP send report

* Fill Report into ReportsFormEndView

* ReportsSendFragment wip

* list submitted files

* add status to report

* fix constructor

* Reports Fragments wip

* wip get projects/submit files

* wip files submission

* integrate project slug

* WIP sending files

* WIP fix build project

* Wip file submission

* Save report state on local database / cleanup code

* Wip report submission

* Fix access token / Add pause status

* fix access token

* Exclude old unused libs

* Send finalized form from ReportsEntryFragment

* WIP submit entity status

* Update report file upload progress wip

* Fix progress

* Update report file upload progress wip

* Update report file upload progress wip

* set current tab

* Update report file upload progress wip

* Show files submission status

* WIP reports

* Fix release crash

* Fix T-And-992 - Back button in connect to server not working

* T-And-996 - Fix reports button style on the homescreen

* Fix T-And-1008 - Show project name in the Setting > Servers screen

* Fix T-And-1011 - Saving reports as a draft create a new draft report

* Fix T-And-1004 - Details view not showing for paused

* Fix T-And-1009 - Typo on the edit server screen

* Fix T-And-1016 - Replace all toast messages with snackbars

* Fix T-And-1003 - Ask the user if they want to exit report without saving

* Fix T-And-999 - Add a validation error 

T-And-999 - Add a validation error if the user connects to the same project twice

* Fix T-And-1012

T-And-1012 - Deleting a file that's currently in a draft or outbox report should also delete it from there (after a confirmation)

* Fix pr review + clean code

* clean code

* Fix dependencies

---------

Co-authored-by: Dorde Marusic <djordje.marusic@gmail.com>
Co-authored-by: DjordjeM <djordje.marusic@google.com>
* Fix feedback

* Clean code, fix report status

* Fix get drawble
* adding sliding viewpager in calculator choice and start working on styles

* finish all skins styling

* adding calculator images in viewpager

* adding next and back button  in sliding between calculator skins

* add icons in bottom sheet dialog when switching between calculator skins

* fix PR  comments and adding new icons for calculator skins

* fix bug in onboarding

* Calculator alias fixes

* adding method to get drawable icons

* Fix camouflage icons display

* fix display and add icons for skin calculators

* fix PR review and refactor code

* fix onBoarding issue

* fix PR comments

* fix calculators images for different skins

* fix icon name and add camouflage new implementation to onboarding

* fix PR comments

* convert png to webp to minimize the size

* fix margin display in calculator

* fix PR review

---------

Co-authored-by: DjordjeM <djordje.marusic@google.com>
* add new icons and delete old and unused ones

* convert png to webp

* update ui

* Fix PR comments

* remove unused import and fix import files text

* remove duplicated string
* Fix T-And-1027 - "Go to report" does not direct to reports

* Fix T-And-1048 - Quick exit should lock the app

* Clean code + T-And-1050 - Quick delete settings not working

* unify base activity naming

* Fix T-And-1073 && T-And-1075

* Fix dagger problem

* T-And-1069 - View icon on submitted (3 dots) should have an eye

* Fix T-And-1070 - Show title “Tella files” on the homescreen

* Fix T-And-1072 - Uwazi logo on homescreen looks really ugly

* Fix T-And-1002 - Editing a report should have different actions

* Fix T-And-975 - Change links on the About page

* T-And-1041 - taking photos or videos on verification mode

* Fix T-And-1064

* Fix T-And-997

* add extension function

* Fix pr comments

* remove ic white

* Revert "remove ic white"

This reverts commit 71f9b84.

* Fix icon
…heet (Horizontal-org#194)

* make bottom sheet automatically close once the import is complete.

* fix initial value of import files counter
* add delete file function when importing

* implement  auto delete after import

* fix delete file action

* fix conflits

* formating attachementFragment

* reformat attachements fragment

* reformat files
* Fix uwazi outbox problem

* add back button for (Uwazi+Forms) Fragment

* T-And-1056 - Clicking a report on the outbox tab should go to the details/pause state (it should not submit it)

* Fix T-And-1108 - Refresh problem on server connections

* Downgrade java rosa version

* Clean

* Desactivate tella server button in the Onboarding

* Fix pr comments
* Fix T-And-1121

* Fix T-And-1116 -updating from the PlayStore version to 2.1.0

* Fix T-And-1100 - Once Uwazi reports go the the outbox

* DB update fix

* Fix upgrade

---------

Co-authored-by: DjordjeM <djordje.marusic@google.com>
…roid into develop

� Conflicts:
�	mobile/build.gradle
�	mobile/src/main/java/rs/readahead/washington/mobile/views/dialog/reports/step3/LoginReportsFragment.kt
DjordjeM and others added 25 commits July 15, 2024 23:03
* refactor navigation

* WIP top sheet dialog

* WIP encryption

* WIP background encryption logic

* WIP background encryption

* Refactor micro to mvvm

* Add  bachground encryption logic to mic fragment

* Finish background encryption

* show confirmation background dialog before leaving

* Fix method error

* Fix back pressed button

* Fix problem of long videos

* merge with develop

* WIP refactor Camera activity into a fragment

* fix warnings

* add navigation to relationShip uwazi screen
add uwazi uwaziRelationShipWidget

* fix navigation actions

* add uwazi searchableMultiSelect

* WIP camera refactoring

* working on the design an the navigation flow

* fix back button behavior

* wip design display

* WIP design

* Delete space

* WIP background encryption

* fix adapter params

* display relationShip entities only if it returns in the template apis output

* WIP unify new navigation settings

* finish navigation settings

* Fire events

* add selected entities displayed while validation

* save the relationShip entities in local database of  downloaded template

* Finish camera setting with background encryption

* Show exit prompt for background encryption

* save entities with downloaded templates in local database

* Finish import attachments

* delete comments

* save entities selected in draft entity

* display number of entities selected in draft

* fix parsing issue

* more fixing of parsing entities in draft

* more optimizing on parsing models

* delete unused attribut

* finish fixing parsing issue

* fix back button from send uwazi report to entry

* code clean

* get rid of unused attribut in local database

* fix  naming in widget

* add second call to api to fetch entities  when adding a report

* WIP Finish bottomsheet and show icons

* fix PR comments

* fix PR comments

* Fix mic navigation, show mic fragment alert

* Fix return bug

* Version 2.8.0 "1.8.0"

* fix PR comments

* Fix T-And-1450 - Check the capitalization for error message

T-And-1450 - Check the capitalization for error message in the confirmation for background activity and verification mode

* fix PR COMMENTS

* cleaning the nav graph

* centralize navigation with nav manager functions

* Fix photo not saved problem

* fix url

* refactoring outbox Fragment

* more refactoring

* refactor the submitted fragment in uwazi

* fix PR comments

* clean code

* Handle new navigation

* Fix navigation problem

* convert recent event class to kotlin

* Remove unused import

* add a method "importUriByMimeType"

* apply pr review

* Reformat code

* apply pr comments

* fix T-And-1458 - Digit in Quick Delete countdown not centered

* fix T-And-1319 - In vault, the reorder bottom sheet doesn't show the selected option

* fix T572 - Add back buttons to advanced onboarding

* fix T553 - Add  "Unlock" button to password screen

* revert settings navigation

* Divviup analytics

* Change divviup log msg

* WIP upgrade sqlcipher

* Fix upgrade problem proguard

* Upgrade

* FIx rx vault null problem

* WIP migration

* WIP data source

* WIP code migration

* WIP sql cipher

* WIP on feaat_upgrade_sqlcipher

* WIP sql cipher

* wip sql cipher

* WIP on feaat_upgrade_sqlcipher

* WIP sql cipher

* wip sqlcipher

* fix sqlcipher migration

* apply migration on main database

* clean code

* Finish 3 to 4 migration and clean code

* Analytics cleanup

* Finish migration approach logic

* Release 2.9.0

* Remove unecessary breaks

* Clean up code

* Fix fresh install

* New translations from Lokalize (July 2024)

* fix conflits

* apply pr comments

* clean old utils

* Finish alert message

* Uncomment open helper

* remove enableWriteAheadLogging

* Release 2.9.0 "180"

* Fix alert in fresh install

* Home analytics banner design changes

* Merge with develop

* Small fixes

* fix analytics dialogs

* Release 2.10.0 "182"

---------

Co-authored-by: Ahlem Jarrar <ahlem.jarrar@hotmail.com>
Co-authored-by: wafa lakhal <lakwafa@gmail.com>
Co-authored-by: DjordjeM <djordje.marusic@google.com>
Co-authored-by: raphmim <27868414+raphmim@users.noreply.github.com>
* Vietnamese language

* T-And-1502 - Design missmatches for divviup

* Code fixes

* Fix AnalyticsIntroActivity back pressed

* Catch error fetching devices neighboring cell towers and wifi

* TelephonyUtils code fix

* New translations from Lokalize for 2.10.0  (July 24)

* Partly merge translations

* fix translation
* refactor navigation

* WIP top sheet dialog

* WIP top sheet dialog

* WIP encryption

* WIP background encryption logic

* WIP background encryption

* Refactor micro to mvvm

* Add  bachground encryption logic to mic fragment

* Finish background encryption

* show confirmation background dialog before leaving

* Fix method error

* Fix back pressed button

* Fix problem of long videos

* merge with develop

* WIP refactor Camera activity into a fragment

* fix warnings

* add navigation to relationShip uwazi screen
add uwazi uwaziRelationShipWidget

* fix navigation actions

* add uwazi searchableMultiSelect

* WIP camera refactoring

* working on the design an the navigation flow

* fix back button behavior

* wip design display

* WIP design

* Delete space

* WIP background encryption

* fix adapter params

* display relationShip entities only if it returns in the template apis output

* WIP unify new navigation settings

* finish navigation settings

* Fire events

* add selected entities displayed while validation

* save the relationShip entities in local database of  downloaded template

* Finish camera setting with background encryption

* Show exit prompt for background encryption

* save entities with downloaded templates in local database

* Finish import attachments

* delete comments

* save entities selected in draft entity

* display number of entities selected in draft

* fix parsing issue

* more fixing of parsing entities in draft

* more optimizing on parsing models

* delete unused attribut

* finish fixing parsing issue

* fix back button from send uwazi report to entry

* code clean

* get rid of unused attribut in local database

* fix  naming in widget

* add second call to api to fetch entities  when adding a report

* WIP Finish bottomsheet and show icons

* fix PR comments

* fix PR comments

* Fix mic navigation, show mic fragment alert

* Fix return bug

* Version 2.8.0 "1.8.0"

* fix PR comments

* Fix T-And-1450 - Check the capitalization for error message

T-And-1450 - Check the capitalization for error message in the confirmation for background activity and verification mode

* fix PR COMMENTS

* cleaning the nav graph

* centralize navigation with nav manager functions

* Fix photo not saved problem

* fix url

* refactoring outbox Fragment

* more refactoring

* refactor the submitted fragment in uwazi

* fix PR comments

* clean code

* Handle new navigation

* Fix navigation problem

* convert recent event class to kotlin

* Remove unused import

* add a method "importUriByMimeType"

* apply pr review

* Reformat code

* apply pr comments

* fix T-And-1458 - Digit in Quick Delete countdown not centered

* fix T-And-1319 - In vault, the reorder bottom sheet doesn't show the selected option

* fix T572 - Add back buttons to advanced onboarding

* fix T553 - Add  "Unlock" button to password screen

* revert settings navigation

* Divviup analytics

* Change divviup log msg

* WIP upgrade sqlcipher

* Fix upgrade problem proguard

* Upgrade

* FIx rx vault null problem

* WIP migration

* WIP data source

* WIP code migration

* WIP sql cipher

* WIP on feaat_upgrade_sqlcipher

* WIP sql cipher

* wip sql cipher

* WIP on feaat_upgrade_sqlcipher

* WIP sql cipher

* wip sqlcipher

* fix sqlcipher migration

* apply migration on main database

* clean code

* Finish 3 to 4 migration and clean code

* Analytics cleanup

* Finish migration approach logic

* Release 2.9.0

* Remove unecessary breaks

* Clean up code

* Fix fresh install

* New translations from Lokalize (July 2024)

* fix conflits

* apply pr comments

* clean old utils

* Finish alert message

* Uncomment open helper

* remove enableWriteAheadLogging

* Release 2.9.0 "180"

* Fix alert in fresh install

* Home analytics banner design changes

* Merge with develop

* Revert "Home analytics banner design changes"

This reverts commit e477fde.

* Small fixes

* fix analytics dialogs

* Release 2.10.0 "182"

* Add event to send install metric

* Analytics install event params

* fix T-And-1495 - Canceling a delete action does not work in Android

* fix T-And-1496 - Cancel button for saving to device do not work in android

* fix T-And-1494 - Tella Android contact us button does not redirect to email

* fix T-And-1455 - Sections in settings are not aligned

* fix T-And-1319 - In vault, the reorder bottom sheet doesn't show the selected option

* fix T-And-1504 - Error attaching data in uwazi relationship

* T-And-1497 - [Tella Web] - Submit report with audio - the application crashes

* fix T714 - "Back" button not working on 2FA screen

* fix T-And-1279 - Back button on the Uwazi summary screen takes the user to an inconsistent state

* fix T-And-1279 - Back button on the Uwazi summary screen takes the user to an inconsistent state

* fix pr comments

---------

Co-authored-by: Ahlem Jarrar <ahlem.jarrar@hotmail.com>
Co-authored-by: Dorde M <5484544+djordjemarusic@users.noreply.github.com>
Co-authored-by: DjordjeM <djordje.marusic@google.com>
Co-authored-by: raphmim <27868414+raphmim@users.noreply.github.com>
Co-authored-by: djordjemarusic <djordje.marusic@gmail.com>
* T579 - Add tutorial screen for data collection

* Fix T-And-1340 - Disable button if blank file/folder name

* T-And-1487 - Tella Android: Manifest allows clear-text traffic

* T-And-1291 - show attempts selected

T-And-1291 - show attempts selected on the "Delete after failed unlock" and a handle longer languages

* Fix T810 - Make templates names multi-line

T810 - Make templates names multi-line in Download Template screens

* Fix T-And-1507 - Crash when pressing back from the uwazi sumary screen

* Fix background color

* apply pr review
* fix T-And-1510 - Add the name of the field in the uwazi relationship screen

* fix T-And-1464 - Reordering files is reversed

* fix T-And-1444 - Add space between strings on report status screen

* fix PR comments

* fix the code
…ntal-org#302)

* updated readme linking to documentation and removing old gifs

* fixed wrong links

* Added feature image

* updated links to gifs

* trying to make gifs load

* added gifs to the repo because preview was not working
* WIP on develop

fix T-And-1519 - Unexpected error when submitting an entity to uwazi related to multi select

* remove extra lines
@djordjemarusic djordjemarusic marked this pull request as draft September 19, 2024 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants