SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3 #911
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
updating local
Updating local
|
The status is success |
YenumJay
reviewed
Oct 7, 2021
YenumJay
added
question
|
Done
Done |
pauleke65
reviewed
Oct 7, 2021
lib/ui/view/organization/organization_different_email/different_email_organization_view.dart
Outdated
Show resolved
Hide resolved
pauleke65
reviewed
Oct 7, 2021
lib/ui/view/organization/select_email/select_email_viewmodel.dart
Outdated
Show resolved
Hide resolved
pauleke65
suggested changes
Oct 7, 2021
|
The status is success |
YenumJay
suggested changes
Oct 7, 2021
All done |
|
The status is success |
|
All done |
|
The status is success |
YenumJay
approved these changes
Oct 7, 2021
pauleke65
added a commit
that referenced
this pull request
Oct 17, 2021
* Resolved all Flutter Analyze issues * Updated CI/CD * set to current flutter version * minor fixes * conflict resolved * Update sixth_section.dart * feat: main string extracted * feat: app_strings file created * feat: auth screens strings extracted * feat: forgotPassword (1) screens strings extracted * feat: forgotPassword (2) screens strings extracted * feat: all auth screens strings extracted * feat: all auth screens strings extracted * Edit Profile fix * Removed unused imports and variable * Used ApiService * mockito test * feat: home dir strings extracted * Update styles.dart * Delete pubspec.lock~4582368fc8897fcec50eaef42114ba400e0a85ce * Create pubspec.lock~e532f9e99f92288efa68551c4a034ec3c156894d * Fixed Mockito Test Error * Add People to Channel Conflict Resolved (#838) * Add User to Channel Workflow UI * Add User to Channel Workflow UI * Add User to Channel UI Workflow * Draft UI Workflow Implementation * Add User to Channel Workflow UI Requested changes made to previous previous pull. * Update dart.yml please don't edit workflows or build files * changes made * add people to channel phaseone * Add Users To Channel Add Users to Channel * Recent Update Add People To Channel list members of the organiztion in the channel * Add People to Channel * changes * Conflicts Resolved * conflicts resolved * resolved * Delete dart.yml Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com> Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com> Co-authored-by: Paul Imoke <pauleke65@gmail.com> * feat: dm dir strings extracted * feat: integrate dir strings extracted * fixed label build flutter version * Additional Error detection step * added notification service * added notification service to app file * feat: youPage dir strings extracted * feat: draftedMsg dir strings extracted * feat: ui/shared/smart_widgets dir strings extracted * feat: ui/shared/dialogs dir strings extracted * feat: custom_user_bottomsheet dir strings extracted * feat: resolved conflicts * API Abstract Class implemented (#849) * API service started * API Abstract Class An abstract class has been created and all services have been registered accordingly. * API Updated * Unused imports removed * More Unused imports removed * error files * tested notification * tested listen to notification * Latest working mockito test * made rtc global * Revert "feat: resolved conflicts" This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5. * fixed analyzer issues * Revert "feat: resolved conflicts" This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5. * fixed analyzer issues * Mockito Test SetUp For Stacked * analyze package error fix * Stacked Generator Error Fix * registered services in test * Updated analyzer * added test checker to workflow * resolved analyzer issues * fixed some analyzer issues * Fixed issues (#863) * API service started * API Abstract Class An abstract class has been created and all services have been registered accordingly. * API Updated * Unused imports removed * More Unused imports removed * API minor corrections * Fixed issues * Update app.dart Co-authored-by: Paul Imoke <pauleke65@gmail.com> * fixed app.dart * Preference in Organization list (#825) * rebased upstream/dev into dev * little fix * little fix mistake fix * changes made * fixed more analyzer issues 1 * fixed more analyzer issues 2 * Freezed and serialized models (#854) * f/post * Corrections * edited * Replace connectivity with connectivity_plus to fix fail build * Replace connectivity with connectivity_plus to fix fail build * checkout pr warning Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com> * fixed more analyzer issues plus fixes for organisations list * fixed analyzer issues 3 * made some changes to centrifugo * Analysis update (#867) * fixed some analyzer issues * fixed more analyzer issues 1 * fixed more analyzer issues 2 * fixed more analyzer issues plus fixes for organisations list * fixed analyzer issues 3 * excluded app logger, and forms from flutter analyze * optimized code and added type to untyped variables * refactored drafts view * corrected test * refactored view model widget naming * Delete channel and Expanded textfield (#865) * Delete Channel Functionality completed * Expandable channel textfield phase 1 * Expandable channel textfield done * Expandable Textfield icons changed * flutter analyse errpors fixed * flutter analyse errors fixed * Resolved flutter analyze error * requested changes fixed Co-authored-by: Lord_Chris <maduekechris@gmail.com> * feat: Channel Threads(Add and receive replies) (#871) * fix: workspace * feat: Receiving replies in threads in channels * fix: added loader to run while fetching replies * feat: add replies to messages in channel * updating local * feat: cleaned up in-channel thread feature * fix:updating PR to fit upstream * fix: removed code put in comment block earlier * fix: removed repetitive code(workspace view) * refactored centrifuge service * showed notification in application * Channel Message Error Checking (#872) * Delete Channel Functionality completed * Expandable channel textfield phase 1 * Expandable channel textfield done * Expandable Textfield icons changed * flutter analyse errpors fixed * flutter analyse errors fixed * Resolved flutter analyze error * requested changes fixed * Channel Error message Check Co-authored-by: Lord_Chris <maduekechris@gmail.com> * made channels and home page to be notification aware * refactored notification service * Feat: Start a Thread Message (#877) * Fixed overflow error on Chat Message * Sign out workflow completed. Connected to backend api * Removed cupertino import from SignOut viewmodel * Removed unused imports * Feat: Reply message in thread, connected to the backend * Fixed UI errors * Removed threads api service since it wasn't my task * Fixed lint issues * Added const to widget * fixed analyze issues * feat: add_people strings extracted * feat: advanced strings extracted * re-extracted addPeople * channelInfo * channels view strings extracted * channels list * channels notif * channel view * channel view * edit channel extracted * removed the comment * new channel extracted * feat: channels dir cleared - all strings extracted * clear after done * clear notif done * create channel done * dm done * deleted comments * dm jumpTo done * dm search done * fixed PR test issue with undefined var, done with dm_user strings * dm_user dir done * Implementation of get and store all the users in an organization (#874) * added implementation for get and store organization member list * fix made * unit test for the connectivity service (#882) * unit test for the connectivity service * updated the test description * Fix new message screen (#884) * Fixed new message screen * Fixed new message screen Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com> * Implement Adding Members To A Channel (#879) * Implement Adding Members To A Channel * Remove Unused Code And Improve UX * RegEx Update for Text parser (#848) * Edit Profile fix * Removed unused imports and variable * Used ApiService * Updated RegEx * Unit test for RegEx * Removed launch import * Fixed launch package in utilities * Fixed test errors * Changed test description * Made changes to test description * Updated RegEx list with tests * unit tests for advanced_viewmodel and channel_add_people viewmodel (#876) * unit tests for advanced and channel_add_people viewmodel * Resolve conflicts * resolved conflict as a result of changes made in channel_add_people_viewmodel * Solve ci issues * removed unused code * Unit Tests of AddPeopleViewModel and YouPageViewModel (#889) * added implementation for get and store organization member list * fix made * little fix * Unit Tests of AddPeopleViewModel and YouPageViewModel * a little fix * fix made * Feat: Sign Out User (#828) * Fixed overflow error on Chat Message * Sign out workflow completed. Connected to backend api * Removed cupertino import from SignOut viewmodel * Removed unused imports * Now using BottomSheet and Dialog services * Removed unused import * Project-wide strings extraction 3/3 (#886) * dnd done * draft done * edit profile done * file search done * lang and region done * notifs done * organisation screens string extracted * Splash, Profile strings extracted * feat: threads and user search strings extracted * feat: flutter analyze issues resolved * fixed undefined symbol * Unit tests for all forget password and login view models (#887) * Unit tests for all forget password and login views * removed unused imports and variables * removed unused import * Changes made, No issues Found in Flutter Analyze * Fixed Failing test - Connectivity Service * Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870) * commit * commit * local storage unit test * commit * changes * Local storage unit test * Removed the test package that was initially added * Unit tests * committ * fized syntax error * Removed unused code * fixed build error * fixed test build errors * Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883) * retrieved the current user's details from the API * retrieved the current user's details from the API * latest changes * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/nav_pages/you_page/you_page_view.dart # lib/ui/nav_pages/you_page/you_page_viewmodel.dart # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart * Unit tests * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/view/direct_message/direct_message.dart * Changes made * Added drag feature to the expandable textfield (#888) * Delete Channel Functionality completed * Expandable channel textfield phase 1 * Expandable channel textfield done * Expandable Textfield icons changed * flutter analyse errpors fixed * flutter analyse errors fixed * Resolved flutter analyze error * requested changes fixed * Expanded textfield refactored * Channel Error message Check * Exanded Textfield given more life Co-authored-by: Lord_Chris <maduekechris@gmail.com> * unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880) * unit tests for channels viewmodels * unit-tests requested changes made * changed navigator to _navigationService * Fixed flutter ananlyze issues * Fixed Errors * implemented and tested the service for profile picture upload (#875) * testss * media service test * service test * final changes * added constants file * added a media service test * fixed conflicts * fixed conflicts * fixed test conflicts * fixes * fixes * conflicts resolved * fixed all conflicts * Fixed conflicts * Solved issues * fixed json serializable issue * fixed pubspec errors * fixed test issues * fixed issues * nullable fix * fix * final fix Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com> * unit test on newchannel and clearAfter view models (#892) * commit * commit * Fixes 1/2 (#899) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * DM screen fix (#900) * Fixed new message screen * Fixed new message screen Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com> * Passed Channel data and Update Channel Details Implementation (#898) * passed the channel data to the edit channel screen * passed the channel data to the edit channel page * changes made * changes made * changes made * changes made * channel data passed to the edit channel screen and implementation of put request for the edit channel screen * navigate back to screen implemented * removed unnecessary codes * removed unnecessary lines of code * changes added * Draft implementations (#897) * Update storage_keys.dart * draft implementations * draft implementations * minor fixes * testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test * Update dm_jump_to_viewmodel.dart * Update dm_jump_to_viewmodel.dart * draft implementations routing functionality within the draft view * Update pubspec.lock * drafts routing implementation in draft UI * minor fixes * Revert "Draft implementations (#897)" (#901) This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654. * Fixes 2/2 (#902) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * pulled from dev * refactoring 2 * fixes 2/2 * Zuri App Bar added (#904) * Removed unused package * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * App launcher icon done (#908) * App launcher icon done * App icon launcher done * Delete widget_test.dart * Saved Items Implementation (#909) * Removed unused package * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Added More Features to Thread Cards (#910) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * pulled from dev * refactoring 2 * fixes 2/2 * added more features to thread card * added more features to thread card 2 * SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3 (#911) * fix: workspace * feat: Receiving replies in threads in channels * fix: added loader to run while fetching replies * feat: add replies to messages in channel * updating local * feat: cleaned up in-channel thread feature * fix:updating PR to fit upstream * fix: removed code put in comment block earlier * fix: removed repetitive code(workspace view) * updating local * preparing for update * UI: Use different email for Creating Organization * updaing local * SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3 * moved the T&C text into the general app_strings file * fix: for failing workflow job * removed comment in code * removed comment in code * swapped dummy T&C data for real data * Added the option for new users to input their name when signing up & UI fixes (#912) * retrieved the current user's details from the API * retrieved the current user's details from the API * latest changes * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/nav_pages/you_page/you_page_view.dart # lib/ui/nav_pages/you_page/you_page_viewmodel.dart # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart * Unit tests * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/view/direct_message/direct_message.dart * Changes made * Added the option for new users to input their name when signing up & UI fixes * more UI fixes * change made * Jump to: Channels and Users Navigation (#913) * Fixed overflow error on Chat Message * Sign out workflow completed. Connected to backend api * Removed cupertino import from SignOut viewmodel * Removed unused imports * Now using BottomSheet and Dialog services * Removed unused import * Implemented navigation for the Jump To page for both users and channels * Changed from GestureDetector to InkWell for user clicks * Deleted commented code * Extracted user avatar url to App Strings * Centered TextField widget text * Different email workflow Completed (#906) * Delete Channel Functionality completed * Expandable channel textfield phase 1 * Expandable channel textfield done * Expandable Textfield icons changed * flutter analyse errpors fixed * flutter analyse errors fixed * Resolved flutter analyze error * requested changes fixed * Expanded textfield refactored * Channel Error message Check * Exanded Textfield given more life * Different email workflow phase 1 * Different email workflow completed * changes changed Co-authored-by: Lord_Chris <maduekechris@gmail.com> * Edit Profile and Create Organization with default email (#914) * Conflicts resolved * Create organization with default email completed * Edit profile done * resolved changes requested Co-authored-by: Lord_Chris <maduekechris@gmail.com> * Snack bar Error Messages (#918) * commit * commit * local storage unit test * commit * changes * Local storage unit test * Removed the test package that was initially added * Unit tests * committ * fized syntax error * Removed unused code * fixed build error * fixed test build errors * commit * Make error snackbars displa the error message received from the server * Saved Items Implementation contd. (#916) * Removed unused package * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * Implemented SignOut From All Organization. (#920) * update * Updating Master * Implementing Localization * Updating Localization Implementations * Cleaned Codes * Fixes * Implemented Feedbacks * Theme Fixes 1/2 (#915) * dnd done * draft done * edit profile done * file search done * lang and region done * notifs done * organisation screens string extracted * Splash, Profile strings extracted * feat: threads and user search strings extracted * feat: flutter analyze issues resolved * fixed undefined symbol * stashing work * removed unused import * Themes impl: removing static colors * added theme storage keys * feat: sign up done * theme: auth screens * forgotPass, org and prefDialog * fixed flutter analyze issue * preference_view dark mode fixed * nav_bar dark mode fixed * org dark mode fixed * dm dark mode fixed * home dark mode fixed * sign out bottomSheet dark mode fixed * you page dark mode fixed * added TODO- app crashing bug pulled from upstream * Make sure the UI of the homepage matches the design and jump to behavior matches the one on slack (#919) * fixed centrifuge error * refactored the ui of the home page * added animatiion to jump to * removed import * removed comment * How to copy text and paste on ZuriChat Mobile App (#924) * Copy and paste * Changes requested fixed. Remove the comments * Major Fixes (#927) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * Removed unused package * pulled from dev * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * added the floating action icon * icons * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * implementation of plugin screen and direct message * halt * fix 1 * AppBar fixes This is because the theme service broke the appbar so it has been fixed * Color and logo updated * fixes done * Search bar updated * General fixes * Webview working with a loader * Minor fixes * Token cannot be null * Small fixes * Update custom_user_bottom_sheet_viewmodel.dart * AppBar changed Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com> * Fixes on plugin screen and the home page floating action button (#931) * added the floating action icon * icons * implementation of plugin screen and direct message * fixes * fix conflicts * Perfecting the draft Implementation (#922) * Update storage_keys.dart * draft implementations * draft implementations * minor fixes * testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test * Update dm_jump_to_viewmodel.dart * Update dm_jump_to_viewmodel.dart * draft implementations routing functionality within the draft view * Update pubspec.lock * drafts routing implementation in draft UI * minor fixes * draft fixes * Update channel_page_viewmodel.dart * conflict fixes * Draft implementation bug fixes * Update home_page.dart * draft UI bug fixes and Draft implementation bug fixes * Update home_list_items.dart * draft implementation thread route fixes * Update home_list_items.dart * Update drafts.dart * Update dm_user_viewmodel.dart * fixes * Dialog service setup for draft delete dialog * Update draft_viewmodel.dart * Update pubspec.lock * minor fixes * minor fixes * Update thread_detail_viewmodel.dart * draft UI * Remind Me functions (#921) * Unit tests for all forget password and login views * removed unused imports and variables * removed unused import * Changes made, No issues Found in Flutter Analyze * Fixed Failing test - Connectivity Service * Unit Tests of AddPeopleViewModel and YouPageViewModel (#889) * added implementation for get and store organization member list * fix made * little fix * Unit Tests of AddPeopleViewModel and YouPageViewModel * a little fix * fix made * Feat: Sign Out User (#828) * Fixed overflow error on Chat Message * Sign out workflow completed. Connected to backend api * Removed cupertino import from SignOut viewmodel * Removed unused imports * Now using BottomSheet and Dialog services * Removed unused import * Project-wide strings extraction 3/3 (#886) * dnd done * draft done * edit profile done * file search done * lang and region done * notifs done * organisation screens string extracted * Splash, Profile strings extracted * feat: threads and user search strings extracted * feat: flutter analyze issues resolved * fixed undefined symbol * Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870) * commit * commit * local storage unit test * commit * changes * Local storage unit test * Removed the test package that was initially added * Unit tests * committ * fized syntax error * Removed unused code * fixed build error * fixed test build errors * Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883) * retrieved the current user's details from the API * retrieved the current user's details from the API * latest changes * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/nav_pages/you_page/you_page_view.dart # lib/ui/nav_pages/you_page/you_page_viewmodel.dart # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart * Unit tests * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/view/direct_message/direct_message.dart * Changes made * Added drag feature to the expandable textfield (#888) * Delete Channel Functionality completed * Expandable channel textfield phase 1 * Expandable channel textfield done * Expandable Textfield icons changed * flutter analyse errpors fixed * flutter analyse errors fixed * Resolved flutter analyze error * requested changes fixed * Expanded textfield refactored * Channel Error message Check * Exanded Textfield given more life Co-authored-by: Lord_Chris <maduekechris@gmail.com> * unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880) * unit tests for channels viewmodels * unit-tests requested changes made * changed navigator to _navigationService * Fixed flutter ananlyze issues * Fixed Errors * implemented and tested the service for profile picture upload (#875) * testss * media service test * service test * final changes * added constants file * added a media service test * fixed conflicts * fixed conflicts * fixed test conflicts * fixes * fixes * conflicts resolved * fixed all conflicts * Fixed conflicts * Solved issues * fixed json serializable issue * fixed pubspec errors * fixed test issues * fixed issues * nullable fix * fix * final fix Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com> * unit test on newchannel and clearAfter view models (#892) * commit * commit * Fixes 1/2 (#899) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * DM screen fix (#900) * Fixed new message screen * Fixed new message screen Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com> * Passed Channel data and Update Channel Details Implementation (#898) * passed the channel data to the edit channel screen * passed the channel data to the edit channel page * changes made * changes made * changes made * changes made * channel data passed to the edit channel screen and implementation of put request for the edit channel screen * navigate back to screen implemented * removed unnecessary codes * removed unnecessary lines of code * changes added * Draft implementations (#897) * Update storage_keys.dart * draft implementations * draft implementations * minor fixes * testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test * Update dm_jump_to_viewmodel.dart * Update dm_jump_to_viewmodel.dart * draft implementations routing functionality within the draft view * Update pubspec.lock * drafts routing implementation in draft UI * minor fixes * Revert "Draft implementations (#897)" (#901) This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654. * Fixes 2/2 (#902) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * pulled from dev * refactoring 2 * fixes 2/2 * Zuri App Bar added (#904) * Removed unused package * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Message reminder * Merge branch 'dev' of https://github.com/zurichat/zc_app into dev * pubspec.lock * Remind me functions * Changed test values in reminder function * Switched to Awesome Notification Package * Merged upstream * Refactored code * Refactor Changes * removed unused import * Changes made * Requested Changes * fixed CI/CD issues Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com> Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com> Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com> Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com> Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com> Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com> Co-authored-by: Lord_Chris <maduekechris@gmail.com> Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com> Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com> Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com> Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com> Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com> Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com> Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com> Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com> * Included Scheduling Message Feature (#933) * Implementation of invite flow screens (Project ticket on linear) (#936) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * Removed unused package * pulled from dev * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * added the floating action icon * icons * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * implementation of plugin screen and direct message * halt * fix 1 * AppBar fixes This is because the theme service broke the appbar so it has been fixed * Color and logo updated * fixes done * Search bar updated * General fixes * Webview working with a loader * Minor fixes * Token cannot be null * Small fixes * Update custom_user_bottom_sheet_viewmodel.dart * AppBar changed * fixes * fix conflicts * Minor fixes General fixes around the appbar region and the organization * implemented invite flow screens * Minor fixes Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com> * Minor fixes (#938) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * Removed unused package * pulled from dev * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * added the floating action icon * icons * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * implementation of plugin screen and direct message * halt * fix 1 * AppBar fixes This is because the theme service broke the appbar so it has been fixed * Color and logo updated * fixes done * Search bar updated * General fixes * Webview working with a loader * Minor fixes * Token cannot be null * Small fixes * Update custom_user_bottom_sheet_viewmodel.dart * AppBar changed * fixes * fix conflicts * Minor fixes General fixes around the appbar region and the organization * implemented invite flow screens * Minor fixes * Update saved_items_viewmodel.dart Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com> * Minor dev fixes (#939) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * Removed unused package * pulled from dev * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * added the floating action icon * icons * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * implementation of plugin screen and direct message * halt * fix 1 * AppBar fixes This is because the theme service broke the appbar so it has been fixed * Color and logo updated * fixes done * Search bar updated * General fixes * Webview working with a loader * Minor fixes * Token cannot be null * Small fixes * Update custom_user_bottom_sheet_viewmodel.dart * AppBar changed * fixes * fix conflicts * Minor fixes General fixes around the appbar region and the organization * implemented invite flow screens * Minor fixes Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com> * Enable Pinning Of Messages To A Channel And Show The Pinned Messages (#925) * Show Pinned Messages * Enable Pinning Of Messages * Fix Last Bugs * Rename BottomSheet Callbacks * Display the channel creator in the channel screen (#932) * pods * Create a private channel and display the owner of a channel in the channel screen * Create a private channel and display the owner of a channel in the channel screen * Notification OnClick (#941) * Unit tests for all forget password and login views * removed unused imports and variables * removed unused import * Changes made, No issues Found in Flutter Analyze * Fixed Failing test - Connectivity Service * Unit Tests of AddPeopleViewModel and YouPageViewModel (#889) * added implementation for get and store organization member list * fix made * little fix * Unit Tests of AddPeopleViewModel and YouPageViewModel * a little fix * fix made * Feat: Sign Out User (#828) * Fixed overflow error on Chat Message * Sign out workflow completed. Connected to backend api * Removed cupertino import from SignOut viewmodel * Removed unused imports * Now using BottomSheet and Dialog services * Removed unused import * Project-wide strings extraction 3/3 (#886) * dnd done * draft done * edit profile done * file search done * lang and region done * notifs done * organisation screens string extracted * Splash, Profile strings extracted * feat: threads and user search strings extracted * feat: flutter analyze issues resolved * fixed undefined symbol * Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870) * commit * commit * local storage unit test * commit * changes * Local storage unit test * Removed the test package that was initially added * Unit tests * committ * fized syntax error * Removed unused code * fixed build error * fixed test build errors * Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883) * retrieved the current user's details from the API * retrieved the current user's details from the API * latest changes * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/nav_pages/you_page/you_page_view.dart # lib/ui/nav_pages/you_page/you_page_viewmodel.dart # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart * Unit tests * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/view/direct_message/direct_message.dart * Changes made * Added drag feature to the expandable textfield (#888) * Delete Channel Functionality completed * Expandable channel textfield phase 1 * Expandable channel textfield done * Expandable Textfield icons changed * flutter analyse errpors fixed * flutter analyse errors fixed * Resolved flutter analyze error * requested changes fixed * Expanded textfield refactored * Channel Error message Check * Exanded Textfield given more life Co-authored-by: Lord_Chris <maduekechris@gmail.com> * unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880) * unit tests for channels viewmodels * unit-tests requested changes made * changed navigator to _navigationService * Fixed flutter ananlyze issues * Fixed Errors * implemented and tested the service for profile picture upload (#875) * testss * media service test * service test * final changes * added constants file * added a media service test * fixed conflicts * fixed conflicts * fixed test conflicts * fixes * fixes * conflicts resolved * fixed all conflicts * Fixed conflicts * Solved issues * fixed json serializable issue * fixed pubspec errors * fixed test issues * fixed issues * nullable fix * fix * final fix Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com> * unit test on newchannel and clearAfter view models (#892) * commit * commit * Fixes 1/2 (#899) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * DM screen fix (#900) * Fixed new message screen * Fixed new message screen Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com> * Passed Channel data and Update Channel Details Implementation (#898) * passed the channel data to the edit channel screen * passed the channel data to the edit channel page * changes made * changes made * changes made * changes made * channel data passed to the edit channel screen and implementation of put request for the edit channel screen * navigate back to screen implemented * removed unnecessary codes * removed unnecessary lines of code * changes added * Draft implementations (#897) * Update storage_keys.dart * draft implementations * draft implementations * minor fixes * testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test * Update dm_jump_to_viewmodel.dart * Update dm_jump_to_viewmodel.dart * draft implementations routing functionality within the draft view * Update pubspec.lock * drafts routing implementation in draft UI * minor fixes * Revert "Draft implementations (#897)" (#901) This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654. * Fixes 2/2 (#902) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * pulled from dev * refactoring 2 * fixes 2/2 * Zuri App Bar added (#904) * Removed unused package * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Message reminder * Merge branch 'dev' of https://github.com/zurichat/zc_app into dev * pubspec.lock * Remind me functions * Changed test values in reminder function * Switched to Awesome Notification Package * Merged upstream * Refactored code * Refactor Changes * removed unused import * Changes made * Requested Changes * fixed CI/CD issues * Notificaction onTap changes Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com> Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com> Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com> Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com> Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com> Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com> Co-authored-by: Lord_Chris <maduekechris@gmail.com> Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com> Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com> Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com> Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com> Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com> Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com> Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com> Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com> Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com> * Theme Fixes 2/2 (#940) * dnd done * draft done * edit profile done * file search done * lang and region done * notifs done * organisation screens string extracted * Splash, Profile strings extracted * feat: threads and user search strings extracted * feat: flutter analyze issues resolved * fixed undefined symbol * stashing work * removed unused import * Themes impl: removing static colors * added theme storage keys * feat: sign up done * theme: auth screens * forgotPass, org and prefDialog * fixed flutter analyze issue * preference_view dark mode fixed * nav_bar dark mode fixed * org dark mode fixed * dm dark mode fixed * home dark mode fixed * sign out bottomSheet dark mode fixed * you page dark mode fixed * added TODO- app crashing bug pulled from upstream * stashing work - threads * resolved merge conflicts * preferences view darkmode impl * org screens darkmode impld * threads darkmode impld * plugin page darkmode impld * channel darkthem impld * dm darkmode impld * added theme unit test * resolved conflicts * removed unused imports * removed test class override * Internationalization (#945) * update * Updating Master * Implementing Localization * Updating Localization Implementations * Cleaned Codes * Fixes * Implemented Feedbacks * Implemented All English Words In Json File For Translation * Implemented Chinese Language For App Wide Translation * Deleted es, it, and fr locales * Local Strings For App Wide Language Translation (#946) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * Removed unused package * pulled from dev * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * added the floating action icon * icons * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * implementation of plugin screen and direct message * halt * fix 1 * AppBar fixes This is because the theme service broke the appbar so it has been fixed * Color and logo updated * fixes done * Search bar updated * General fixes * Webview working with a loader * Minor fixes * Token cannot be null * Small fixes * Update custom_user_bottom_sheet_viewmodel.dart * AppBar changed * fixes * fix conflicts * Minor fixes General fixes around the appbar region and the organization * implemented invite flow screens * Minor fixes * Update saved_items_viewmodel.dart * Local Strings For App Wide Language Translation This is required as it gives opportunity to translate all text in the app Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com> * Implemented Arabic Language For App Wide Translation (#947) * update * Updating Master * Implementing Localization * Updating Localization Implementations * Cleaned Codes * Fixes * Implemented Feedbacks * Implemented All English Words In Json File For Translation * Implemented Chinese Language For App Wide Translation * Deleted es, it, and fr locales * Implemented Arabic For App language Wide Tranlation * Added ar Locale * Feat: User Check Before Entering Channel (#948) * Added Zuri Loader (#937) * Included Scheduling Message Feature * Added Default Loader * Update create_organization.dart * Update create_organization.dart * Reduced Logo size and fxed merge conflicts * Editprofile feature again (#951) * Conflicts resolved * Create organization with default email completed * Edit profile done * resolved changes requested * Fixed edit profile feature * app bundle and package name changed Co-authored-by: Lord_Chris <maduekechris@gmail.com> * Revert "Editprofile feature again (#951)" (#953) This reverts commit 2a86a34e155efa34fdf8381ddfeb4cf87b482d86. * Invite to Organization Flow: Send Email to User (#950) * fix: workspace * feat: Receiving replies in threads in channels * fix: added loader to run while fetching replies * feat: add replies to messages in channel * updating local * feat: cleaned up in-channel thread feature * fix:updating PR to fit upstream * fix: removed code put in comment block earlier * fix: removed repetitive code(workspace view) * updating local * preparing for update * UI: Use different email for Creating Organization * updaing local * SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3 * moved the T&C text into the general app_strings file * fix: for failing workflow job * removed comment in code * removed comment in code * swapped dummy T&C data for real data * update * Invite flow WIP * Invite flow 2/3 WIP * Invite to Organization Flow: Send Email to User * removed code in comment * fixing failing workflow * fix: requested changes on Colors used * fix: swapped ModalHUD for ZuriLoader for indicator in InviteView * Channel Info UI fixes (#955) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * Removed unused package * pulled from dev * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * added the floating action icon * icons * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * implementation of plugin screen and direct message * halt * fix 1 * AppBar fixes This is because the theme service broke the appbar so it has been fixed * Color and logo updated * fixes done * Search bar updated * General fixes * Webview working with a loader * Minor fixes * Token cannot be null * Small fixes * Update custom_user_bottom_sheet_viewmodel.dart * AppBar changed * fixes * fix conflicts * Minor fixes General fixes around the appbar region and the organization * implemented invite flow screens * Minor fixes * Update saved_items_viewmodel.dart * Local Strings For App Wide Language Translation This is required as it gives opportunity to translate all text in the app * Channel info UI fixed * Unused import removed Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com> * Display channel type (#957) * Included Scheduling Message Feature * Added Default Loader * Update create_organization.dart * Update create_organization.dart * Reduced Logo size and fxed merge conflicts * Indicate if channel is private or public * allowed deep link (#958) * Implemented All German Language Strings For App-Wide Translation (#959) * update * Updating Master * Implementing Localization * Updating Localization Implementations * Cleaned Codes * Fixes * Implemented Feedbacks * Implemented All English Words In Json File For Translation * Implemented Chinese Language For App Wide Translation * Deleted es, it, and fr locales * Implemented Arabic For App language Wide Tranlation * Added ar Locale * Implementend All German Language Strings For App-Wide Translation * Removed pt Locale * Refactor plus fixes and localization addition (#961) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * pulled from dev * halt * DM workflow * new pull * new pull * refactor plus localization * removed commented codes * Updated Local Strings For Chinese, German and Arabic Languages (#963) * update * Updating Master * Implementing Localization * Updating Localization Implementations * Cleaned Codes * Fixes * Implemented Feedbacks * Implemented All English Words In Json File For Translation * Implemented Chinese Language For App Wide Translation * Deleted es, it, and fr locales * Implemented Arabic For App language Wide Tranlation * Added ar Locale * Implementend All German Language Strings For App-Wide Translation * Removed pt Locale * Feat: Page Transition (#960) * Fixed add button (#962) * Included Scheduling Message Feature * Added Default Loader * Update create_organization.dart * Update create_organization.dart * Reduced Logo size and fxed merge conflicts * Indicate if channel is private or public * Fixed add button * Share messages in channel (#966) * retrieved the current user's details from the API * retrieved the current user's details from the API * latest changes * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/nav_pages/you_page/you_page_view.dart # lib/ui/nav_pages/you_page/you_page_viewmodel.dart # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart * Unit tests * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/view/direct_message/direct_message.dart * Changes made * Added the option for new users to input their name when signing up & UI fixes * more UI fixes * change made * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/ui/view/channel/channel_view/widgets/channel_chat.dart # lib/ui/view/organization/add_organization/add_organization_view.dart # lib/ui/view/organization/select_email/select_email_view.dart * Merge branch 'dev' of https://github.com/zurichat/zc_app # Conflicts: # lib/app/app.dart # pubspec.lock * Localization Woring Properly (#969) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * pulled from dev * halt * DM workflow * new pull * new pull * refactor plus localization * removed commented codes * localization additions * localization service * Localization working * More Strings translation! (#965) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * Removed unused package * pulled from dev * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * added the floating action icon * icons * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * implementation of plugin screen and direct message * halt * fix 1 * AppBar fixes This is because the theme service broke the appbar so it has been fixed * Color and logo updated * fixes done * Search bar updated * General fixes * Webview working with a loader * Minor fixes * Token cannot be null * Small fixes * Update custom_user_bottom_sheet_viewmodel.dart * AppBar changed * fixes * fix conflicts * Minor fixes General fixes around the appbar region and the organization * implemented invite flow screens * Minor fixes * Update saved_items_viewmodel.dart * Local Strings For App Wide Language Translation This is required as it gives opportunity to translate all text in the app * Channel info UI fixed * Unused import removed * Update You page translated and updated app logo * More string interpretation * more codes * more code Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com> * Channel Message Status (#964) * commit * commit * local storage unit test * commit * changes * Local storage unit test * Removed the test package that was initially added * Unit tests * committ * fized syntax error * Removed unused code * fixed build error * fixed test build errors * commit * Make error snackbars displa the error message received from the server * Fixed errors by running build_runner * Channel Message error checking * Removed the 'sent' text * More Strings Interpretation (#970) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * Removed unused package * pulled from dev * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * added the floating action icon * icons * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * implementation of plugin screen and direct message * halt * fix 1 * AppBar fixes This is because the theme service broke the appbar so it has been fixed * Color and logo updated * fixes done * Search bar updated * General fixes * Webview working with a loader * Minor fixes * Token cannot be null * Small fixes * Update custom_user_bottom_sheet_viewmodel.dart * AppBar changed * fixes * fix conflicts * Minor fixes General fixes around the appbar region and the organization * implemented invite flow screens * Minor fixes * Update saved_items_viewmodel.dart * Local Strings For App Wide Language Translation This is required as it gives opportunity to translate all text in the app * Channel info UI fixed * Unused import removed * Update You page translated and updated app logo * More string interpretation * more codes * more code * More interpretation to Strings * code Co-authored-by: Paul Eke <pauleke65@gmail.com> Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com> * Channel Info Screen UI and all implementations (#967) * few changes * Channel info screen UI and all implementations * Channel UI Screen and implementations-v2 * removed unnecesary comments and moved all default text to app_strings.dart file * removed unnecesary comments and moved all default text to app_strings.dart file * Added Local Strings For Arabic, German, English and Chinese Languages. (#972) * update * Updating Master * Implementing Localization * Updating Localization Implementations * Cleaned Codes * Fixes * Implemented Feedbacks * Implemented All English Words In Json File For Translation * Implemented Chinese Language For App Wide Translation * Deleted es, it, and fr locales * Implemented Arabic For App language Wide Tranlation * Added ar Locale * Implementend All German Language Strings For App-Wide Translation * Removed pt Locale * Updated Local Strings For Arabic, German, Chinese and English Languages * Highlight Pinned Messages In ChannelPageView (#949) * Highlight Pinned Message In ChannelPageView * Make Requested Changes * Make Final Requested Change * Use Proper AppTextStyle Values * Remove Unused Import * App fixes plus feature additions (#975) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * pulled from dev * halt * DM workflow * new pull * new pull * refactor plus localization * removed commented codes * localization additions * localization service * Localization working * pre pull * made dark mode cooler, corrected some color issues * properly registered theme service * pre-pull * added persistent locale * Add Image to Expandable Text Widget (#944) * App launcher icon done * App icon launcher done * Delete widget_test.dart * expanded text * Add photo feaature in expandable text * Changes made * Updated Expandable Text Widget * image upload expanded text widget done * Add Image in Expanded Text Widget Done * conflict resolved * resolved conflict * Feat: Logo Update (#977) * changed the splash screen logo and appBar logo * Feat: Changed App Logo * Making major Strings Translation (#976) * fixed app.dart * excluded app logger, and forms from flutter analyze * pull from dev * fixed conflicts * conflicts resolved * repo fixes done * removed test temporarily for phase 1 of repo fix * fixes 1/2 * Removed unused package * pulled from dev * updates * App bar added contd. * More Zuri App Bar added * Unused imports removed * More unused imports removed * Wrapping up Zuri App Bar Making sure Zuri App Bar replaces all other app bars in the app. * ZuriTopBar into ZuriAppBar Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition. * Minor changes * Saved Items for Channels! Presently, this is working with a growable list. * Final touches * Minor adjustments * Delete Saved Items Now, you can delete a saved item without all of it. * Update channel_chat.dart * Update edit_profile_view.dart * added the floating action icon * icons * Saved Items Implementation contd. Saved Items added and configured for Thread messages * More code * implementation of plugin screen and direct message * halt * fix 1 * AppBar fixes This is because the theme service broke the appbar so it has been fixed * Color and logo updated * fixes done * Search bar updated * General fixes * Webview working with a loader * Minor fixes * Token cannot be null * Small fixes * Update custom_user_bottom_sheet_viewmodel.dart * AppBar changed * fixes * fix conflicts * Minor fixes General fixes around the appbar region and the organization * implemented invite flow screens * Minor fixes * Update saved_items_viewmodel.dart * Local Strings For App Wide Language Translation…
jeremiahseun
added a commit
that referenced
this pull request
Oct 30, 2021
* Merging Dev to Master (#903)
* fix: minor issues fix
* fix: Fixed imports, const and others for better app optimization
* Add {@link OtpService} service to share otp code value between the {@link ForgotPasswordOtpViewModel} & {@link ForgotPasswordNewViewModel}
* Add {@link OtpService} service to the locator -- of Stacked arch pattern
* Pass otp code value to {@link OtpService} soon as it is verified not empty.
* Fetch otp code value from {@link OtpService}, and use it in querying backend to update password.
* **Fix: remove red-screen-causing loading indicator to make code presentation-ready.
Consider re-adding.
* Remove unused import
* Remove code that checks if e-mail is registered.
OTP request endpoint handles it.
* Delete line that automatically navigates to new password page notwithstanding invalid otp reset code.
* fix: packages ish and inserted TODO
* .
* Implemented channels test
* jump to UI custom widgets fixes
* Merge branch 'dev' of https://github.com/mariamadebolahamzat/zc_app into dev
* bug fixes
* Added Centrifuge Service
* fixes
* jumpToView UI adjustments made
* clean up validator mixin
* confirm password textfield fix
* UIHelpers on signup and login views
* Testing RTC
* updating local
* added ui spacing to view and edit profile
* Testing RTC 1
* ChannelInfo UI fixes
* Testing RTC 2
* fixing password reset
* conflict resolved
* final fixes RTC
* fixed done
* updating local
* updating staging
* keyboard resize
* fixed open channel
* fixed open channel
* fixed import error
* fixed scroll issues
* fixing reset pass patch req
* fixed loading
* Channel info UI redesigned
Errors fixed and part implementations are made. UI redesigned and the stacked architectural format was followed.
* fix: Enhanced app optimization by reducing the amount of widgets Flutter has to rebuild when it wants to render a new screen
* fixed merge conflicts
* Show Sent Message In A Channel's UI
* refactored channels page view UI
* Resolved all Flutter Analyze issues
* Updated CI/CD
* set to current flutter version
* minor fixes
* conflict resolved
* Update sixth_section.dart
* feat: main string extracted
* feat: app_strings file created
* feat: auth screens strings extracted
* feat: forgotPassword (1) screens strings extracted
* feat: forgotPassword (2) screens strings extracted
* feat: all auth screens strings extracted
* feat: all auth screens strings extracted
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* mockito test
* feat: home dir strings extracted
* Update styles.dart
* Delete pubspec.lock~4582368fc8897fcec50eaef42114ba400e0a85ce
* Create pubspec.lock~e532f9e99f92288efa68551c4a034ec3c156894d
* Fixed Mockito Test Error
* Add People to Channel Conflict Resolved (#838)
* Add User to Channel Workflow UI
* Add User to Channel Workflow UI
* Add User to Channel UI Workflow
* Draft UI Workflow Implementation
* Add User to Channel Workflow UI
Requested changes made to previous previous pull.
* Update dart.yml
please don't edit workflows or build files
* changes made
* add people to channel phaseone
* Add Users To Channel
Add Users to Channel
* Recent Update Add People To Channel
list members of the organiztion in the channel
* Add People to Channel
* changes
* Conflicts Resolved
* conflicts resolved
* resolved
* Delete dart.yml
Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* feat: dm dir strings extracted
* feat: integrate dir strings extracted
* fixed label build flutter version
* Additional Error detection step
* added notification service
* added notification service to app file
* feat: youPage dir strings extracted
* feat: draftedMsg dir strings extracted
* feat: ui/shared/smart_widgets dir strings extracted
* feat: ui/shared/dialogs dir strings extracted
* feat: custom_user_bottomsheet dir strings extracted
* feat: resolved conflicts
* API Abstract Class implemented (#849)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* error files
* tested notification
* tested listen to notification
* Latest working mockito test
* made rtc global
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Mockito Test SetUp For Stacked
* analyze package error fix
* Stacked Generator Error Fix
* registered services in test
* Updated analyzer
* added test checker to workflow
* resolved analyzer issues
* fixed some analyzer issues
* Fixed issues (#863)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* API minor corrections
* Fixed issues
* Update app.dart
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* fixed app.dart
* Preference in Organization list (#825)
* rebased upstream/dev into dev
* little fix
* little fix mistake fix
* changes made
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* Freezed and serialized models (#854)
* f/post
* Corrections
* edited
* Replace connectivity with connectivity_plus to fix fail build
* Replace connectivity with connectivity_plus to fix fail build
* checkout pr warning
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* made some changes to centrifugo
* Analysis update (#867)
* fixed some analyzer issues
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* excluded app logger, and forms from flutter analyze
* optimized code and added type to untyped variables
* refactored drafts view
* corrected test
* refactored view model widget naming
* Delete channel and Expanded textfield (#865)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* feat: Channel Threads(Add and receive replies) (#871)
* fix: workspace
* feat: Receiving replies in threads in channels
* fix: added loader to run while fetching replies
* feat: add replies to messages in channel
* updating local
* feat: cleaned up in-channel thread feature
* fix:updating PR to fit upstream
* fix: removed code put in comment block earlier
* fix: removed repetitive code(workspace view)
* refactored centrifuge service
* showed notification in application
* Channel Message Error Checking (#872)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Channel Error message Check
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* made channels and home page to be notification aware
* refactored notification service
* Feat: Start a Thread Message (#877)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Feat: Reply message in thread, connected to the backend
* Fixed UI errors
* Removed threads api service since it wasn't my task
* Fixed lint issues
* Added const to widget
* fixed analyze issues
* feat: add_people strings extracted
* feat: advanced strings extracted
* re-extracted addPeople
* channelInfo
* channels view strings extracted
* channels list
* channels notif
* channel view
* channel view
* edit channel extracted
* removed the comment
* new channel extracted
* feat: channels dir cleared - all strings extracted
* clear after done
* clear notif done
* create channel done
* dm done
* deleted comments
* dm jumpTo done
* dm search done
* fixed PR test issue with undefined var, done with dm_user strings
* dm_user dir done
* Implementation of get and store all the users in an organization (#874)
* added implementation for get and store organization member list
* fix made
* unit test for the connectivity service (#882)
* unit test for the connectivity service
* updated the test description
* Fix new message screen (#884)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Implement Adding Members To A Channel (#879)
* Implement Adding Members To A Channel
* Remove Unused Code And Improve UX
* RegEx Update for Text parser (#848)
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* Updated RegEx
* Unit test for RegEx
* Removed launch import
* Fixed launch package in utilities
* Fixed test errors
* Changed test description
* Made changes to test description
* Updated RegEx list with tests
* unit tests for advanced_viewmodel and channel_add_people viewmodel (#876)
* unit tests for advanced and channel_add_people viewmodel
* Resolve conflicts
* resolved conflict as a result of changes made in channel_add_people_viewmodel
* Solve ci issues
* removed unused code
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for all forget password and login view models (#887)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
Co-authored-by: Adegoke David <64401859+Blazebrain@users.noreply.github.com>
Co-authored-by: Blazebrain <davidadegoke16@gmail.com>
Co-authored-by: The-indigo <adepojuadeyemi11@gmail.com>
Co-authored-by: Detective_Khalifah <detective.khalifah.dtcfscd@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
Co-authored-by: mayor04 <mayorwa4@gmail.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Detective_Khalifah <58272349+Detective-Khalifah@users.noreply.github.com>
Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
Co-authored-by: Chukwuyenum Adeshina <adeshina.jude@gmail.com>
Co-authored-by: richieoscar <oscaranyiam94@gmail.com>
Co-authored-by: kenziematch <ayelabukola08@gmail.com>
Co-authored-by: Ayela Bukola <81062900+kenziematch@users.noreply.github.com>
Co-authored-by: ugoostanleyibe <ugoostanleyibe@gmail.com>
Co-authored-by: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Co-authored-by: Isaac Adeni Adariku <isaacadariku05@gmail.com>
Co-authored-by: Prince Emelife <princeemelife@gmail.com>
Co-authored-by: eunicePops <40694423+eunicePops@users.noreply.github.com>
Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com>
Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com>
Co-authored-by: Kulex <64699982+Asukwo-comfort@users.noreply.github.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com>
Co-authored-by: Emeka Jideije <75017328+JideijeEmeka@users.noreply.github.com>
Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com>
Co-authored-by: Starhkz <67955282+Starhkz@users.noreply.github.com>
Co-authored-by: Alexchuk <48722111+alecxchuk@users.noreply.github.com>
Co-authored-by: Teslim Hassan <64636170+HassanTeslim007@users.noreply.github.com>
Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com>
Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com>
Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
* Fixes master (#1004)
* Resolved all Flutter Analyze issues
* Updated CI/CD
* set to current flutter version
* minor fixes
* conflict resolved
* Update sixth_section.dart
* feat: main string extracted
* feat: app_strings file created
* feat: auth screens strings extracted
* feat: forgotPassword (1) screens strings extracted
* feat: forgotPassword (2) screens strings extracted
* feat: all auth screens strings extracted
* feat: all auth screens strings extracted
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* mockito test
* feat: home dir strings extracted
* Update styles.dart
* Delete pubspec.lock~4582368fc8897fcec50eaef42114ba400e0a85ce
* Create pubspec.lock~e532f9e99f92288efa68551c4a034ec3c156894d
* Fixed Mockito Test Error
* Add People to Channel Conflict Resolved (#838)
* Add User to Channel Workflow UI
* Add User to Channel Workflow UI
* Add User to Channel UI Workflow
* Draft UI Workflow Implementation
* Add User to Channel Workflow UI
Requested changes made to previous previous pull.
* Update dart.yml
please don't edit workflows or build files
* changes made
* add people to channel phaseone
* Add Users To Channel
Add Users to Channel
* Recent Update Add People To Channel
list members of the organiztion in the channel
* Add People to Channel
* changes
* Conflicts Resolved
* conflicts resolved
* resolved
* Delete dart.yml
Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* feat: dm dir strings extracted
* feat: integrate dir strings extracted
* fixed label build flutter version
* Additional Error detection step
* added notification service
* added notification service to app file
* feat: youPage dir strings extracted
* feat: draftedMsg dir strings extracted
* feat: ui/shared/smart_widgets dir strings extracted
* feat: ui/shared/dialogs dir strings extracted
* feat: custom_user_bottomsheet dir strings extracted
* feat: resolved conflicts
* API Abstract Class implemented (#849)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* error files
* tested notification
* tested listen to notification
* Latest working mockito test
* made rtc global
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Mockito Test SetUp For Stacked
* analyze package error fix
* Stacked Generator Error Fix
* registered services in test
* Updated analyzer
* added test checker to workflow
* resolved analyzer issues
* fixed some analyzer issues
* Fixed issues (#863)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* API minor corrections
* Fixed issues
* Update app.dart
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* fixed app.dart
* Preference in Organization list (#825)
* rebased upstream/dev into dev
* little fix
* little fix mistake fix
* changes made
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* Freezed and serialized models (#854)
* f/post
* Corrections
* edited
* Replace connectivity with connectivity_plus to fix fail build
* Replace connectivity with connectivity_plus to fix fail build
* checkout pr warning
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* made some changes to centrifugo
* Analysis update (#867)
* fixed some analyzer issues
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* excluded app logger, and forms from flutter analyze
* optimized code and added type to untyped variables
* refactored drafts view
* corrected test
* refactored view model widget naming
* Delete channel and Expanded textfield (#865)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* feat: Channel Threads(Add and receive replies) (#871)
* fix: workspace
* feat: Receiving replies in threads in channels
* fix: added loader to run while fetching replies
* feat: add replies to messages in channel
* updating local
* feat: cleaned up in-channel thread feature
* fix:updating PR to fit upstream
* fix: removed code put in comment block earlier
* fix: removed repetitive code(workspace view)
* refactored centrifuge service
* showed notification in application
* Channel Message Error Checking (#872)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Channel Error message Check
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* made channels and home page to be notification aware
* refactored notification service
* Feat: Start a Thread Message (#877)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Feat: Reply message in thread, connected to the backend
* Fixed UI errors
* Removed threads api service since it wasn't my task
* Fixed lint issues
* Added const to widget
* fixed analyze issues
* feat: add_people strings extracted
* feat: advanced strings extracted
* re-extracted addPeople
* channelInfo
* channels view strings extracted
* channels list
* channels notif
* channel view
* channel view
* edit channel extracted
* removed the comment
* new channel extracted
* feat: channels dir cleared - all strings extracted
* clear after done
* clear notif done
* create channel done
* dm done
* deleted comments
* dm jumpTo done
* dm search done
* fixed PR test issue with undefined var, done with dm_user strings
* dm_user dir done
* Implementation of get and store all the users in an organization (#874)
* added implementation for get and store organization member list
* fix made
* unit test for the connectivity service (#882)
* unit test for the connectivity service
* updated the test description
* Fix new message screen (#884)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Implement Adding Members To A Channel (#879)
* Implement Adding Members To A Channel
* Remove Unused Code And Improve UX
* RegEx Update for Text parser (#848)
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* Updated RegEx
* Unit test for RegEx
* Removed launch import
* Fixed launch package in utilities
* Fixed test errors
* Changed test description
* Made changes to test description
* Updated RegEx list with tests
* unit tests for advanced_viewmodel and channel_add_people viewmodel (#876)
* unit tests for advanced and channel_add_people viewmodel
* Resolve conflicts
* resolved conflict as a result of changes made in channel_add_people_viewmodel
* Solve ci issues
* removed unused code
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for all forget password and login view models (#887)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* Zuri App Bar added (#904)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* App launcher icon done (#908)
* App launcher icon done
* App icon launcher done
* Delete widget_test.dart
* Saved Items Implementation (#909)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Added More Features to Thread Cards (#910)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* added more features to thread card
* added more features to thread card 2
* SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3 (#911)
* fix: workspace
* feat: Receiving replies in threads in channels
* fix: added loader to run while fetching replies
* feat: add replies to messages in channel
* updating local
* feat: cleaned up in-channel thread feature
* fix:updating PR to fit upstream
* fix: removed code put in comment block earlier
* fix: removed repetitive code(workspace view)
* updating local
* preparing for update
* UI: Use different email for Creating Organization
* updaing local
* SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3
* moved the T&C text into the general app_strings file
* fix: for failing workflow job
* removed comment in code
* removed comment in code
* swapped dummy T&C data for real data
* Added the option for new users to input their name when signing up & UI fixes (#912)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added the option for new users to input their name when signing up & UI fixes
* more UI fixes
* change made
* Jump to: Channels and Users Navigation (#913)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Implemented navigation for the Jump To page for both users and channels
* Changed from GestureDetector to InkWell for user clicks
* Deleted commented code
* Extracted user avatar url to App Strings
* Centered TextField widget text
* Different email workflow Completed (#906)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
* Different email workflow phase 1
* Different email workflow completed
* changes changed
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* Edit Profile and Create Organization with default email (#914)
* Conflicts resolved
* Create organization with default email completed
* Edit profile done
* resolved changes requested
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* Snack bar Error Messages (#918)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* commit
* Make error snackbars displa the error message received from the server
* Saved Items Implementation contd. (#916)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* Implemented SignOut From All Organization. (#920)
* update
* Updating Master
* Implementing Localization
* Updating Localization Implementations
* Cleaned Codes
* Fixes
* Implemented Feedbacks
* Theme Fixes 1/2 (#915)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* stashing work
* removed unused import
* Themes impl: removing static colors
* added theme storage keys
* feat: sign up done
* theme: auth screens
* forgotPass, org and prefDialog
* fixed flutter analyze issue
* preference_view dark mode fixed
* nav_bar dark mode fixed
* org dark mode fixed
* dm dark mode fixed
* home dark mode fixed
* sign out bottomSheet dark mode fixed
* you page dark mode fixed
* added TODO- app crashing bug pulled from upstream
* Make sure the UI of the homepage matches the design and jump to behavior matches the one on slack (#919)
* fixed centrifuge error
* refactored the ui of the home page
* added animatiion to jump to
* removed import
* removed comment
* How to copy text and paste on ZuriChat Mobile App (#924)
* Copy and paste
* Changes requested fixed. Remove the comments
* Major Fixes (#927)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
* Fixes on plugin screen and the home page floating action button (#931)
* added the floating action icon
* icons
* implementation of plugin screen and direct message
* fixes
* fix conflicts
* Perfecting the draft Implementation (#922)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* draft fixes
* Update channel_page_viewmodel.dart
* conflict fixes
* Draft implementation bug fixes
* Update home_page.dart
* draft UI bug fixes and Draft implementation bug fixes
* Update home_list_items.dart
* draft implementation thread route fixes
* Update home_list_items.dart
* Update drafts.dart
* Update dm_user_viewmodel.dart
* fixes
* Dialog service setup for draft delete dialog
* Update draft_viewmodel.dart
* Update pubspec.lock
* minor fixes
* minor fixes
* Update thread_detail_viewmodel.dart
* draft UI
* Remind Me functions (#921)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* Zuri App Bar added (#904)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Message reminder
* Merge branch 'dev' of https://github.com/zurichat/zc_app into dev
* pubspec.lock
* Remind me functions
* Changed test values in reminder function
* Switched to Awesome Notification Package
* Merged upstream
* Refactored code
* Refactor Changes
* removed unused import
* Changes made
* Requested Changes
* fixed CI/CD issues
Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com>
Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com>
Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com>
Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com>
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
* Included Scheduling Message Feature (#933)
* Implementation of invite flow screens (Project ticket on linear) (#936)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
* fixes
* fix conflicts
* Minor fixes
General fixes around the appbar region and the organization
* implemented invite flow screens
* Minor fixes
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
* Minor fixes (#938)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
* fixes
* fix conflicts
* Minor fixes
General fixes around the appbar region and the organization
* implemented invite flow screens
* Minor fixes
* Update saved_items_viewmodel.dart
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
* Minor dev fixes (#939)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
* fixes
* fix conflicts
* Minor fixes
General fixes around the appbar region and the organization
* implemented invite flow screens
* Minor fixes
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
* Enable Pinning Of Messages To A Channel And Show The Pinned Messages (#925)
* Show Pinned Messages
* Enable Pinning Of Messages
* Fix Last Bugs
* Rename BottomSheet Callbacks
* Display the channel creator in the channel screen (#932)
* pods
* Create a private channel and display the owner of a channel in the channel screen
* Create a private channel and display the owner of a channel in the channel screen
* Notification OnClick (#941)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* Zuri App Bar added (#904)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Message reminder
* Merge branch 'dev' of https://github.com/zurichat/zc_app into dev
* pubspec.lock
* Remind me functions
* Changed test values in reminder function
* Switched to Awesome Notification Package
* Merged upstream
* Refactored code
* Refactor Changes
* removed unused import
* Changes made
* Requested Changes
* fixed CI/CD issues
* Notificaction onTap changes
Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com>
Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com>
Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com>
Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com>
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
* Theme Fixes 2/2 (#940)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* stashing work
* removed unused import
* Themes impl: removing static colors
* added theme storage keys
* feat: sign up done
* theme: auth screens
* forgotPass, org and prefDialog
* fixed flutter analyze issue
* preference_view dark mode fixed
* nav_bar dark mode fixed
* org dark mode fixed
* dm dark mode fixed
* home dark mode fixed
* sign out bottomSheet dark mode fixed
* you page dark mode fixed
* added TODO- app crashing bug pulled from upstream
* stashing work - threads
* resolved merge conflicts
* preferences view darkmode impl
* org screens darkmode impld
* threads darkmode impld
* plugin page darkmode impld
* channel darkthem impld
* dm darkmode impld
* added theme unit test
* resolved conflicts
* removed unused imports
* removed test class override
* Internationalization (#945)
* update
* Updating Master
* Implementing Localization
* Updating Localization Implementations
* Cleaned Codes
* Fixes
* Implemented Feedbacks
* Implement…
isaacadariku
added a commit
that referenced
this pull request
Nov 10, 2022
* Prepping Master for dev (#1017)
* Merging Dev to Master (#903)
* fix: minor issues fix
* fix: Fixed imports, const and others for better app optimization
* Add {@link OtpService} service to share otp code value between the {@link ForgotPasswordOtpViewModel} & {@link ForgotPasswordNewViewModel}
* Add {@link OtpService} service to the locator -- of Stacked arch pattern
* Pass otp code value to {@link OtpService} soon as it is verified not empty.
* Fetch otp code value from {@link OtpService}, and use it in querying backend to update password.
* **Fix: remove red-screen-causing loading indicator to make code presentation-ready.
Consider re-adding.
* Remove unused import
* Remove code that checks if e-mail is registered.
OTP request endpoint handles it.
* Delete line that automatically navigates to new password page notwithstanding invalid otp reset code.
* fix: packages ish and inserted TODO
* .
* Implemented channels test
* jump to UI custom widgets fixes
* Merge branch 'dev' of https://github.com/mariamadebolahamzat/zc_app into dev
* bug fixes
* Added Centrifuge Service
* fixes
* jumpToView UI adjustments made
* clean up validator mixin
* confirm password textfield fix
* UIHelpers on signup and login views
* Testing RTC
* updating local
* added ui spacing to view and edit profile
* Testing RTC 1
* ChannelInfo UI fixes
* Testing RTC 2
* fixing password reset
* conflict resolved
* final fixes RTC
* fixed done
* updating local
* updating staging
* keyboard resize
* fixed open channel
* fixed open channel
* fixed import error
* fixed scroll issues
* fixing reset pass patch req
* fixed loading
* Channel info UI redesigned
Errors fixed and part implementations are made. UI redesigned and the stacked architectural format was followed.
* fix: Enhanced app optimization by reducing the amount of widgets Flutter has to rebuild when it wants to render a new screen
* fixed merge conflicts
* Show Sent Message In A Channel's UI
* refactored channels page view UI
* Resolved all Flutter Analyze issues
* Updated CI/CD
* set to current flutter version
* minor fixes
* conflict resolved
* Update sixth_section.dart
* feat: main string extracted
* feat: app_strings file created
* feat: auth screens strings extracted
* feat: forgotPassword (1) screens strings extracted
* feat: forgotPassword (2) screens strings extracted
* feat: all auth screens strings extracted
* feat: all auth screens strings extracted
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* mockito test
* feat: home dir strings extracted
* Update styles.dart
* Delete pubspec.lock~4582368fc8897fcec50eaef42114ba400e0a85ce
* Create pubspec.lock~e532f9e99f92288efa68551c4a034ec3c156894d
* Fixed Mockito Test Error
* Add People to Channel Conflict Resolved (#838)
* Add User to Channel Workflow UI
* Add User to Channel Workflow UI
* Add User to Channel UI Workflow
* Draft UI Workflow Implementation
* Add User to Channel Workflow UI
Requested changes made to previous previous pull.
* Update dart.yml
please don't edit workflows or build files
* changes made
* add people to channel phaseone
* Add Users To Channel
Add Users to Channel
* Recent Update Add People To Channel
list members of the organiztion in the channel
* Add People to Channel
* changes
* Conflicts Resolved
* conflicts resolved
* resolved
* Delete dart.yml
Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* feat: dm dir strings extracted
* feat: integrate dir strings extracted
* fixed label build flutter version
* Additional Error detection step
* added notification service
* added notification service to app file
* feat: youPage dir strings extracted
* feat: draftedMsg dir strings extracted
* feat: ui/shared/smart_widgets dir strings extracted
* feat: ui/shared/dialogs dir strings extracted
* feat: custom_user_bottomsheet dir strings extracted
* feat: resolved conflicts
* API Abstract Class implemented (#849)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* error files
* tested notification
* tested listen to notification
* Latest working mockito test
* made rtc global
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Mockito Test SetUp For Stacked
* analyze package error fix
* Stacked Generator Error Fix
* registered services in test
* Updated analyzer
* added test checker to workflow
* resolved analyzer issues
* fixed some analyzer issues
* Fixed issues (#863)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* API minor corrections
* Fixed issues
* Update app.dart
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* fixed app.dart
* Preference in Organization list (#825)
* rebased upstream/dev into dev
* little fix
* little fix mistake fix
* changes made
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* Freezed and serialized models (#854)
* f/post
* Corrections
* edited
* Replace connectivity with connectivity_plus to fix fail build
* Replace connectivity with connectivity_plus to fix fail build
* checkout pr warning
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* made some changes to centrifugo
* Analysis update (#867)
* fixed some analyzer issues
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* excluded app logger, and forms from flutter analyze
* optimized code and added type to untyped variables
* refactored drafts view
* corrected test
* refactored view model widget naming
* Delete channel and Expanded textfield (#865)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* feat: Channel Threads(Add and receive replies) (#871)
* fix: workspace
* feat: Receiving replies in threads in channels
* fix: added loader to run while fetching replies
* feat: add replies to messages in channel
* updating local
* feat: cleaned up in-channel thread feature
* fix:updating PR to fit upstream
* fix: removed code put in comment block earlier
* fix: removed repetitive code(workspace view)
* refactored centrifuge service
* showed notification in application
* Channel Message Error Checking (#872)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Channel Error message Check
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* made channels and home page to be notification aware
* refactored notification service
* Feat: Start a Thread Message (#877)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Feat: Reply message in thread, connected to the backend
* Fixed UI errors
* Removed threads api service since it wasn't my task
* Fixed lint issues
* Added const to widget
* fixed analyze issues
* feat: add_people strings extracted
* feat: advanced strings extracted
* re-extracted addPeople
* channelInfo
* channels view strings extracted
* channels list
* channels notif
* channel view
* channel view
* edit channel extracted
* removed the comment
* new channel extracted
* feat: channels dir cleared - all strings extracted
* clear after done
* clear notif done
* create channel done
* dm done
* deleted comments
* dm jumpTo done
* dm search done
* fixed PR test issue with undefined var, done with dm_user strings
* dm_user dir done
* Implementation of get and store all the users in an organization (#874)
* added implementation for get and store organization member list
* fix made
* unit test for the connectivity service (#882)
* unit test for the connectivity service
* updated the test description
* Fix new message screen (#884)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Implement Adding Members To A Channel (#879)
* Implement Adding Members To A Channel
* Remove Unused Code And Improve UX
* RegEx Update for Text parser (#848)
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* Updated RegEx
* Unit test for RegEx
* Removed launch import
* Fixed launch package in utilities
* Fixed test errors
* Changed test description
* Made changes to test description
* Updated RegEx list with tests
* unit tests for advanced_viewmodel and channel_add_people viewmodel (#876)
* unit tests for advanced and channel_add_people viewmodel
* Resolve conflicts
* resolved conflict as a result of changes made in channel_add_people_viewmodel
* Solve ci issues
* removed unused code
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for all forget password and login view models (#887)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
Co-authored-by: Adegoke David <64401859+Blazebrain@users.noreply.github.com>
Co-authored-by: Blazebrain <davidadegoke16@gmail.com>
Co-authored-by: The-indigo <adepojuadeyemi11@gmail.com>
Co-authored-by: Detective_Khalifah <detective.khalifah.dtcfscd@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
Co-authored-by: mayor04 <mayorwa4@gmail.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Detective_Khalifah <58272349+Detective-Khalifah@users.noreply.github.com>
Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
Co-authored-by: Chukwuyenum Adeshina <adeshina.jude@gmail.com>
Co-authored-by: richieoscar <oscaranyiam94@gmail.com>
Co-authored-by: kenziematch <ayelabukola08@gmail.com>
Co-authored-by: Ayela Bukola <81062900+kenziematch@users.noreply.github.com>
Co-authored-by: ugoostanleyibe <ugoostanleyibe@gmail.com>
Co-authored-by: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Co-authored-by: Isaac Adeni Adariku <isaacadariku05@gmail.com>
Co-authored-by: Prince Emelife <princeemelife@gmail.com>
Co-authored-by: eunicePops <40694423+eunicePops@users.noreply.github.com>
Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com>
Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com>
Co-authored-by: Kulex <64699982+Asukwo-comfort@users.noreply.github.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com>
Co-authored-by: Emeka Jideije <75017328+JideijeEmeka@users.noreply.github.com>
Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com>
Co-authored-by: Starhkz <67955282+Starhkz@users.noreply.github.com>
Co-authored-by: Alexchuk <48722111+alecxchuk@users.noreply.github.com>
Co-authored-by: Teslim Hassan <64636170+HassanTeslim007@users.noreply.github.com>
Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com>
Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com>
Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
* Fixes master (#1004)
* Resolved all Flutter Analyze issues
* Updated CI/CD
* set to current flutter version
* minor fixes
* conflict resolved
* Update sixth_section.dart
* feat: main string extracted
* feat: app_strings file created
* feat: auth screens strings extracted
* feat: forgotPassword (1) screens strings extracted
* feat: forgotPassword (2) screens strings extracted
* feat: all auth screens strings extracted
* feat: all auth screens strings extracted
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* mockito test
* feat: home dir strings extracted
* Update styles.dart
* Delete pubspec.lock~4582368fc8897fcec50eaef42114ba400e0a85ce
* Create pubspec.lock~e532f9e99f92288efa68551c4a034ec3c156894d
* Fixed Mockito Test Error
* Add People to Channel Conflict Resolved (#838)
* Add User to Channel Workflow UI
* Add User to Channel Workflow UI
* Add User to Channel UI Workflow
* Draft UI Workflow Implementation
* Add User to Channel Workflow UI
Requested changes made to previous previous pull.
* Update dart.yml
please don't edit workflows or build files
* changes made
* add people to channel phaseone
* Add Users To Channel
Add Users to Channel
* Recent Update Add People To Channel
list members of the organiztion in the channel
* Add People to Channel
* changes
* Conflicts Resolved
* conflicts resolved
* resolved
* Delete dart.yml
Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* feat: dm dir strings extracted
* feat: integrate dir strings extracted
* fixed label build flutter version
* Additional Error detection step
* added notification service
* added notification service to app file
* feat: youPage dir strings extracted
* feat: draftedMsg dir strings extracted
* feat: ui/shared/smart_widgets dir strings extracted
* feat: ui/shared/dialogs dir strings extracted
* feat: custom_user_bottomsheet dir strings extracted
* feat: resolved conflicts
* API Abstract Class implemented (#849)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* error files
* tested notification
* tested listen to notification
* Latest working mockito test
* made rtc global
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Mockito Test SetUp For Stacked
* analyze package error fix
* Stacked Generator Error Fix
* registered services in test
* Updated analyzer
* added test checker to workflow
* resolved analyzer issues
* fixed some analyzer issues
* Fixed issues (#863)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* API minor corrections
* Fixed issues
* Update app.dart
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* fixed app.dart
* Preference in Organization list (#825)
* rebased upstream/dev into dev
* little fix
* little fix mistake fix
* changes made
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* Freezed and serialized models (#854)
* f/post
* Corrections
* edited
* Replace connectivity with connectivity_plus to fix fail build
* Replace connectivity with connectivity_plus to fix fail build
* checkout pr warning
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* made some changes to centrifugo
* Analysis update (#867)
* fixed some analyzer issues
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* excluded app logger, and forms from flutter analyze
* optimized code and added type to untyped variables
* refactored drafts view
* corrected test
* refactored view model widget naming
* Delete channel and Expanded textfield (#865)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* feat: Channel Threads(Add and receive replies) (#871)
* fix: workspace
* feat: Receiving replies in threads in channels
* fix: added loader to run while fetching replies
* feat: add replies to messages in channel
* updating local
* feat: cleaned up in-channel thread feature
* fix:updating PR to fit upstream
* fix: removed code put in comment block earlier
* fix: removed repetitive code(workspace view)
* refactored centrifuge service
* showed notification in application
* Channel Message Error Checking (#872)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Channel Error message Check
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* made channels and home page to be notification aware
* refactored notification service
* Feat: Start a Thread Message (#877)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Feat: Reply message in thread, connected to the backend
* Fixed UI errors
* Removed threads api service since it wasn't my task
* Fixed lint issues
* Added const to widget
* fixed analyze issues
* feat: add_people strings extracted
* feat: advanced strings extracted
* re-extracted addPeople
* channelInfo
* channels view strings extracted
* channels list
* channels notif
* channel view
* channel view
* edit channel extracted
* removed the comment
* new channel extracted
* feat: channels dir cleared - all strings extracted
* clear after done
* clear notif done
* create channel done
* dm done
* deleted comments
* dm jumpTo done
* dm search done
* fixed PR test issue with undefined var, done with dm_user strings
* dm_user dir done
* Implementation of get and store all the users in an organization (#874)
* added implementation for get and store organization member list
* fix made
* unit test for the connectivity service (#882)
* unit test for the connectivity service
* updated the test description
* Fix new message screen (#884)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Implement Adding Members To A Channel (#879)
* Implement Adding Members To A Channel
* Remove Unused Code And Improve UX
* RegEx Update for Text parser (#848)
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* Updated RegEx
* Unit test for RegEx
* Removed launch import
* Fixed launch package in utilities
* Fixed test errors
* Changed test description
* Made changes to test description
* Updated RegEx list with tests
* unit tests for advanced_viewmodel and channel_add_people viewmodel (#876)
* unit tests for advanced and channel_add_people viewmodel
* Resolve conflicts
* resolved conflict as a result of changes made in channel_add_people_viewmodel
* Solve ci issues
* removed unused code
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for all forget password and login view models (#887)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* Zuri App Bar added (#904)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* App launcher icon done (#908)
* App launcher icon done
* App icon launcher done
* Delete widget_test.dart
* Saved Items Implementation (#909)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Added More Features to Thread Cards (#910)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* added more features to thread card
* added more features to thread card 2
* SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3 (#911)
* fix: workspace
* feat: Receiving replies in threads in channels
* fix: added loader to run while fetching replies
* feat: add replies to messages in channel
* updating local
* feat: cleaned up in-channel thread feature
* fix:updating PR to fit upstream
* fix: removed code put in comment block earlier
* fix: removed repetitive code(workspace view)
* updating local
* preparing for update
* UI: Use different email for Creating Organization
* updaing local
* SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3
* moved the T&C text into the general app_strings file
* fix: for failing workflow job
* removed comment in code
* removed comment in code
* swapped dummy T&C data for real data
* Added the option for new users to input their name when signing up & UI fixes (#912)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added the option for new users to input their name when signing up & UI fixes
* more UI fixes
* change made
* Jump to: Channels and Users Navigation (#913)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Implemented navigation for the Jump To page for both users and channels
* Changed from GestureDetector to InkWell for user clicks
* Deleted commented code
* Extracted user avatar url to App Strings
* Centered TextField widget text
* Different email workflow Completed (#906)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
* Different email workflow phase 1
* Different email workflow completed
* changes changed
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* Edit Profile and Create Organization with default email (#914)
* Conflicts resolved
* Create organization with default email completed
* Edit profile done
* resolved changes requested
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* Snack bar Error Messages (#918)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* commit
* Make error snackbars displa the error message received from the server
* Saved Items Implementation contd. (#916)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* Implemented SignOut From All Organization. (#920)
* update
* Updating Master
* Implementing Localization
* Updating Localization Implementations
* Cleaned Codes
* Fixes
* Implemented Feedbacks
* Theme Fixes 1/2 (#915)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* stashing work
* removed unused import
* Themes impl: removing static colors
* added theme storage keys
* feat: sign up done
* theme: auth screens
* forgotPass, org and prefDialog
* fixed flutter analyze issue
* preference_view dark mode fixed
* nav_bar dark mode fixed
* org dark mode fixed
* dm dark mode fixed
* home dark mode fixed
* sign out bottomSheet dark mode fixed
* you page dark mode fixed
* added TODO- app crashing bug pulled from upstream
* Make sure the UI of the homepage matches the design and jump to behavior matches the one on slack (#919)
* fixed centrifuge error
* refactored the ui of the home page
* added animatiion to jump to
* removed import
* removed comment
* How to copy text and paste on ZuriChat Mobile App (#924)
* Copy and paste
* Changes requested fixed. Remove the comments
* Major Fixes (#927)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
* Fixes on plugin screen and the home page floating action button (#931)
* added the floating action icon
* icons
* implementation of plugin screen and direct message
* fixes
* fix conflicts
* Perfecting the draft Implementation (#922)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* draft fixes
* Update channel_page_viewmodel.dart
* conflict fixes
* Draft implementation bug fixes
* Update home_page.dart
* draft UI bug fixes and Draft implementation bug fixes
* Update home_list_items.dart
* draft implementation thread route fixes
* Update home_list_items.dart
* Update drafts.dart
* Update dm_user_viewmodel.dart
* fixes
* Dialog service setup for draft delete dialog
* Update draft_viewmodel.dart
* Update pubspec.lock
* minor fixes
* minor fixes
* Update thread_detail_viewmodel.dart
* draft UI
* Remind Me functions (#921)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* Zuri App Bar added (#904)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Message reminder
* Merge branch 'dev' of https://github.com/zurichat/zc_app into dev
* pubspec.lock
* Remind me functions
* Changed test values in reminder function
* Switched to Awesome Notification Package
* Merged upstream
* Refactored code
* Refactor Changes
* removed unused import
* Changes made
* Requested Changes
* fixed CI/CD issues
Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com>
Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com>
Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com>
Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com>
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
* Included Scheduling Message Feature (#933)
* Implementation of invite flow screens (Project ticket on linear) (#936)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
* fixes
* fix conflicts
* Minor fixes
General fixes around the appbar region and the organization
* implemented invite flow screens
* Minor fixes
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
* Minor fixes (#938)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
* fixes
* fix conflicts
* Minor fixes
General fixes around the appbar region and the organization
* implemented invite flow screens
* Minor fixes
* Update saved_items_viewmodel.dart
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
* Minor dev fixes (#939)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
* fixes
* fix conflicts
* Minor fixes
General fixes around the appbar region and the organization
* implemented invite flow screens
* Minor fixes
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
* Enable Pinning Of Messages To A Channel And Show The Pinned Messages (#925)
* Show Pinned Messages
* Enable Pinning Of Messages
* Fix Last Bugs
* Rename BottomSheet Callbacks
* Display the channel creator in the channel screen (#932)
* pods
* Create a private channel and display the owner of a channel in the channel screen
* Create a private channel and display the owner of a channel in the channel screen
* Notification OnClick (#941)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* Zuri App Bar added (#904)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Message reminder
* Merge branch 'dev' of https://github.com/zurichat/zc_app into dev
* pubspec.lock
* Remind me functions
* Changed test values in reminder function
* Switched to Awesome Notification Package
* Merged upstream
* Refactored code
* Refactor Changes
* removed unused import
* Changes made
* Requested Changes
* fixed CI/CD issues
* Notificaction onTap changes
Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com>
Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com>
Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com>
Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com>
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
* Theme Fixes 2/2 (#940)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
…
isaacadariku
added a commit
that referenced
this pull request
Nov 10, 2022
* Merging Dev to Master (#903)
* fix: minor issues fix
* fix: Fixed imports, const and others for better app optimization
* Add {@link OtpService} service to share otp code value between the {@link ForgotPasswordOtpViewModel} & {@link ForgotPasswordNewViewModel}
* Add {@link OtpService} service to the locator -- of Stacked arch pattern
* Pass otp code value to {@link OtpService} soon as it is verified not empty.
* Fetch otp code value from {@link OtpService}, and use it in querying backend to update password.
* **Fix: remove red-screen-causing loading indicator to make code presentation-ready.
Consider re-adding.
* Remove unused import
* Remove code that checks if e-mail is registered.
OTP request endpoint handles it.
* Delete line that automatically navigates to new password page notwithstanding invalid otp reset code.
* fix: packages ish and inserted TODO
* .
* Implemented channels test
* jump to UI custom widgets fixes
* Merge branch 'dev' of https://github.com/mariamadebolahamzat/zc_app into dev
* bug fixes
* Added Centrifuge Service
* fixes
* jumpToView UI adjustments made
* clean up validator mixin
* confirm password textfield fix
* UIHelpers on signup and login views
* Testing RTC
* updating local
* added ui spacing to view and edit profile
* Testing RTC 1
* ChannelInfo UI fixes
* Testing RTC 2
* fixing password reset
* conflict resolved
* final fixes RTC
* fixed done
* updating local
* updating staging
* keyboard resize
* fixed open channel
* fixed open channel
* fixed import error
* fixed scroll issues
* fixing reset pass patch req
* fixed loading
* Channel info UI redesigned
Errors fixed and part implementations are made. UI redesigned and the stacked architectural format was followed.
* fix: Enhanced app optimization by reducing the amount of widgets Flutter has to rebuild when it wants to render a new screen
* fixed merge conflicts
* Show Sent Message In A Channel's UI
* refactored channels page view UI
* Resolved all Flutter Analyze issues
* Updated CI/CD
* set to current flutter version
* minor fixes
* conflict resolved
* Update sixth_section.dart
* feat: main string extracted
* feat: app_strings file created
* feat: auth screens strings extracted
* feat: forgotPassword (1) screens strings extracted
* feat: forgotPassword (2) screens strings extracted
* feat: all auth screens strings extracted
* feat: all auth screens strings extracted
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* mockito test
* feat: home dir strings extracted
* Update styles.dart
* Delete pubspec.lock~4582368fc8897fcec50eaef42114ba400e0a85ce
* Create pubspec.lock~e532f9e99f92288efa68551c4a034ec3c156894d
* Fixed Mockito Test Error
* Add People to Channel Conflict Resolved (#838)
* Add User to Channel Workflow UI
* Add User to Channel Workflow UI
* Add User to Channel UI Workflow
* Draft UI Workflow Implementation
* Add User to Channel Workflow UI
Requested changes made to previous previous pull.
* Update dart.yml
please don't edit workflows or build files
* changes made
* add people to channel phaseone
* Add Users To Channel
Add Users to Channel
* Recent Update Add People To Channel
list members of the organiztion in the channel
* Add People to Channel
* changes
* Conflicts Resolved
* conflicts resolved
* resolved
* Delete dart.yml
Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* feat: dm dir strings extracted
* feat: integrate dir strings extracted
* fixed label build flutter version
* Additional Error detection step
* added notification service
* added notification service to app file
* feat: youPage dir strings extracted
* feat: draftedMsg dir strings extracted
* feat: ui/shared/smart_widgets dir strings extracted
* feat: ui/shared/dialogs dir strings extracted
* feat: custom_user_bottomsheet dir strings extracted
* feat: resolved conflicts
* API Abstract Class implemented (#849)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* error files
* tested notification
* tested listen to notification
* Latest working mockito test
* made rtc global
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Mockito Test SetUp For Stacked
* analyze package error fix
* Stacked Generator Error Fix
* registered services in test
* Updated analyzer
* added test checker to workflow
* resolved analyzer issues
* fixed some analyzer issues
* Fixed issues (#863)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* API minor corrections
* Fixed issues
* Update app.dart
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* fixed app.dart
* Preference in Organization list (#825)
* rebased upstream/dev into dev
* little fix
* little fix mistake fix
* changes made
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* Freezed and serialized models (#854)
* f/post
* Corrections
* edited
* Replace connectivity with connectivity_plus to fix fail build
* Replace connectivity with connectivity_plus to fix fail build
* checkout pr warning
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* made some changes to centrifugo
* Analysis update (#867)
* fixed some analyzer issues
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* excluded app logger, and forms from flutter analyze
* optimized code and added type to untyped variables
* refactored drafts view
* corrected test
* refactored view model widget naming
* Delete channel and Expanded textfield (#865)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* feat: Channel Threads(Add and receive replies) (#871)
* fix: workspace
* feat: Receiving replies in threads in channels
* fix: added loader to run while fetching replies
* feat: add replies to messages in channel
* updating local
* feat: cleaned up in-channel thread feature
* fix:updating PR to fit upstream
* fix: removed code put in comment block earlier
* fix: removed repetitive code(workspace view)
* refactored centrifuge service
* showed notification in application
* Channel Message Error Checking (#872)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Channel Error message Check
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* made channels and home page to be notification aware
* refactored notification service
* Feat: Start a Thread Message (#877)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Feat: Reply message in thread, connected to the backend
* Fixed UI errors
* Removed threads api service since it wasn't my task
* Fixed lint issues
* Added const to widget
* fixed analyze issues
* feat: add_people strings extracted
* feat: advanced strings extracted
* re-extracted addPeople
* channelInfo
* channels view strings extracted
* channels list
* channels notif
* channel view
* channel view
* edit channel extracted
* removed the comment
* new channel extracted
* feat: channels dir cleared - all strings extracted
* clear after done
* clear notif done
* create channel done
* dm done
* deleted comments
* dm jumpTo done
* dm search done
* fixed PR test issue with undefined var, done with dm_user strings
* dm_user dir done
* Implementation of get and store all the users in an organization (#874)
* added implementation for get and store organization member list
* fix made
* unit test for the connectivity service (#882)
* unit test for the connectivity service
* updated the test description
* Fix new message screen (#884)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Implement Adding Members To A Channel (#879)
* Implement Adding Members To A Channel
* Remove Unused Code And Improve UX
* RegEx Update for Text parser (#848)
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* Updated RegEx
* Unit test for RegEx
* Removed launch import
* Fixed launch package in utilities
* Fixed test errors
* Changed test description
* Made changes to test description
* Updated RegEx list with tests
* unit tests for advanced_viewmodel and channel_add_people viewmodel (#876)
* unit tests for advanced and channel_add_people viewmodel
* Resolve conflicts
* resolved conflict as a result of changes made in channel_add_people_viewmodel
* Solve ci issues
* removed unused code
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for all forget password and login view models (#887)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
Co-authored-by: Adegoke David <64401859+Blazebrain@users.noreply.github.com>
Co-authored-by: Blazebrain <davidadegoke16@gmail.com>
Co-authored-by: The-indigo <adepojuadeyemi11@gmail.com>
Co-authored-by: Detective_Khalifah <detective.khalifah.dtcfscd@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
Co-authored-by: mayor04 <mayorwa4@gmail.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Detective_Khalifah <58272349+Detective-Khalifah@users.noreply.github.com>
Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
Co-authored-by: Chukwuyenum Adeshina <adeshina.jude@gmail.com>
Co-authored-by: richieoscar <oscaranyiam94@gmail.com>
Co-authored-by: kenziematch <ayelabukola08@gmail.com>
Co-authored-by: Ayela Bukola <81062900+kenziematch@users.noreply.github.com>
Co-authored-by: ugoostanleyibe <ugoostanleyibe@gmail.com>
Co-authored-by: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Co-authored-by: Isaac Adeni Adariku <isaacadariku05@gmail.com>
Co-authored-by: Prince Emelife <princeemelife@gmail.com>
Co-authored-by: eunicePops <40694423+eunicePops@users.noreply.github.com>
Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com>
Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com>
Co-authored-by: Kulex <64699982+Asukwo-comfort@users.noreply.github.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com>
Co-authored-by: Emeka Jideije <75017328+JideijeEmeka@users.noreply.github.com>
Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com>
Co-authored-by: Starhkz <67955282+Starhkz@users.noreply.github.com>
Co-authored-by: Alexchuk <48722111+alecxchuk@users.noreply.github.com>
Co-authored-by: Teslim Hassan <64636170+HassanTeslim007@users.noreply.github.com>
Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com>
Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com>
Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
* Fixes master (#1004)
* Resolved all Flutter Analyze issues
* Updated CI/CD
* set to current flutter version
* minor fixes
* conflict resolved
* Update sixth_section.dart
* feat: main string extracted
* feat: app_strings file created
* feat: auth screens strings extracted
* feat: forgotPassword (1) screens strings extracted
* feat: forgotPassword (2) screens strings extracted
* feat: all auth screens strings extracted
* feat: all auth screens strings extracted
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* mockito test
* feat: home dir strings extracted
* Update styles.dart
* Delete pubspec.lock~4582368fc8897fcec50eaef42114ba400e0a85ce
* Create pubspec.lock~e532f9e99f92288efa68551c4a034ec3c156894d
* Fixed Mockito Test Error
* Add People to Channel Conflict Resolved (#838)
* Add User to Channel Workflow UI
* Add User to Channel Workflow UI
* Add User to Channel UI Workflow
* Draft UI Workflow Implementation
* Add User to Channel Workflow UI
Requested changes made to previous previous pull.
* Update dart.yml
please don't edit workflows or build files
* changes made
* add people to channel phaseone
* Add Users To Channel
Add Users to Channel
* Recent Update Add People To Channel
list members of the organiztion in the channel
* Add People to Channel
* changes
* Conflicts Resolved
* conflicts resolved
* resolved
* Delete dart.yml
Co-authored-by: Nwanedilobu Egbekwu <egbekwunwanedilobu@gmail.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* feat: dm dir strings extracted
* feat: integrate dir strings extracted
* fixed label build flutter version
* Additional Error detection step
* added notification service
* added notification service to app file
* feat: youPage dir strings extracted
* feat: draftedMsg dir strings extracted
* feat: ui/shared/smart_widgets dir strings extracted
* feat: ui/shared/dialogs dir strings extracted
* feat: custom_user_bottomsheet dir strings extracted
* feat: resolved conflicts
* API Abstract Class implemented (#849)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* error files
* tested notification
* tested listen to notification
* Latest working mockito test
* made rtc global
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Revert "feat: resolved conflicts"
This reverts commit a42adcd7ce7ec2cf465aababafa815fa506085f5.
* fixed analyzer issues
* Mockito Test SetUp For Stacked
* analyze package error fix
* Stacked Generator Error Fix
* registered services in test
* Updated analyzer
* added test checker to workflow
* resolved analyzer issues
* fixed some analyzer issues
* Fixed issues (#863)
* API service started
* API Abstract Class
An abstract class has been created and all services have been registered accordingly.
* API Updated
* Unused imports removed
* More Unused imports removed
* API minor corrections
* Fixed issues
* Update app.dart
Co-authored-by: Paul Imoke <pauleke65@gmail.com>
* fixed app.dart
* Preference in Organization list (#825)
* rebased upstream/dev into dev
* little fix
* little fix mistake fix
* changes made
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* Freezed and serialized models (#854)
* f/post
* Corrections
* edited
* Replace connectivity with connectivity_plus to fix fail build
* Replace connectivity with connectivity_plus to fix fail build
* checkout pr warning
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* made some changes to centrifugo
* Analysis update (#867)
* fixed some analyzer issues
* fixed more analyzer issues 1
* fixed more analyzer issues 2
* fixed more analyzer issues plus fixes for organisations list
* fixed analyzer issues 3
* excluded app logger, and forms from flutter analyze
* optimized code and added type to untyped variables
* refactored drafts view
* corrected test
* refactored view model widget naming
* Delete channel and Expanded textfield (#865)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* feat: Channel Threads(Add and receive replies) (#871)
* fix: workspace
* feat: Receiving replies in threads in channels
* fix: added loader to run while fetching replies
* feat: add replies to messages in channel
* updating local
* feat: cleaned up in-channel thread feature
* fix:updating PR to fit upstream
* fix: removed code put in comment block earlier
* fix: removed repetitive code(workspace view)
* refactored centrifuge service
* showed notification in application
* Channel Message Error Checking (#872)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Channel Error message Check
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* made channels and home page to be notification aware
* refactored notification service
* Feat: Start a Thread Message (#877)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Feat: Reply message in thread, connected to the backend
* Fixed UI errors
* Removed threads api service since it wasn't my task
* Fixed lint issues
* Added const to widget
* fixed analyze issues
* feat: add_people strings extracted
* feat: advanced strings extracted
* re-extracted addPeople
* channelInfo
* channels view strings extracted
* channels list
* channels notif
* channel view
* channel view
* edit channel extracted
* removed the comment
* new channel extracted
* feat: channels dir cleared - all strings extracted
* clear after done
* clear notif done
* create channel done
* dm done
* deleted comments
* dm jumpTo done
* dm search done
* fixed PR test issue with undefined var, done with dm_user strings
* dm_user dir done
* Implementation of get and store all the users in an organization (#874)
* added implementation for get and store organization member list
* fix made
* unit test for the connectivity service (#882)
* unit test for the connectivity service
* updated the test description
* Fix new message screen (#884)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Implement Adding Members To A Channel (#879)
* Implement Adding Members To A Channel
* Remove Unused Code And Improve UX
* RegEx Update for Text parser (#848)
* Edit Profile fix
* Removed unused imports and variable
* Used ApiService
* Updated RegEx
* Unit test for RegEx
* Removed launch import
* Fixed launch package in utilities
* Fixed test errors
* Changed test description
* Made changes to test description
* Updated RegEx list with tests
* unit tests for advanced_viewmodel and channel_add_people viewmodel (#876)
* unit tests for advanced and channel_add_people viewmodel
* Resolve conflicts
* resolved conflict as a result of changes made in channel_add_people_viewmodel
* Solve ci issues
* removed unused code
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for all forget password and login view models (#887)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* Zuri App Bar added (#904)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* App launcher icon done (#908)
* App launcher icon done
* App icon launcher done
* Delete widget_test.dart
* Saved Items Implementation (#909)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Added More Features to Thread Cards (#910)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* added more features to thread card
* added more features to thread card 2
* SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3 (#911)
* fix: workspace
* feat: Receiving replies in threads in channels
* fix: added loader to run while fetching replies
* feat: add replies to messages in channel
* updating local
* feat: cleaned up in-channel thread feature
* fix:updating PR to fit upstream
* fix: removed code put in comment block earlier
* fix: removed repetitive code(workspace view)
* updating local
* preparing for update
* UI: Use different email for Creating Organization
* updaing local
* SignUp Checkbox, Terms and Conditions Page, Invite Flow 1/3
* moved the T&C text into the general app_strings file
* fix: for failing workflow job
* removed comment in code
* removed comment in code
* swapped dummy T&C data for real data
* Added the option for new users to input their name when signing up & UI fixes (#912)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added the option for new users to input their name when signing up & UI fixes
* more UI fixes
* change made
* Jump to: Channels and Users Navigation (#913)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Implemented navigation for the Jump To page for both users and channels
* Changed from GestureDetector to InkWell for user clicks
* Deleted commented code
* Extracted user avatar url to App Strings
* Centered TextField widget text
* Different email workflow Completed (#906)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
* Different email workflow phase 1
* Different email workflow completed
* changes changed
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* Edit Profile and Create Organization with default email (#914)
* Conflicts resolved
* Create organization with default email completed
* Edit profile done
* resolved changes requested
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* Snack bar Error Messages (#918)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* commit
* Make error snackbars displa the error message received from the server
* Saved Items Implementation contd. (#916)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* Implemented SignOut From All Organization. (#920)
* update
* Updating Master
* Implementing Localization
* Updating Localization Implementations
* Cleaned Codes
* Fixes
* Implemented Feedbacks
* Theme Fixes 1/2 (#915)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* stashing work
* removed unused import
* Themes impl: removing static colors
* added theme storage keys
* feat: sign up done
* theme: auth screens
* forgotPass, org and prefDialog
* fixed flutter analyze issue
* preference_view dark mode fixed
* nav_bar dark mode fixed
* org dark mode fixed
* dm dark mode fixed
* home dark mode fixed
* sign out bottomSheet dark mode fixed
* you page dark mode fixed
* added TODO- app crashing bug pulled from upstream
* Make sure the UI of the homepage matches the design and jump to behavior matches the one on slack (#919)
* fixed centrifuge error
* refactored the ui of the home page
* added animatiion to jump to
* removed import
* removed comment
* How to copy text and paste on ZuriChat Mobile App (#924)
* Copy and paste
* Changes requested fixed. Remove the comments
* Major Fixes (#927)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
* Fixes on plugin screen and the home page floating action button (#931)
* added the floating action icon
* icons
* implementation of plugin screen and direct message
* fixes
* fix conflicts
* Perfecting the draft Implementation (#922)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* draft fixes
* Update channel_page_viewmodel.dart
* conflict fixes
* Draft implementation bug fixes
* Update home_page.dart
* draft UI bug fixes and Draft implementation bug fixes
* Update home_list_items.dart
* draft implementation thread route fixes
* Update home_list_items.dart
* Update drafts.dart
* Update dm_user_viewmodel.dart
* fixes
* Dialog service setup for draft delete dialog
* Update draft_viewmodel.dart
* Update pubspec.lock
* minor fixes
* minor fixes
* Update thread_detail_viewmodel.dart
* draft UI
* Remind Me functions (#921)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* Zuri App Bar added (#904)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Message reminder
* Merge branch 'dev' of https://github.com/zurichat/zc_app into dev
* pubspec.lock
* Remind me functions
* Changed test values in reminder function
* Switched to Awesome Notification Package
* Merged upstream
* Refactored code
* Refactor Changes
* removed unused import
* Changes made
* Requested Changes
* fixed CI/CD issues
Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com>
Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com>
Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com>
Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com>
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
* Included Scheduling Message Feature (#933)
* Implementation of invite flow screens (Project ticket on linear) (#936)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
* fixes
* fix conflicts
* Minor fixes
General fixes around the appbar region and the organization
* implemented invite flow screens
* Minor fixes
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
* Minor fixes (#938)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
* fixes
* fix conflicts
* Minor fixes
General fixes around the appbar region and the organization
* implemented invite flow screens
* Minor fixes
* Update saved_items_viewmodel.dart
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
* Minor dev fixes (#939)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* Removed unused package
* pulled from dev
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Saved Items for Channels!
Presently, this is working with a growable list.
* Final touches
* Minor adjustments
* Delete Saved Items
Now, you can delete a saved item without all of it.
* Update channel_chat.dart
* Update edit_profile_view.dart
* added the floating action icon
* icons
* Saved Items Implementation contd.
Saved Items added and configured for Thread messages
* More code
* implementation of plugin screen and direct message
* halt
* fix 1
* AppBar fixes
This is because the theme service broke the appbar so it has been fixed
* Color and logo updated
* fixes done
* Search bar updated
* General fixes
* Webview working with a loader
* Minor fixes
* Token cannot be null
* Small fixes
* Update custom_user_bottom_sheet_viewmodel.dart
* AppBar changed
* fixes
* fix conflicts
* Minor fixes
General fixes around the appbar region and the organization
* implemented invite flow screens
* Minor fixes
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
* Enable Pinning Of Messages To A Channel And Show The Pinned Messages (#925)
* Show Pinned Messages
* Enable Pinning Of Messages
* Fix Last Bugs
* Rename BottomSheet Callbacks
* Display the channel creator in the channel screen (#932)
* pods
* Create a private channel and display the owner of a channel in the channel screen
* Create a private channel and display the owner of a channel in the channel screen
* Notification OnClick (#941)
* Unit tests for all forget password and login views
* removed unused imports and variables
* removed unused import
* Changes made, No issues Found in Flutter Analyze
* Fixed Failing test - Connectivity Service
* Unit Tests of AddPeopleViewModel and YouPageViewModel (#889)
* added implementation for get and store organization member list
* fix made
* little fix
* Unit Tests of AddPeopleViewModel and YouPageViewModel
* a little fix
* fix made
* Feat: Sign Out User (#828)
* Fixed overflow error on Chat Message
* Sign out workflow completed. Connected to backend api
* Removed cupertino import from SignOut viewmodel
* Removed unused imports
* Now using BottomSheet and Dialog services
* Removed unused import
* Project-wide strings extraction 3/3 (#886)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
* organisation screens string extracted
* Splash, Profile strings extracted
* feat: threads and user search strings extracted
* feat: flutter analyze issues resolved
* fixed undefined symbol
* Unit tests for Local storage, User services, Navigation Service, SnackBar Service, Bottom Sheet and Dialog Service. (#870)
* commit
* commit
* local storage unit test
* commit
* changes
* Local storage unit test
* Removed the test package that was initially added
* Unit tests
* committ
* fized syntax error
* Removed unused code
* fixed build error
* fixed test build errors
* Unit tests for the DMUserViewModel, DmJumpToViewModel, NotificationsViewModel and PluginViewModel. (#883)
* retrieved the current user's details from the API
* retrieved the current user's details from the API
* latest changes
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/nav_pages/you_page/you_page_view.dart
# lib/ui/nav_pages/you_page/you_page_viewmodel.dart
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_view.dart
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/shared/bottom_sheets/profile_botton_sheet/custom_user_bottom_sheet_viewmodel.dart
* Unit tests
* Merge branch 'dev' of https://github.com/zurichat/zc_app
# Conflicts:
# lib/ui/view/direct_message/direct_message.dart
* Changes made
* Added drag feature to the expandable textfield (#888)
* Delete Channel Functionality completed
* Expandable channel textfield phase 1
* Expandable channel textfield done
* Expandable Textfield icons changed
* flutter analyse errpors fixed
* flutter analyse errors fixed
* Resolved flutter analyze error
* requested changes fixed
* Expanded textfield refactored
* Channel Error message Check
* Exanded Textfield given more life
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
* unit tests for Channel Info ViewModel, Channels ViewModel, Channels Members ViewModel, and Channel Notification View Model (#880)
* unit tests for channels viewmodels
* unit-tests requested changes made
* changed navigator to _navigationService
* Fixed flutter ananlyze issues
* Fixed Errors
* implemented and tested the service for profile picture upload (#875)
* testss
* media service test
* service test
* final changes
* added constants file
* added a media service test
* fixed conflicts
* fixed conflicts
* fixed test conflicts
* fixes
* fixes
* conflicts resolved
* fixed all conflicts
* Fixed conflicts
* Solved issues
* fixed json serializable issue
* fixed pubspec errors
* fixed test issues
* fixed issues
* nullable fix
* fix
* final fix
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
* unit test on newchannel and clearAfter view models (#892)
* commit
* commit
* Fixes 1/2 (#899)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* DM screen fix (#900)
* Fixed new message screen
* Fixed new message screen
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
* Passed Channel data and Update Channel Details Implementation (#898)
* passed the channel data to the edit channel screen
* passed the channel data to the edit channel page
* changes made
* changes made
* changes made
* changes made
* channel data passed to the edit channel screen and implementation of put request for the edit channel screen
* navigate back to screen implemented
* removed unnecessary codes
* removed unnecessary lines of code
* changes added
* Draft implementations (#897)
* Update storage_keys.dart
* draft implementations
* draft implementations
* minor fixes
* testing fix for null in dmjumptoviewmodel to rectify ci/cd failed test
* Update dm_jump_to_viewmodel.dart
* Update dm_jump_to_viewmodel.dart
* draft implementations
routing functionality within the draft view
* Update pubspec.lock
* drafts routing implementation in draft UI
* minor fixes
* Revert "Draft implementations (#897)" (#901)
This reverts commit 683c1dcf23faec50a6995a6f068dc450a5b7f654.
* Fixes 2/2 (#902)
* fixed app.dart
* excluded app logger, and forms from flutter analyze
* pull from dev
* fixed conflicts
* conflicts resolved
* repo fixes done
* removed test temporarily for phase 1 of repo fix
* fixes 1/2
* pulled from dev
* refactoring 2
* fixes 2/2
* Zuri App Bar added (#904)
* Removed unused package
* updates
* App bar added contd.
* More Zuri App Bar added
* Unused imports removed
* More unused imports removed
* Wrapping up Zuri App Bar
Making sure Zuri App Bar replaces all other app bars in the app.
* ZuriTopBar into ZuriAppBar
Changing ZuriTopBar into ZuriAppBar - so as to add better naming and easy recognition.
* Minor changes
* Message reminder
* Merge branch 'dev' of https://github.com/zurichat/zc_app into dev
* pubspec.lock
* Remind me functions
* Changed test values in reminder function
* Switched to Awesome Notification Package
* Merged upstream
* Refactored code
* Refactor Changes
* removed unused import
* Changes made
* Requested Changes
* fixed CI/CD issues
* Notificaction onTap changes
Co-authored-by: abdussamadbsg <59794985+abdussamadbsg@users.noreply.github.com>
Co-authored-by: Nsikak Isaac <31522978+nzikak@users.noreply.github.com>
Co-authored-by: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Co-authored-by: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Co-authored-by: Nathaniel Akubuo <nakubuo@gmail.com>
Co-authored-by: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Co-authored-by: Lord_Chris <maduekechris@gmail.com>
Co-authored-by: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>
Co-authored-by: Paul Eke <pauleke65@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Co-authored-by: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Co-authored-by: Ogbonna Destiny <80477923+DestinyOgbonna@users.noreply.github.com>
Co-authored-by: Neatwhiskey <44437144+Neatwhiskey@users.noreply.github.com>
Co-authored-by: Adegoke David <64401859+blazebrain@users.noreply.github.com>
Co-authored-by: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
Co-authored-by: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
* Theme Fixes 2/2 (#940)
* dnd done
* draft done
* edit profile done
* file search done
* lang and region done
* notifs done
…
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.
T.C.mp4