Merge Develop with main #316
Open
+113,310
−27,531
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updated camera lib Added missing resources: T542 - Bug: Crash after selecting Calc camo T541 - Bug: Cannot scroll through app icons Minor fixes: T490 - Quick Del settings display T505 - Add server: Text cut off in app bar T526 - Settings card alignment
Update onboard layouts for small screens Force app to close on removing camouflage.
* Clean Main Activity * Remove upload feature, remove unused settings resources * Remove offline mode * Remove unused resources * Revert mipmap files * Refactor vault strings * Refactor lock strings * Fix mipmap drawables * Fix strings * Remove unused string translations * Provides vault translations Co-authored-by: DjordjeM <[email protected]>
* Remove unused strings, move unlock translations to the unlock module
Upgrade to Tella2 Code cleanup Removed offline mode Downgrade to JavaRosa 2.4
Fixed loading file attachments in saved forms (draft, outbox, sent) add an audio record in the form using Mic fragment small changes to the UI, bottom sheet menus, notifications, etc
SubmittingItem and SubmittedItem
* WIP (templates / login) * Clean code * Submit uwazi entities * WIP UWAZI API INTEGRATION * WIP server selector * wip (enable view binding + connect to server) * WIP add uwazi server * Connect to uwazi server * list uwazi server from local db * Add uwazi server db table * Edit/update/connect to server * add uwazi fragment to home navigation * create pager adapter fragments * WIP templates * WIP templates * WIP Create local templates * WIP save templates in local data source * WIP templates * WIP (refactor uwazi data source) / WIP download templates * Fix bottom sheet probem * WIP design * Consumer fix * WIP templates * show delete / send entity sheet * update uwazi default language * Uwazi entry WIP * save entity row as json * Uwazi entry WIP * dynamic header for api calls * Uwazi submit entity WIP * Uwazi submit entity WIP * add cookies loader * Uwazi send entity fragment WIP * Handle memory leaks for uwazi * toggle favorite template * Show Favorite templates home + settings toggle * WIP show empty message text * fix server dialog flow * dismiss server dialog * WIP uwazi submit entity * Uwazi entity entry WIP * Uwazi entity entry WIP * WIP send uwazi form * WIP show uwazi progress * Fix templates error * WIP progress * Uwazi entity update/save WIP * Uwazi entity update/save WIP * Fix metadata output * WIP uwazi from prompt * get file for media widget * add files to entity * make list mutable * Added UwaziImageWidget with options to select image from gallery or take a photo with camera * Fixed Title prompt in each Entity * Draft entities items fix * WIP send entity * hot fixes + gradle update * Show info when draft is saved * get/put answers from/to the form * WIP fixing * change the uwazi files table name * Fix status error * Finish fixes * Plus icon for downloading templates * Fix open entity flow * Add open draft functionnality * Uwazi Date widget wip * Load draft Uwazi form for edit wip * IUwaziAnswer as answer interface for Uwazi * remove api constant from url * GeoPointWidget with map, WIP * Cache Uwazi language cookies and add it to headers * Show validation error on title, ask for gps permissions on uwazi form entry * Fix uwazi widgets format * Delete unnecessary classes * Fix uwazi geo widget * WIP uwazi submitted preview * adapt date design * Fix tabs colors * Show validation error for required fields * Uwazi DataRange field * Support sending uwazi markdown as simple string * link widget wip * add dictionary and mapper data layer * UwaziLinkWidget, markdown help text added * SelectOne widget for Uwazi * MultiSelectWidget WIP * Open Submitted Instance for view WIP * quick fix preview uploaded files * Fix multi select widget * Fix list design * Open/Edit outbox entity * WIP fix submission flow * Fix flow between fragments switch instance status * refresh fragments on delete * Fix submission and entry * minior design fixes * Release 2.0.0-alpha16 (77) * - Name the screen after a template title, - If saving a draft, validate only title of entity * Fix parsing long in numeric widget * Remove unnecessary margin on the screen to enter Uwazi entity * Fix feedback * Complete translations * Show snackbar to notify user to fill the mandatory fields or just title * Uwazi multi date WIP * Add/remove multidate views WIP * MultiDateWidget wip * MultiDateRangeWidget wip * Fix error for fetching data when return to fragment * Fix uwazi multi range date submission * Update uwazi templates * Fix MultiDateRange + MultiDate * Release "2.0.0-alpha18" (79) * Open full submitted instance * Show file thumbs on UwaziFormEndView * Add constraint to Date ranges: the second date must be after the first in the range * Fix toolbar translation issue * add submitted item status into entity * Fix multiselect * Set title question as title (common property) field translatedLabel * Fix crash on LocationMapActivity cancel * MultiFilesWidget wip * WIP file picker selector * WIP (image/media) picker * WIP (Bottom sheet + import) * MultiFileWidget WIP * MultiFileWidget show number of attached files * Put pdf and support files to entity * Fixed typo * Do not recreate the fragment when hitting back * Fix uwazi multi media widget preview (Draft/Outbox) * Fix (Image/Media) preview for Draft/Outbox * import wip * import images to uwazi * fix import * Fix outbox flow * Allow getting location with GPS on and off * UwaziImageWidget - get image via Camera * Fix uwazi (media) sheet/ import * Fix uwazi import * Uwazi Widgets fix file name preview * Icons for preview audio and docs in uwazi forms * Get selected files as list of IDs WIP * Fix preview for media and photos * Add imported files to form * remove unused functions and comment racording audio for now * Fix multi select preview * show info o audio files * Fix get intent selector * Fix media crash (We don't need to select files for One File media) * Fix uwazi submission * Fix submission error * Some ui fixes * add attrs * remove redundant string * UwaziMultiFileWidget UI fixes * T668 - Display "template name" instead of "server name" on entity cards * T666 - Fix text of mandatory field * T667 - Fix Summary screen (end of entity) * Add bottom sheet menu to MultiFileWidget * Fix selecting any file as supporting file * Fix binding + desing * Add pdf filter, label fixes of "select files" bottomsheet * Add my location button to LocationMapActivity * Uwazi form view fix * Fr and es translations * String fixes * Strings for botton nav * unlock strings UI fixes * translateion fixes * Fix templates fragment harcoded header * translation fix * Fix entry fragment strings * Fix crash * T653 - Fix media file attachment * T682 - Update Uwazi attach files copy * Fix T679 - Do not ask for GPS permission when opening a template * Fix T444 - Change timeout when granting permissions & importing files * Fix T686 - Spreadsheets aren't displayed with the 'document' icon * T677 - Fix save draft flow * Delete file * Map entity null if * Parse all uwazi dates as UTC + 12h * Set Uwazi date to UTC 00:00 * Tella French+Arabic translations * Fix build translations * Release Tella-86 (2.0.0-alpha26) * Remove unused strings * Remove unused strings * Map nested URI (Without translation) * Fix code * Nested multiple select WIP * Nested multi select> set initial toggle open * Fix mapper * Support translation * Fix the widget * Check/uncheck all nested boxes by checking header checkbox * Fix widget checkbox stlyes * Add missinng arabic strings, fix keyboard view layout * Put rotating back arrow everyhere, string fixes * Set build version and final fixes * Multi select with indeterminate group check * UwaziSelectOneWidget: updated design and support for nested options * New connection flow * Upgrade Cameraview lib to latest version * add new connect flow strings * Add uwazi connect flow to onboarding + bug fixing Co-authored-by: DjordjeM <[email protected]> Co-authored-by: DjordjeM <[email protected]> Co-authored-by: raphmim <[email protected]>
* Clean Insights UI integration * Add Clean Insights SDK * Update Clean Insights aggregation period * Updates Strings in all localizations * Update Clean insights measuring events
* Clean Insights UI integration * Add Clean Insights SDK * Update Clean Insights aggregation period * Updates Strings in all localizations * Update Clean insights measuring events * Deactivate Clean Insights * Set gradle version 4.1.3 * Fix persist fun
* Fix photo viewer back button crash * Hide Bypass Censorship option * Camera silent mode fix * Create folder string update * Remove extra setIndexWaitingForData * Fix string widget's background on older APIs * T737 - Vault bottom sheet says "save" instead of "save to device" * Fix returning data to UwaziImageWidget
Flip and zoom
* 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
* 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
* WIP reusable component * Release 2.11.0 (185) * New translations from Lokalize for 2.11.0 (Aug 29) (#298) * Release 2.11.0 (186) * WIP reusable component * WIP reusable component logic imp * Remove wrong values from develop (#300) * updated readme linking to documentation and removing old gifs (#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 * fix uwazi multiselect problem (#303) * WIP on develop fix T-And-1519 - Unexpected error when submitting an entity to uwazi related to multi select * remove extra lines * WIP reusable component * WIP apply reusable component on reports * apply changes on outboxes and submitted * refactor base entry and apply it to entry reports * WIP apply reusable component on submit file * apply reusable on submitted * apply pr commits * Fix pr review --------- Co-authored-by: raphmim <[email protected]> Co-authored-by: Carolina Hadad <[email protected]> Co-authored-by: wafa lakhal <[email protected]>
* WIP on google drive login * wip google drive * wip google drive * wip google drive * wip google drive * fix design * add shared view model * wip google drive * wip logique google drive login * fix build * wip google drive * wip google drive * wip google drive * fix dependency injection * add local database to google drive * fix di * finalize google drive login flow correct this * delete extra space * add instance of server for saving google drive * wip google drive * wip google drive * wip google drive * WIP settings * wip google drive * wip google drive * update instance * WIP save google drive server in settings fragment * save server instance in local database * show list servers in settings * Delete server from settings * WIP edit flow * fix authorization issue * WIP add new design setting google drive * Hide edit server for Google drive * remove update server and fix display * fix display and refactor code * add server to homescreen * fix drawable icon * Add configuration for google drive drafts submitted outbox * save draft in database * display get list of drafts in google drive * implement delete google drive draft * add delete draft, get outbox reports * wip google * Fix get servers * Add draft with media * load outbox/submitted * wip google send * fix send problem * wip google send * WIP on feat/google_drive_report * send SkippableMediaFileRequestBody * fix folderId * WIP on feat/google_drive_report * create folder * create folder and upload file * wip google drive * WIP on feat/google_drive_report * WIP good drive * Fix submission * Fix save in the database * fix submission * fix double send files * Fix back problem * fix submitted fragment navigation * Fix delete issue * fix design * update gradle * fix gradle issue * finish tab position * Fix entry back button * Fix back button send Fragment * Fix back button in submitted/home screen * Fix Outbox/Submitted title * fix crash in report * wip fix button * wip google drive * add version in the common build.gradle file * remove extra line * reformat * Fix delete problem * fix pr comments * fix pr comments * fix pr comments * fix pr comments * fix pr comments * stop tracking config file * Clean code --------- Co-authored-by: Ahlem Jarrar <[email protected]>
* WIP on feat/analytics-v1 add icon * add icon of google drive * add permission to handle uploading on shared folders * Fix icon * Improve home vault adapter * insurance that view is not updated is not initialized * Fix crash + counts on reports * Cleanup code + work around to fix the google drive home icon * Fix crash for update language * improve list servers visibility --------- Co-authored-by: Ahlem Jarrar <[email protected]>
* 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 * Time spent metric * Record to analytics photo taken, video taken, audio taken, and file import event * Record to analytics camouflage, quick delete, report sent, odk form sent, and uwazi form sent. * Analytics switch title * code fix * Count time spent WIP * Time spent analytics WIP * DivviupUtils Singleton * Release 2.11.0 (185) * New translations from Lokalize for 2.11.0 (Aug 29) (#298) * Release 2.11.0 (186) * Remove wrong values from develop (#300) * updated readme linking to documentation and removing old gifs (#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 * Finish divviup implementation * fix analytics * remove divviup.xml from git * WIP fix shared Prefernces issue --------- Co-authored-by: Ahlem Jarrar <[email protected]> Co-authored-by: wafa lakhal <[email protected]> Co-authored-by: DjordjeM <[email protected]> Co-authored-by: raphmim <[email protected]> Co-authored-by: Carolina Hadad <[email protected]>
* Fix server problem * Fix imporvements + delete
* add dropbox implementation * Add dropbox design * WIP show drop box server dialog * WIP dropbox connect flow * Get access token * Configure local properties for drop box key * wip get credentials * fix error * WIP go to dropbox server * Imporove code * implement data source * save dropbox server * delete dropbox server * add dropbox server connexion on home screen * add reusable components implementation for dropbox section * wip dropbox navigation * Fix settings flow * Clean up code * List (Draft/Outbox/Submitted) * list servers * Correct google drive project structure * Correct function name in google drive * save report (Draft/outbox/submitted) * Fix delete in google drive * Delete drop box report * Fix view model * Fix navigation * Fix dropbox submitted navigation * Finish upload dropbox files and create folder * WIP refresh flow / fix navigation * WIP connect flow * add coomments * wip refresh token * wip refresh token * fix update flow * wip refresh token * Fix upload files * update status when pending report * Fix dropbox client creation * send file description * add icon of dropbox and fix instance title to create the folder * Fix show/hide center empty text * add extra space for empty text * T-And-1541 - Follow design for reusable components fix delete bottom sheet * Show header top message * fix T-And-1538 - Update the About and Help page * T-And-1540 - Make sure the privacy preserving metrics apply to new server connection dropBox * fix T-And-1537 - Adapt Quick Delete security settings to new server connections (Google drive, DropBox) * adapt Quick delete * Fix T-And-1539 - Follow design for Connections screen * fix T-And-1530 - Crash when sending a file with verification activated * remove unused imports * fix T-And-1543 - Combined relationships when there is more than 1 relationship property (of the same type) in the same template * T-And-1040 - Stuck in microphone after going back to the audio library Fix * Fix repository * Fix gradle * review code * clean code * Fix dropbox header fragment * Fix dropbox string --------- Co-authored-by: wafa <[email protected]>
* Design fixes * Clean code * Fix servers refresh home screen * Fix T-And-1539 - Follow design for Connections screen * Fix design
* New translations from Lokalize for 2.14.0 (Nov 28) * Fix unecessary strings --------- Co-authored-by: Ahlem Jarrar <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull requests should be opened against the
developbranch. For more information on contributing to Tella source code, see the Contributor Guidelines.Type of change
Description:
Select the type of change(s) made in this pull request:
Fixes #issue-number
Proposed changes