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

Feat/waterbus v2 #244

Open
wants to merge 336 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
336 commits
Select commit Hold shift + click to select a range
0bb7b56
fix: Conflict
chopper985 May 7, 2024
be98cfb
fix: error test entities
chopper985 May 7, 2024
7d858a1
fix: change color background username textfield
chopper985 May 7, 2024
fc483ff
Merge pull request #261 from waterbustech/feat/map-api-update-username
lambiengcode May 7, 2024
a1cd09f
chore: definal kAppTitle
lambiengcode May 8, 2024
77c02b7
Merge branch 'feat/waterbus-v2' of github.com:waterbustech/waterbus i…
lambiengcode May 8, 2024
0963c8a
fix(meeting): grid layout overlay
lambiengcode May 8, 2024
cdbf32f
import_sorter
lambiengcode May 8, 2024
383981f
Merge pull request #262 from waterbustech/fix/grid-meetview-overlap
lambiengcode May 8, 2024
ffeb537
refactor: separate the api call function
chopper985 May 20, 2024
e6d2588
update .
lambiengcode May 20, 2024
62e7935
import_sorter
lambiengcode May 20, 2024
2a7bca7
refactor: remap sdk
chopper985 May 20, 2024
7337860
update .
lambiengcode May 21, 2024
c67f05f
Merge branch 'refactor/separate-api-call-function' of github.com:wate…
lambiengcode May 21, 2024
d1662ea
vendor: upgrade waterbus_sdk to 1.3.13
lambiengcode May 21, 2024
8b87de2
vendor: upgrade flutter sdk to 3.22.0
lambiengcode May 21, 2024
32fa583
update .
lambiengcode May 21, 2024
87a575d
fix: url meeting
lambiengcode May 21, 2024
f3a18fb
import_sorter
lambiengcode May 21, 2024
7ae4d0f
vendor: upgrade waterbus_sdk to 1.3.15
lambiengcode May 22, 2024
1697dc6
chore: build web
lambiengcode May 22, 2024
5d2cb68
Merge pull request #264 from waterbustech/refactor/separate-api-call-…
lambiengcode May 22, 2024
629435e
vendor: upgrade waterbus_sdk to 1.3.17 & support beauty filters for a…
lambiengcode May 30, 2024
6cb6ae6
Merge pull request #273 from waterbustech/feat/beauty-filters-on-android
lambiengcode May 30, 2024
a04c308
fix: web href
lambiengcode May 30, 2024
a268b25
vendor: upgrade waterbus_sdk to 1.3.18
lambiengcode May 30, 2024
fbd8b22
feat: use platform view for iOS
lambiengcode Jun 1, 2024
0077ed4
feat(linux): config support for linux
lambiengcode Jun 2, 2024
7683f3f
Merge branch 'feat/platform-view-ios' into feat/linux-supported-ext
lambiengcode Jun 2, 2024
8acc16a
chore: update google_sign_in_all_platforms
lambiengcode Jun 2, 2024
eb3ec20
Merge pull request #274 from waterbustech/feat/platform-view-ios
lambiengcode Jun 3, 2024
b142fb1
fix: compile web fail & sign in anonymously on web
lambiengcode Jun 3, 2024
1f682d5
chore: bump version 1.1.3
lambiengcode Jun 3, 2024
d179b20
fix(workflows): install linux required dependencies
lambiengcode Jun 3, 2024
79a8292
docs: add linux supported
lambiengcode Jun 3, 2024
91db485
fix(desktop): not update correct desktop capturer source
lambiengcode Jun 5, 2024
3826d3a
import_sorter
lambiengcode Jun 5, 2024
3f18470
Merge pull request #275 from waterbustech/feat/linux-supported-ext
lambiengcode Jun 5, 2024
0d7b697
vendor: upgrade packages version
lambiengcode Jun 12, 2024
705a114
vendor: upgrade flutter version to 3.22.2 in workflows
lambiengcode Jun 12, 2024
ee1eefc
fix: dart analyze
lambiengcode Jun 12, 2024
de373f0
feat: map chat event
chopper985 Jun 17, 2024
213f33c
fix: Conflict
chopper985 Jun 17, 2024
c65b645
vendor: .
lambiengcode Jun 18, 2024
b34a9cf
Merge pull request #284 from waterbustech/vendor/packages
lambiengcode Jun 18, 2024
a1c2929
fix(memory): memory leaks
lambiengcode Jun 24, 2024
7edb699
import_sorter
lambiengcode Jun 24, 2024
16cc66e
Merge pull request #288 from waterbustech/fix/memory-leaks
lambiengcode Jun 24, 2024
579fc51
style: change api_key to api-key
lambiengcode Jun 24, 2024
610dd53
fix(meeting): join room not success
lambiengcode Jun 28, 2024
beb4e87
fix: Conflict
chopper985 Jun 30, 2024
e6e5e53
feat: map chat and message feature
chopper985 Jul 3, 2024
c41b734
vendor: upgrade webrtc sdk and fix peer connection on web
lambiengcode Jul 8, 2024
24e1805
fix(android): poor performance convert bitmap to video frame
lambiengcode Jul 11, 2024
c814435
feat(theme): allow custom color seed
lambiengcode Jul 11, 2024
f9d70f9
style: update .
lambiengcode Jul 11, 2024
cfb7a0e
chore: build web
lambiengcode Jul 11, 2024
53894e8
Merge pull request #290 from waterbustech/feat/custom-color-seed
lambiengcode Jul 11, 2024
aa778c2
fix(linux): firebase authentication fail
lambiengcode Jul 11, 2024
edf30b6
Merge branch 'fix/linux-firebase-auth' into feat/waterbus-v2
lambiengcode Jul 11, 2024
7b00cf3
feat(stats): add stats view
lambiengcode Jul 12, 2024
adb2c66
import_sorter
lambiengcode Jul 12, 2024
9977bc3
feat(stats): handle callback sender stats
lambiengcode Jul 13, 2024
d0cc449
import_sorter
lambiengcode Jul 13, 2024
bb5350e
Merge pull request #291 from waterbustech/feat/call-stats
lambiengcode Jul 13, 2024
286dd00
Merge branch 'feat/waterbus-v2' of github.com:waterbustech/waterbus i…
lambiengcode Jul 13, 2024
545cc55
feat: add detail group screen
chopper985 Jul 16, 2024
be0ba07
fix: Conflict
chopper985 Jul 16, 2024
2cbfc29
feat: map socket
chopper985 Jul 18, 2024
4c10386
style(UI): add shimmer conversation and invited conversation list
chopper985 Jul 21, 2024
c2f222a
feat(subtitle): implement subtitle socket & ui
lambiengcode Jul 22, 2024
61ae423
import_sorter
lambiengcode Jul 22, 2024
928fe7b
update .
lambiengcode Jul 22, 2024
6fec7c6
Merge pull request #294 from waterbustech/feat/subtitle
lambiengcode Jul 22, 2024
6cf2af0
fix(subtitle): ui subtitle text
lambiengcode Jul 23, 2024
e5cce57
update .
lambiengcode Jul 23, 2024
c9112cd
update .
lambiengcode Jul 23, 2024
0b73eb8
Merge branch 'feat/waterbus-v2' of github.com:waterbustech/waterbus i…
lambiengcode Jul 28, 2024
cc44a4a
fix(web): initial firebase on linux web fail
lambiengcode Jul 28, 2024
fc0f85e
chore: build web
lambiengcode Jul 28, 2024
66dfe55
feat: drawing board
Lucisokiu Jul 28, 2024
f87c8a5
refactor: drawing board
Lucisokiu Jul 28, 2024
78f3a50
feat: add shimmer when get list
chopper985 Jul 28, 2024
51f6d10
feat: add get more message and status message
chopper985 Jul 30, 2024
6f572fd
feat(web): support compile wasm
lambiengcode Jul 30, 2024
7bb9d74
Merge pull request #295 from waterbustech/feat/support-wasm
lambiengcode Jul 30, 2024
5f3e8fa
Merge branch 'feat/waterbus-v2' of https://github.com/waterbustech/wa…
Lucisokiu Jul 30, 2024
78f4890
feat: update socket and bloc
Lucisokiu Jul 30, 2024
68cf328
fix: fix list props
Lucisokiu Jul 30, 2024
82afb1a
style(UI): add ui when message list empty
chopper985 Jul 31, 2024
4245ae6
fix(linux): crash when joinRoom and can't get display media
lambiengcode Aug 4, 2024
ccaa2f0
feat(connect): add reconnect
lambiengcode Aug 7, 2024
9ad08d5
vendor: upgrade flutter version to 3.24.0
lambiengcode Aug 7, 2024
a457efd
fix(ci): install dependencies
lambiengcode Aug 7, 2024
8b198af
fix: Conflict
chopper985 Aug 11, 2024
810542e
fix: Conflict
chopper985 Aug 11, 2024
9c49cef
reafact: socket
Lucisokiu Aug 13, 2024
c4b21db
feat: add snack bar and delete member feature
chopper985 Aug 14, 2024
2b76eab
refact: bloc draw
Lucisokiu Aug 20, 2024
4a54c66
fix: conflict
Lucisokiu Aug 20, 2024
4009597
refact: handle socket
Lucisokiu Aug 22, 2024
d53968e
style: format code
Lucisokiu Aug 22, 2024
f6769a5
style: format code
Lucisokiu Aug 22, 2024
428c47d
Merge pull request #298 from waterbustech/feat/drawing-jam
Lucisokiu Aug 22, 2024
d22ad5d
Revert "Feat/drawing jam"
chopper985 Aug 22, 2024
9c3fa34
Merge pull request #299 from waterbustech/revert-298-feat/drawing-jam
lambiengcode Aug 22, 2024
9861290
fix: bloc draw
Lucisokiu Aug 22, 2024
e2af171
style: format code
Lucisokiu Aug 22, 2024
910956e
chore: format code
Lucisokiu Aug 22, 2024
464115f
chore: format code
Lucisokiu Aug 22, 2024
0fb1916
chore: bump version m128.6613.01
lambiengcode Aug 26, 2024
db0df64
docs: add rust in requirements
lambiengcode Aug 26, 2024
97b12be
Merge branch 'feat/waterbus-v2' of github.com:waterbustech/waterbus i…
lambiengcode Aug 26, 2024
0afeb69
update .
lambiengcode Aug 26, 2024
aedf1d7
fix: simulcast android
lambiengcode Aug 27, 2024
cac379b
fix: error show lassmessage when edit and delete message
chopper985 Sep 6, 2024
d6e5700
feat: add colors for draw
Lucisokiu Sep 7, 2024
0d3bd38
fix: conflicts
Lucisokiu Sep 7, 2024
00fd5ee
fix: conflicts
Lucisokiu Sep 7, 2024
8760758
feat: add colors for jam
Lucisokiu Sep 11, 2024
b2f0159
vendor: upgrade waterbus_sdk to 1.4.16
lambiengcode Sep 12, 2024
f9cbcea
fix: error get messages
chopper985 Sep 16, 2024
5f9d914
fix: Conflict
chopper985 Sep 16, 2024
455d41e
chore: update pubspec yaml
chopper985 Sep 16, 2024
986bd90
vendor: update version flutter sdk
chopper985 Sep 17, 2024
9a5a1bc
Merge pull request #293 from waterbustech/feat/map-chat-feature
lambiengcode Sep 17, 2024
14c9de0
chore: bump version 1.2.0
lambiengcode Sep 22, 2024
2b9578c
Merge pull request #316 from waterbustech/chore/version-1.2.0
lambiengcode Sep 22, 2024
cb0470d
chore: build web
lambiengcode Sep 22, 2024
89d46ee
feat(ui): redesign desktop ui
lambiengcode Sep 25, 2024
8ecb29d
import_sorter
lambiengcode Sep 25, 2024
8125a10
feat: change colors, undo, redo
Lucisokiu Sep 26, 2024
b8e6586
chore: format code
Lucisokiu Sep 26, 2024
ae0cae4
feat(record): map record feature
lambiengcode Oct 7, 2024
92470cd
import_sorter
lambiengcode Oct 7, 2024
dfd0453
feat: avatar default
chopper985 Oct 12, 2024
c192fe6
reafactor: bloc draw oprtion
Lucisokiu Oct 12, 2024
168d558
fix: conflic
Lucisokiu Oct 12, 2024
ab835de
update .
lambiengcode Oct 13, 2024
57b377b
import_sorter
lambiengcode Oct 13, 2024
eea5cbb
chore(docs): update README
lambiengcode Oct 13, 2024
ab46f7a
chore(docs): remove set keystore password
lambiengcode Oct 13, 2024
eca9e58
feat: add socket, bloc
Lucisokiu Oct 13, 2024
8d55463
fix: handle socket
Lucisokiu Oct 14, 2024
dcf3a5e
feat(meeting): update call dialog settings
lambiengcode Oct 14, 2024
c98c6a2
import_sorter
lambiengcode Oct 14, 2024
9b2e59a
fix: undo, redo
Lucisokiu Oct 14, 2024
214132f
feat(notification): done settings for notification
lambiengcode Oct 15, 2024
6562fb3
import_sorter
lambiengcode Oct 15, 2024
b1e7359
style: side bar
Lucisokiu Oct 15, 2024
02a36c1
feat(record): record screen
lambiengcode Oct 19, 2024
4c30bc7
feat(record): save video file
lambiengcode Oct 19, 2024
de6a70e
feat(record): implement video player
lambiengcode Oct 19, 2024
ba26207
import_sorter
lambiengcode Oct 19, 2024
e552299
refact: bloc, UI
Lucisokiu Oct 19, 2024
f58c389
feat(record): impl refresh records
lambiengcode Oct 20, 2024
1ed0381
import_sorter
lambiengcode Oct 20, 2024
97d060c
refactor(whiteboard): .
lambiengcode Oct 20, 2024
c3d4aa4
import_sorter
lambiengcode Oct 20, 2024
e284abd
style(whiteboard): update ui
lambiengcode Oct 20, 2024
b4a8b4e
import_sorter
lambiengcode Oct 20, 2024
5b79873
Merge branch 'feat/new-ui' of github.com:waterbustech/waterbus into f…
lambiengcode Oct 20, 2024
798be31
update .
lambiengcode Oct 20, 2024
9c05c39
Merge pull request #300 from waterbustech/feat/drawing-jam
lambiengcode Oct 20, 2024
d048d76
feat(whiteboard): update .
lambiengcode Oct 20, 2024
ea88657
update .
lambiengcode Oct 20, 2024
0e1d2d7
Merge pull request #332 from waterbustech/feat/record-meeting
lambiengcode Oct 20, 2024
74697a6
feat: add feature update avatar and title
chopper985 Oct 21, 2024
0969355
fix: Conflict
chopper985 Oct 21, 2024
23e106d
Merge pull request #342 from waterbustech/feat/avatar-meeting
lambiengcode Oct 21, 2024
b8da691
feat: edit logic edit conversation
chopper985 Oct 22, 2024
9c246d6
feat: add popover side footer
chopper985 Oct 22, 2024
3efa46d
feat: set avatar default by title
chopper985 Oct 22, 2024
4a70dee
feat: archived conversation
chopper985 Oct 22, 2024
9cb3709
feat: archived conversation in phone
chopper985 Oct 22, 2024
fcbfe11
feat(ui): add dialog completed
lambiengcode Oct 23, 2024
33305cf
import_sorter
lambiengcode Oct 23, 2024
57fe434
feat: map api archived
chopper985 Oct 23, 2024
8f1238e
chore: sort import
chopper985 Oct 23, 2024
5a33ec5
update .
Oct 23, 2024
88ac273
style(meeting): update meeting layout
lambiengcode Oct 23, 2024
6d7a75b
Merge branch 'feat/new-ui' of github.com:waterbustech/waterbus into f…
lambiengcode Oct 24, 2024
dea0433
feat: change layout chat to conversation in desktop
chopper985 Oct 24, 2024
8db7c81
feat: add context menu custom
chopper985 Oct 24, 2024
659a667
chore: sort import
chopper985 Oct 24, 2024
9fb5a2a
update .
lambiengcode Oct 24, 2024
5cc4074
Merge pull request #344 from waterbustech/feat/context-menu-custom
lambiengcode Oct 24, 2024
e734c23
update .
lambiengcode Oct 24, 2024
a46a137
import_sorter
lambiengcode Oct 24, 2024
764b417
Merge pull request #345 from waterbustech/feat/new-meeting-layout
lambiengcode Oct 24, 2024
c7a002e
update .
lambiengcode Oct 24, 2024
f134e92
import_sorter
lambiengcode Oct 24, 2024
1969bf2
Merge pull request #343 from waterbustech/feat/map-archived-feature
lambiengcode Oct 25, 2024
99edd5e
clean .
lambiengcode Oct 25, 2024
ff73394
fix(video_player): compile wasm fail
lambiengcode Oct 25, 2024
9938e30
import_sorter
lambiengcode Oct 25, 2024
ad7c6ee
feat: raise-hand
Lucisokiu Oct 25, 2024
56c065c
style(bottomsheet): set background color
lambiengcode Oct 26, 2024
1c32d90
fix(message): correct show avatar and name
lambiengcode Oct 26, 2024
8fa9897
fix(message): fix latestJoinedAt
lambiengcode Oct 26, 2024
2b69fe6
vendor(sdk): upgrade flutter sdk to 3.24.4 in actions
lambiengcode Oct 26, 2024
21fc53f
Merge pull request #346 from waterbustech/feat/new-ui
lambiengcode Oct 26, 2024
46c8d14
doc(): update video readme
lambiengcode Oct 26, 2024
396390b
Merge pull request #347 from waterbustech/feat/new-ui
lambiengcode Oct 26, 2024
7142990
feat: sound
Lucisokiu Oct 26, 2024
70e9ab5
fix: conflic
Lucisokiu Oct 26, 2024
112f422
update .
lambiengcode Oct 27, 2024
7e90e0e
Merge pull request #348 from waterbustech/feat/raise-hand
lambiengcode Oct 27, 2024
f33c391
feat(windows): add support for windows
lambiengcode Oct 31, 2024
42343df
docs(Readme): add requirements for linux
lambiengcode Oct 31, 2024
580a8d3
update .
lambiengcode Nov 2, 2024
46af20d
feat: edit chat, chat invited, user, user search, auth
chopper985 Nov 17, 2024
5c6a4ca
feat: message, meeting, beauty filtes, recent joined, whiteboard
chopper985 Nov 17, 2024
f6cecd3
feat: home, record, themes, archived
chopper985 Nov 17, 2024
ea8f6c4
chore: rename event recent joined started
chopper985 Nov 17, 2024
9a70160
Merge pull request #351 from waterbustech/feat/windows-supported
lambiengcode Nov 18, 2024
ccd402f
feat: windows-supported
Lucisokiu Nov 26, 2024
891226f
feat: catch chat, message api exceptions
chopper985 Nov 27, 2024
c34857b
feat: shorts key
Lucisokiu Dec 3, 2024
788cd40
fix(android): adaptive icon launcher
kaisoda Dec 3, 2024
3c511ee
feat: update naming convention
chopper985 Dec 13, 2024
2015859
fix: Conflict
chopper985 Dec 13, 2024
45085ff
chore: update logo
kaisoda Dec 15, 2024
54e3316
fix: catch api user, auth, meeting exception
chopper985 Dec 16, 2024
36badf0
chore: rename result variable when call api
chopper985 Dec 16, 2024
b49df1e
fix: Conflict
chopper985 Dec 16, 2024
a63e747
update .
kaisoda Dec 16, 2024
fd67d8a
chore: sort import
chopper985 Dec 16, 2024
a5ab148
Merge pull request #373 from waterbustech/feat/windows-supported
lambiengcode Dec 17, 2024
295d976
update .
kaisoda Dec 17, 2024
5ef1977
Merge pull request #362 from waterbustech/feat/bloc-naming-conversation
lambiengcode Dec 18, 2024
d22deeb
fix(android): crash when run debug mode
lambiengcode Dec 18, 2024
4b94e30
fix(android): crash when run debug mode
chopper985 Dec 18, 2024
9449f82
style: edit logic check result success
chopper985 Dec 19, 2024
4556514
fix: Conflict
chopper985 Dec 19, 2024
55f37eb
chore: edit path flutter waterbus sdk
chopper985 Dec 21, 2024
fa3bc89
fix: Conflict
chopper985 Dec 21, 2024
6316d49
chore: sort import
chopper985 Dec 21, 2024
cf3f18f
update .
lambiengcode Dec 22, 2024
b0222d0
Merge pull request #389 from waterbustech/fix/android-camera-rotation
lambiengcode Dec 22, 2024
e96ca24
chore: build web
lambiengcode Dec 22, 2024
ee2050c
fix: background color & emoji color on web
lambiengcode Dec 22, 2024
0071f59
chore: build web
lambiengcode Dec 22, 2024
2b27696
fix: debug on android
Lucisokiu Dec 22, 2024
6a74a43
Merge branch 'feat/waterbus-v2' of https://github.com/waterbustech/wa…
Lucisokiu Dec 22, 2024
92797db
fix: conflic
Lucisokiu Dec 22, 2024
0db88bb
chore: format
Lucisokiu Dec 22, 2024
b93456b
chore: PR
Lucisokiu Dec 24, 2024
8b9e177
Merge pull request #376 from waterbustech/feat/short-key
lambiengcode Jan 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/icons/ic_add_members.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/img_hello_message_1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/img_hello_message_2.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/img_hello_message_3.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/img_hello_message_4.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/img_hello_message_5.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/img_hello_message_6.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/img_hello_message_7.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions lib/core/app/colors/app_color.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart';

