Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Get all icons in the Figma file and replace it in the app #968

Merged
merged 23 commits into from Oct 15, 2021

Conversation

Cdf-creator
Copy link
Contributor

@Cdf-creator Cdf-creator commented Oct 14, 2021

I replaced all the icons on the ZuriChat App with the exact ones on the main Figma File.

This is a new video for showing that the icons in the app has been replaced with the right ones on the Figma file.
2021-10-15 05 18 13

This is the screenshot of the reduced icons of the add channels and add teammates.
Image 14-10-2021 at 18 11

@github-actions
Copy link

The status is success

@github-actions
Copy link

The status is success

Copy link
Contributor

@jeremiahseun jeremiahseun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your work is not done

pubspec.yaml Outdated Show resolved Hide resolved
Copy link
Contributor

@pauleke65 pauleke65 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple of things

  • remove the polls package
  • move all the assets dir strings to app_strings.dart
  • reduce the size of the icon on the add channels and add teammates and send a screenshot

@jeremiahseun jeremiahseun added Conflict Resolve Conflicts and removed Changes requested labels Oct 14, 2021
@github-actions
Copy link

The status is success

Copy link
Contributor

@pauleke65 pauleke65 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome Work, please move all the text to app_strings.dart

@github-actions
Copy link

The status is success

app_strings.dart
@github-actions
Copy link

The status is success

@github-actions
Copy link

The status is success

@github-actions
Copy link

The status is success

Copy link
Contributor

@jeremiahseun jeremiahseun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@YenumJay YenumJay dismissed pauleke65’s stale review October 15, 2021 16:39

Changes Implemented

@YenumJay YenumJay merged commit d8c78f4 into zurichat:dev Oct 15, 2021
jeremiahseun added a commit to jeremiahseun/zc_app that referenced this pull request Oct 17, 2021
commit c0d62d95499690719b49da67693c4e948e05d1f0
Merge: 6413db41 965ece06
Author: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Date:   Sun Oct 17 19:08:19 2021 +0100

    Merge branch 'dev' into fixesMaster

commit 6413db412063acbd31ece7fbf18efcc2f976832e
Author: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Date:   Sun Oct 17 18:54:06 2021 +0100

    Major fixes

commit 281549553e5546671b8dac325d0f4f79638a4950
Merge: 5b350c02 521bc1f8
Author: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Date:   Sun Oct 17 13:16:40 2021 +0100

    Merge branch 'master' into fixesMaster

commit 965ece06329753dde2ded585d418c4ce4f236416
Merge: 5b350c02 6a46f9c0
Author: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Date:   Sun Oct 17 12:36:27 2021 +0100

    Merge branch 'dev' of https://github.com/zurichat/zc_app into dev