const Color colorBlack = Color(0xFF121212);
const Color colorPrimaryBlack = Color(0xFF14171A);
const Color colorBlackGlassmorphism = Color(0xFF292929);
const Color colorDarkGrey = Color(0xFF657786);
const Color colorPrimary = Color(0xFF1DA1F2);
const Color colorTitle = Color(0xFF2C3D50);
Expand Down
48 changes: 48 additions & 0 deletions lib/core/app/lang/data/english.dart
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ Map<String, String> english = {
Strings.search: "Search",
Strings.createRoom: "Create Room",
Strings.chat: "Chats",
Strings.delete: "Delete",
Strings.sureDeleteConversation:
'Are you sure you want to delete\nthis conversation?',
Strings.sureDeleteMessage: 'Are you sure you want to delete\nthis message?',
Strings.leaveAMessage: "Leave a message...",
Strings.invitedChat: "Invited chat",
Strings.enterPassword: "Enter Password",
Strings.createMeeting: "Create Meeting",
Strings.editMeeting: "Edit Meeting",
Expand All @@ -83,6 +89,7 @@ Map<String, String> english = {
Strings.dataSaver: "Data Saver",
Strings.balance: "Balance",
Strings.highQuality: "High Quality",
Strings.back: "Back",

// Profile screen
Strings.profile: "Profile",
Expand All @@ -109,6 +116,9 @@ Map<String, String> english = {
Strings.frameSent: "Frame sent",
Strings.resolution: "Resolution",
Strings.latency: "Latency (ms)",
Strings.updatedPersonalInformationSuccessfully:
"Updated personal information successfully!",
Strings.updateUsernameSuccessfully: "Updated username successful!",

// Settings screen
Strings.myProfile: "My Profile",
Expand All @@ -123,4 +133,42 @@ Map<String, String> english = {
Strings.changeYourAvatar: 'Change your avatar',
Strings.chooseFromGallery: 'Choose photo from gallery',
Strings.takeAPhoto: 'Take a photo',

// Chat Screen
Strings.videoCall: 'Video call',
Strings.mute: 'Mute',
Strings.more: 'More',
Strings.addMembers: 'Add members',
Strings.owner: 'Owner',
Strings.youHaveBeenInvitedToChat: 'You have been invited to chat',
Strings.confirm: "Confirm",
Strings.inviting: "Inviting",
Strings.invisible: "Invisible",
Strings.joined: "Joined",
Strings.leaveTheConversation: "Leave the conversation",
Strings.sureLeaveConversation:
"Are you sure you want to leave this conversation? This conversation will be deleted for you and you will no longer be a member of this conversation.",
Strings.member: "Member",
Strings.members: "Members",
Strings.groupCreated: "Grounp created",
Strings.sending: "Sending",
Strings.canNotSend: "Can not send!",
Strings.resend: "Resend",
Strings.you: "You",
Strings.user: "User",
Strings.unsentAMessage: "unsent a message",
Strings.hi: "Hi",
Strings.noMesssagesHereYet: "No messages here yet",
Strings.youHaveInvitedThe: "You have invited the",
Strings.toJoinConversation: "to join conversation",
Strings.hostCanNotDeleteConversation:
"You as the host cannot delete a chat while it is still a member",
Strings.sendMessageOrTapOnTheGreetingBelow:
"Send a message or tap on the greeting below.",
Strings.sureDeleteMember:
"Are you sure you want to remove this member from the chat?",
Strings.deleteMember: "Delete this member",
Strings.addConversationSuccess: "New chat has been added to the list!",
Strings.youHaveConfirmedConversation:
"You have confirmed your participation in the conversation",
};
44 changes: 44 additions & 0 deletions lib/core/app/lang/data/localization.dart
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ class Strings {
static const String search = 'search';
static const String createRoom = 'createRoom';
static const String chat = 'chats';
static const String delete = 'delete';
static const String sureDeleteConversation = 'sureDeleteConversation';
static const String sureDeleteMessage = 'sureDeleteMessage';
static const String leaveAMessage = 'leaveAMessage';
static const String invitedChat = 'invitedChat';
static const String enterPassword = 'enterPassword';
static const String createMeeting = 'createMeeting';
static const String editMeeting = 'editMeeting';
Expand All @@ -96,6 +101,7 @@ class Strings {
static const String frameSent = 'frameSent';
static const String resolution = 'resolution';
static const String latency = 'latency';
static const String back = 'back';

// Profile screen
static const String profile = 'profile';
Expand All @@ -114,6 +120,9 @@ class Strings {
static const String canUseUsername = 'canUseUsername';
static const String usernameUsed = 'usernameUsed';
static const String checking = 'checking';
static const String updateUsernameSuccessfully = 'updateUsernameSuccessfully';
static const String updatedPersonalInformationSuccessfully =
'updatedPersonalInformationSuccessfully';

// Settings screen
static const String myProfile = 'myProfile';
Expand All @@ -127,6 +136,41 @@ class Strings {
static const String changeYourAvatar = 'changeYourAvatar';
static const String chooseFromGallery = 'chooseFromGallery';
static const String takeAPhoto = 'takeAPhoto';

// Chat Screen
static const String videoCall = 'videoCall';
static const String mute = 'mute';
static const String more = 'more';
static const String addMembers = 'addMembers';
static const String owner = 'owner';
static const String youHaveBeenInvitedToChat = 'youHaveBeenInvitedToChat';
static const String confirm = 'confirm';
static const String inviting = 'inviting';
static const String invisible = 'invisible';
static const String joined = 'joined';
static const String leaveTheConversation = 'leaveTheConversation';
static const String sureLeaveConversation = 'descriptionOfLeaveConversation';
static const String member = 'member';
static const String members = 'members';
static const String groupCreated = 'grounpCreated';
static const String sending = 'sending';
static const String canNotSend = 'canNotSend';
static const String resend = 'resend';
static const String you = 'you';
static const String user = 'user';
static const String unsentAMessage = 'unsentAMessage';
static const String hi = 'hi';
static const String noMesssagesHereYet = 'noMesssagesHereYet';
static const String youHaveInvitedThe = 'youHaveInvitedThe';
static const String toJoinConversation = 'toJoinConversation';
static const String deleteMember = 'deleteMember';
static const String addConversationSuccess = 'addConversationSuccess';
static const String sureDeleteMember = 'sureDeleteMember';
static const String youHaveConfirmedConversation = "youConfirmedConversation";
static const String hostCanNotDeleteConversation =
'hostCanNotDeleteConversation';
static const String sendMessageOrTapOnTheGreetingBelow =
'sendMessageOrTapOnTheGreetingBelow';
}

class MyI18n {
Expand Down
49 changes: 49 additions & 0 deletions lib/core/app/lang/data/vietnamese.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ Map<String, String> vietnamese = {
Strings.search: "Tìm kiếm",
Strings.createRoom: "Tạo Phòng",
Strings.chat: "Trò Chuyện",
Strings.delete: "Xoá",
Strings.sureDeleteConversation:
'Bạn có chắc chắn muốn xoá\ncuộc trò chuyện này?',
Strings.sureDeleteMessage: 'Bạn có chắc chắn muốn xoá\tin nhắn này?',
Strings.leaveAMessage: "Để lại lời nhắn...",
Strings.invitedChat: "Lời mời",
Strings.enterPassword: "Nhập mật khẩu",
Strings.createMeeting: "Tạo cuộc họp",
Strings.editMeeting: "Chỉnh sửa cuộc họp",
Expand All @@ -89,6 +95,7 @@ Map<String, String> vietnamese = {
Strings.frameSent: "Khung đã gửi",
Strings.resolution: "Độ phân giải",
Strings.latency: "Độ trễ (mili giây)",
Strings.back: "Thoát",

// Profile screen
Strings.profile: "Hồ sơ",
Expand All @@ -108,6 +115,9 @@ Map<String, String> vietnamese = {
Strings.canUseUsername: "Bạn có thể sử dụng tên tài khoản này",
Strings.usernameUsed: "Tên này đã được sử dụng",
Strings.checking: "Đang kiểm tra",
Strings.updateUsernameSuccessfully: "Cập nhật tên tài khoản thành công!",
Strings.updatedPersonalInformationSuccessfully:
"Cập nhật thông tin cá nhân thành công!",

// Settings screen
Strings.myProfile: "Thông tin cá nhân",
Expand All @@ -122,4 +132,43 @@ Map<String, String> vietnamese = {
Strings.changeYourAvatar: 'Đổi ảnh đại diện',
Strings.chooseFromGallery: 'Chọn ảnh từ thư viện',
Strings.takeAPhoto: 'Chụp ảnh mới',

// Chat screen
Strings.videoCall: 'Gọi video',
Strings.mute: 'Im lặng',
Strings.more: 'Thêm',
Strings.addMembers: 'Thêm thành viên',
Strings.owner: 'Chủ phòng',
Strings.youHaveBeenInvitedToChat: 'Bạn đã được mời tham gia cuộc trò chuyện',
Strings.confirm: "Xác nhận",
Strings.inviting: "Đang mời",
Strings.invisible: "Ẩn",
Strings.joined: "Đã tham gia",
Strings.leaveTheConversation: "Rời khỏi cuộc trò chuyện",
Strings.sureLeaveConversation:
"Bạn có chắc chắn muốn rời khỏi cuộc hội thoại này không? Cuộc hội thoại này sẽ bị xoá đối với bạn và bạn sẽ không còn là thành viên của cuộc hội thoại này nữa.",
Strings.member: "Thành viên",
Strings.members: "Thành viên",
Strings.groupCreated: "Nhóm đã được tạo",
Strings.sending: "Đang gửi",
Strings.canNotSend: "Không thể gửi!",
Strings.resend: "Gửi lại",
Strings.you: "Bạn",
Strings.user: "Người dùng",
Strings.unsentAMessage: "đã thu hồi tin nhắn",
Strings.hi: "Xin chào",
Strings.noMesssagesHereYet: "Chưa có tin nhắn nào",
Strings.hostCanNotDeleteConversation:
"Bạn với tư cách là chủ phòng không thể xóa cuộc trò chuyện khi vẫn còn thành viên",
Strings.youHaveInvitedThe: "Bạn đã mời",
Strings.toJoinConversation: "tham gia cuộc trò chuyện",
Strings.sendMessageOrTapOnTheGreetingBelow:
"Gửi tin nhắn hoặc nhấn vào lời chào bên dưới.",
Strings.sureDeleteMember:
"Bạn có chắc chắn muốn xoá thành viên này khỏi cuộc trò truyện không?",
Strings.deleteMember: "Xoá thành viên",
Strings.addConversationSuccess:
"Cuộc trò truyện mới đã được thêm vào danh sách!",
Strings.youHaveConfirmedConversation:
"Bạn đã xác nhận tham gia cuộc trò chuyện",
};
3 changes: 3 additions & 0 deletions lib/core/constants/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ const double k43 = 4 / 3;
const double k169 = 16 / 9;
const double k11 = 1;

const int defaultLengthOfShimmerList = 10;
const int defaultLengthOfMessages = 30;

final User kUserDefault = User(
id: 0,
fullName: 'Waterbus',
Expand Down
21 changes: 15 additions & 6 deletions lib/core/injection/injection_container.config.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 24 additions & 1 deletion lib/core/navigator/app_navigator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import 'package:waterbus/core/navigator/app_routes.dart';
import 'package:waterbus/core/navigator/app_scaffold.dart';
import 'package:waterbus/core/utils/modal/show_dialog.dart';
import 'package:waterbus/features/auth/presentation/screens/login_screen.dart';
import 'package:waterbus/features/chats/presentation/screens/invited_chat_screen.dart';
import 'package:waterbus/features/conversation/screens/conversation_screen.dart';
import 'package:waterbus/features/conversation/screens/detail_group_screen.dart';
import 'package:waterbus/features/home/screens/home.dart';
import 'package:waterbus/features/meeting/presentation/screens/background_gallery.dart';
import 'package:waterbus/features/meeting/presentation/screens/create_meeting_screen.dart';
Expand Down Expand Up @@ -91,6 +93,7 @@ class AppNavigator extends RouteObserver<PageRoute<dynamic>> {
settings,
CreateMeetingScreen(
meeting: arguments?['meeting'],
isChatScreen: arguments?['isChatScreen'] ?? false,
),
);
case Routes.enterCodeRoute:
Expand All @@ -108,9 +111,14 @@ class AppNavigator extends RouteObserver<PageRoute<dynamic>> {
return _buildRoute(
settings,
ConversationScreen(
chatModel: arguments!['chatModel'],
meeting: arguments!['meeting'],
),
);
case Routes.invitedRoute:
return _buildRoute(
settings,
const InvitedChatScreen(),
);
case Routes.langRoute:
return _buildRoute(
settings,
Expand All @@ -121,6 +129,13 @@ class AppNavigator extends RouteObserver<PageRoute<dynamic>> {
settings,
const ThemeScreen(),
);
case Routes.detailGroupRoute:
return _buildRoute(
settings,
DetailGroupScreen(
meeting: arguments?['meeting'],
),
);
default:
return _buildRoute(
const RouteSettings(name: Routes.rootRoute),
Expand Down Expand Up @@ -271,6 +286,8 @@ extension AppNavigatorX on AppNavigator {
Routes.settingsCallRoute,
Routes.langRoute,
Routes.themeRoute,
Routes.invitedRoute,
Routes.detailGroupRoute,
];

Widget getWidgetByRoute({
Expand All @@ -288,6 +305,12 @@ extension AppNavigatorX on AppNavigator {
return const LanguageScreen();
case Routes.themeRoute:
return const ThemeScreen();
case Routes.invitedRoute:
return const InvitedChatScreen();
case Routes.detailGroupRoute:
return DetailGroupScreen(
meeting: arguments?['meeting'],
);
default:
return const SizedBox();
}
Expand Down
2 changes: 2 additions & 0 deletions lib/core/navigator/app_routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ class Routes {

// Chat
static const String conversationRoute = '/conversation';
static const String invitedRoute = '/invited';
static const String detailGroupRoute = '/detail-group';

// Others
static const String dialogRoute = '/dialog';
Expand Down
Loading
Loading