commit 6a46f9c0ab0217897bb78b90dcb2ae64940a419e
Author: Paul Imoke <pauleke65@gmail.com>
Date:   Sun Oct 17 11:14:09 2021 +0100

    Phase 2 final fixes (#998)

    * fixed app.dart

    * excluded app logger, and forms from flutter analyze

    * 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

    * 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

    * 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 override

    * status implementation - start

    * status update works

    * status post and get working

    * removed unused vars

    * reactive service implemented

    * extracted out statusService

    * stashing work progress

    * resolved conflicts

    * stashing

    * temporary fix

    * temporary fix 2

    * updated flutter CI build to 2.5.2

    * General fixes

    * ...

    * more fixes done

    Co-authored-by: Quwaysim <qaasim405@gmail.com>
    Co-authored-by: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>

commit 2b8dd0edb81aba697be5668fc682934da45dc6a3
Author: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Date:   Sun Oct 17 00:10:39 2021 +0100

    General fixes (#995)

    * General fixes

    * ...

commit 5b350c02aa06e3419d2e426f981c6fbe0557761f
Author: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Date:   Sat Oct 16 22:47:36 2021 +0100

    ...

commit f8348e3e050e5e6d797738f4ce93a97d5343046b
Merge: b72e4e1e 5a3f6949
Author: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Date:   Sat Oct 16 22:38:18 2021 +0100

    Merge branch 'dev' of https://github.com/zurichat/zc_app into dev

commit b72e4e1ed98e159ddb6176231385b32c734ef67f
Author: Jeremiah Oluwaseun Erinola <seunjeremiah@gmail.com>
Date:   Sat Oct 16 22:38:12 2021 +0100

    General fixes

commit 5a3f6949253a98970bc27fc4e450443e4486f155
Author: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
Date:   Sat Oct 16 22:33:41 2021 +0100

    Unique instance of the draft implementation for each organization (#994)

    * minor fixes

    * Update channel_page_viewmodel.dart

    * Update channel_page_viewmodel.dart

    * Update thread_detail_viewmodel.dart

commit 1c86d0f2dcbdb7dce9d4dd66bc729ebcb1120d83
Author: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Date:   Sat Oct 16 19:39:37 2021 +0100

    Snackbar error messages fix (#993)

    * Errror message

    * Error message fix

    * CHanges to the response returned

    * All snackbars now display the errors gotten from server

commit 65f9b43264d1fac1607188181af9ed055bdf05da
Author: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Date:   Sat Oct 16 18:24:09 2021 +0100

    Dark Mode Fixes (#992)

    * 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

    * dark mode UI fix

    * removed unused imports

commit 10eb2f1ca179cbee706217fc5eaf15e2975d3b86
Author: Paul Imoke <pauleke65@gmail.com>
Date:   Sat Oct 16 17:38:57 2021 +0100

    Temporary Fixes 2 (#987)

    * fixed app.dart

    * excluded app logger, and forms from flutter analyze

    * 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

    * 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

    * 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 override

    * status implementation - start

    * status update works

    * status post and get working

    * removed unused vars

    * reactive service implemented

    * extracted out statusService

    * stashing work progress

    * resolved conflicts

    * stashing

    * temporary fix

    * temporary fix 2

    * updated flutter CI build to 2.5.2

    Co-authored-by: Quwaysim <qaasim405@gmail.com>

commit 477f11c699aad47762f835c435ee1240c5da24ba
Author: Adegoke David <64401859+Blazebrain@users.noreply.github.com>
Date:   Sat Oct 16 16:11:35 2021 +0100

    Invite To Organization Cleanup and TODOS (#990)

    * 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

    * fix: merge conflicts

    * fix: Invite to Organization and TODOS

    * linked signout bottomsheet

    * TODO for signout bottomsheet invite flow link

commit 7e3fb7ac15d20e76f260e6bb3e7a0621d1f61ce0
Author: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Date:   Sat Oct 16 11:50:05 2021 +0100

    Package name changed (#986)

    * Conflicts resolved

    * Create organization with default email completed

    * Edit profile done

    * resolved changes requested

    * Fixed edit profile feature

    * app bundle and package name changed

    * changed package id

    * fixed issues

    * Workspace settings, phase 1

    * workspace settings phase 2

    * Workspace Settings complete

    * Reverted package name change

    * change resolved

    * Changes resolved 2

    * Changed package name

    Co-authored-by: Lord_Chris <maduekechris@gmail.com>

commit 3835af6b04f2e5949c9fb50510ce1e94717196bc
Author: Faith Adetunji Komolafe <59166014+imfaith-hq@users.noreply.github.com>
Date:   Sat Oct 16 11:24:24 2021 +0100

    User Upload Profile Pic  (#985)

    * 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

    * channel info ui

    * userModel unsaved data error

    * Update pubspec.lock

    * minor fixes in edit profile

    * minor fixes

    * minor fix in profile pic upload

    * User upload profile pic

    * merge fixes

    * userUploadProfilePic minor fixes

    * pub get

    * Update pubspec.yaml

    * Update image_picker_bottomsheet_viewmodel.dart

commit 795d0cfd34d88174a9675a16606bcb7d3272d786
Author: Qaasim Muhammad Akorede <qaasim405@gmail.com>
Date:   Sat Oct 16 01:21:07 2021 +0100

    Update User Status (#943)

    * 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 override

    * status implementation - start

    * status update works

    * status post and get working

    * removed unused vars

    * reactive service implemented

    * extracted out statusService

    * stashing work progress

    * resolved conflicts

    * stashing

    Co-authored-by: Paul Imoke <pauleke65@gmail.com>

commit 13bd8d6b8f27ff374a8dfd7bcc276e98cfc0e06c
Author: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Date:   Sat Oct 16 01:18:34 2021 +0100

    Editprofile, Application id and workspace settings (#971)

    * Conflicts resolved

    * Create organization with default email completed

    * Edit profile done

    * resolved changes requested

    * Fixed edit profile feature

    * app bundle and package name changed

    * changed package id

    * fixed issues

    * Workspace settings, phase 1

    * workspace settings phase 2

    * Workspace Settings complete

    * Reverted package name change

    * change resolved

    * Changes resolved 2

    Co-authored-by: Lord_Chris <maduekechris@gmail.com>

commit 5788ebc0c2518cb3bc56aa5231d8dfd4d039e926
Author: Nathaniel Akubuo <nakubuo@gmail.com>
Date:   Sat Oct 16 00:21:11 2021 +0100

    Sharing messages to different channels (#979)

    * 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

    * Sharing messages to different channels

    * Merge branch 'dev' of https://github.com/zurichat/zc_app

    # Conflicts:
    #	pubspec.lock

    * changed text-field to drop down

    * share message endpoint fix

    * changes made

commit f69ec4131705e80e8b248b02d94c54f936111c6f
Author: mayor04 <67462604+mayor04@users.noreply.github.com>
Date:   Fri Oct 15 22:53:56 2021 +0100

    Changes the text style in the app to match the design styles (#974)

    * fixed centrifuge error

    * refactored the ui of the home page

    * added animatiion to jump to

    * removed import

    * removed comment

    * pubspec

    * changed all text styles

    * fixed conflicts

    * fixed conflict 2.0

    * fixed homepage

    * made small changes to text style

    * assed public

    * overwrite

    * fixed conflict 4.0

commit 241936b4b2de5aadc4e36487a4facc642b3b4bc3
Author: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Date:   Fri Oct 15 21:37:31 2021 +0100

    Corrected Local String For Arabic (about_channel) (#984)

    * 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

    * Update Local String For Arabic

commit d6e70744e9cffa310505801d8cc842df8e392bd3
Author: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Date:   Fri Oct 15 18:30:46 2021 +0100

    Add More Local Strings For Arabic, Chinese and German Languages. (#983)

    * 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

commit d8c78f42bed31a2e7dde7007c6027b45cf573128
Author: Olakunle Olanrewaju <77918485+Cdf-creator@users.noreply.github.com>
Date:   Fri Oct 15 17:39:27 2021 +0100

    Get all icons in the Figma file and replace it in the app (#968)

    * Copy and paste

    * Changes requested fixed. Remove the comments

    * new changes

    * conflict resolved

    * Solved conflicts

    * changes fixed

    * Resolved

    * Resolved

    * Everything about the Poll Feature is now removed.

    * Poll packages removed, non Figma icons replaced.

    * Conflict Resolved

    * Resolved conflict

    * Conflict Resolved

    * All texts text moved to
    app_strings.dart

    * All requested changes now finally done

    * Done changes.

commit 3baa3928dbd03582cb901c9b1fce0bae939a3b35
Author: Alexchuk <48722111+alecxchuk@users.noreply.github.com>
Date:   Fri Oct 15 17:31:00 2021 +0100

    Implemented User mentions in textfield (#942)

    * 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>

    * merged changes

    * Implemented User mentions

    * Deleted unused code

    * Deleted unused code

    * Update expandable_textfield_screen_viewmodel.dart

    Comments removed

    Co-authored-by: Paul Imoke <pauleke65@gmail.com>
    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: 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>

commit 4cf27485acc49ff5e470ec90dcbf836fd2cb7a77
Author: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Date:   Fri Oct 15 10:29:38 2021 +0100

    deleted (#982)

commit 20c083ad510b9c47b9cee52f7ccce1d07c5283bf
Author: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
Date:   Fri Oct 15 06:46:15 2021 +0000

    Users Away/Active implementation (#978)

    * 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

    * Set Users Away/Active implementation

commit c0e899e794c3d311d689268f420f3e465cb3cfa6
Author: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Date:   Fri Oct 15 07:44:35 2021 +0100

    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

    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

    * Forgot password completed

    * More Strings translation

    * Remaining String translation

    * More fixes

    Co-authored-by: Paul Eke <pauleke65@gmail.com>
    Co-authored-by: Mariam Hamzat <titilayobolamide247@gmail.com>

commit ae9b0908d58321c116b4a06b8d7ebb360c5a57d0
Author: Ayela Bukola <81062900+kenziematch@users.noreply.github.com>
Date:   Fri Oct 15 07:36:07 2021 +0100

    Feat: Logo Update (#977)

    * changed the splash screen logo and appBar logo

    * Feat: Changed App Logo

commit 4fd15e6d4e04afd97488b60d45e9ff6b97a6a3b7
Author: eunicePops <40694423+eunicePops@users.noreply.github.com>
Date:   Fri Oct 15 07:32:11 2021 +0100

    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

commit 363a144e4bd0f5a61aad0a49d5d6533a9ccf7209
Author: Paul Imoke <pauleke65@gmail.com>
Date:   Thu Oct 14 22:37:51 2021 +0100

    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

commit 4515f70da9307fd6ce945dc3af32cfbfb6c8e0f5
Author: Stanley Ibe <ugoostanleyibe@gmail.com>
Date:   Thu Oct 14 20:58:31 2021 +0100

    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

commit e1faeb5e047ed7f39c0c91128107ec732db782c8
Author: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Date:   Thu Oct 14 18:24:31 2021 +0100

    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

commit 2520394c6390cc8ef8d47927d51347b57cd255aa
Author: Abdulsamad Osunlana <81052783+developerBarak@users.noreply.github.com>
Date:   Thu Oct 14 16:25:04 2021 +0000

    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

commit 305c4fc30105f8e60819a2110dd9b7777fa94283
Author: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Date:   Thu Oct 14 13:51:33 2021 +0100

    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>

commit 2b18fcf6a9b128f1adc38d011f0bcc8e61dee43c
Author: Ayodeji Ogundairo <Xclusivecyborg@gmail.com>
Date:   Thu Oct 14 11:49:11 2021 +0100

    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

commit d87e637ba51b53b6e33ee141a8d80159e4c1fc44
Author: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Date:   Thu Oct 14 07:39:03 2021 +0100

    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>

commit 47458d30654be62a6dab0e6117716325faded06f
Author: Paul Imoke <pauleke65@gmail.com>
Date:   Thu Oct 14 07:36:52 2021 +0100

    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

commit dcfe4903473ed834fab721559d775ff05e869abe
Author: Nathaniel Akubuo <nakubuo@gmail.com>
Date:   Wed Oct 13 21:45:02 2021 +0100

    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

commit 0a048275980ce8f5e4bcb3341cb83f760018ddfc
Author: Starhkz <67955282+Starhkz@users.noreply.github.com>
Date:   Wed Oct 13 11:27:36 2021 -0700

    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

commit 70d4edff8eb9830061aa1fce51cf7ea64364bc7b
Author: Ayela Bukola <81062900+kenziematch@users.noreply.github.com>
Date:   Wed Oct 13 19:10:08 2021 +0100

    Feat:  Page Transition (#960)

commit 30391b29a625c0169099dd1ddbce8c741be83048
Author: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Date:   Wed Oct 13 19:08:52 2021 +0100

    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

commit be224a0bab9804a476020c0f5855921f5f3bd067
Author: Paul Imoke <pauleke65@gmail.com>
Date:   Wed Oct 13 18:30:31 2021 +0100

    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

commit 5d3867c422fa5ce626855df9fe0d4ac28a5f7f22
Author: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Date:   Wed Oct 13 17:26:37 2021 +0100

    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

commit 844cd058099e3fbb8a925383a8f1a61d84200597
Author: mayor04 <67462604+mayor04@users.noreply.github.com>
Date:   Wed Oct 13 16:36:46 2021 +0100

    allowed deep link (#958)

commit 99d5c7030777fb0a04d0ab3b286c4e26cfb46406
Author: Starhkz <67955282+Starhkz@users.noreply.github.com>
Date:   Wed Oct 13 08:22:37 2021 -0700

    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

commit 077cbef80d5b257a8375b65aacad3fed28074da9
Author: Jeremiah Oluwaseun Erinola <53568423+jeremiahseun@users.noreply.github.com>
Date:   Wed Oct 13 15:06:36 2021 +0100

    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>

commit 4b2b026d0112cf990b79d1a33651237740229d40
Author: Adegoke David <64401859+Blazebrain@users.noreply.github.com>
Date:   Wed Oct 13 12:48:14 2021 +0100

    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

commit ffe3e27011bd10bb53291502f1cbeff375f7c9d7
Author: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Date:   Wed Oct 13 12:20:52 2021 +0100

    Revert "Editprofile feature again (#951)" (#953)

    This reverts commit 2a86a34e155efa34fdf8381ddfeb4cf87b482d86.

commit 2a86a34e155efa34fdf8381ddfeb4cf87b482d86
Author: Christopher Nwosu-Madueke <maduekechris65@gmail.com>
Date:   Wed Oct 13 10:58:38 2021 +0100

    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>

commit d469005aac9f66b96e98ba5fe452b976f57f376d
Author: Starhkz <67955282+Starhkz@users.noreply.github.com>
Date:   Wed Oct 13 01:29:54 2021 -0700

    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

commit 7bfc7eb45c32a962e8b8a65362d262c0d0c90129
Author: Ayela Bukola <81062900+kenziematch@users.noreply.github.com>
Date:   Wed Oct 13 08:00:40 2021 +0100

    Feat: User Check Before Entering Channel (#948)

commit ea5f9a43e84bb850328867311a22063c621b39ea
Author: Chukwuyenum Adeshina <80979473+YenumJay@users.noreply.github.com>
Date:   Wed Oct 13 07:26:05 2021 +0100

    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 …
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Conflict Resolve Conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants