2022-02-01 17:34:06 +00:00
//
// C h a t L i s t V i e w . s w i f t
// S i m p l e X
//
// C r e a t e d b y E v g e n y P o b e r e z k i n o n 2 7 / 0 1 / 2 0 2 2 .
// C o p y r i g h t © 2 0 2 2 S i m p l e X C h a t . A l l r i g h t s r e s e r v e d .
//
import SwiftUI
2022-05-31 07:55:13 +01:00
import SimpleXChat
2022-02-01 17:34:06 +00:00
struct ChatListView : View {
@ EnvironmentObject var chatModel : ChatModel
2023-04-12 12:22:55 +02:00
@ Binding var showSettings : Bool
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
@ State private var searchMode = false
@ FocusState private var searchFocussed
2022-02-13 08:45:08 +00:00
@ State private var searchText = " "
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
@ State private var searchShowingSimplexLink = false
@ State private var searchChatFilteredBySimplexLink : String ? = nil
@ State private var newChatMenuOption : NewChatMenuOption ? = nil
2023-06-19 11:13:30 +01:00
@ State private var userPickerVisible = false
2023-11-16 16:53:44 +00:00
@ State private var showConnectDesktop = false
2023-06-19 11:13:30 +01:00
@ AppStorage ( DEFAULT_SHOW_UNREAD_AND_FAVORITES ) private var showUnreadAndFavorites = false
2022-02-01 17:34:06 +00:00
var body : some View {
2023-07-10 13:53:46 +01:00
if #available ( iOS 16.0 , * ) {
viewBody . scrollDismissesKeyboard ( . immediately )
} else {
viewBody
}
}
private var viewBody : some View {
2023-01-17 17:47:37 +00:00
ZStack ( alignment : . topLeading ) {
2023-01-23 18:45:24 +00:00
NavStackCompat (
isActive : Binding (
2023-10-31 09:44:57 +00:00
get : { chatModel . chatId != nil } ,
2023-01-23 18:45:24 +00:00
set : { _ in }
) ,
destination : chatView
) {
2023-01-17 17:47:37 +00:00
VStack {
if chatModel . chats . isEmpty {
onboardingButtons ( )
}
2023-05-26 15:49:26 +04:00
chatListView
2022-02-02 16:46:05 +00:00
}
2023-01-17 17:47:37 +00:00
}
if userPickerVisible {
Rectangle ( ) . fill ( . white . opacity ( 0.001 ) ) . onTapGesture {
withAnimation {
userPickerVisible . toggle ( )
}
2022-09-24 21:02:01 +01:00
}
2022-02-12 15:59:43 +00:00
}
2023-11-16 16:53:44 +00:00
UserPicker (
showSettings : $ showSettings ,
showConnectDesktop : $ showConnectDesktop ,
userPickerVisible : $ userPickerVisible
)
}
. sheet ( isPresented : $ showConnectDesktop ) {
ConnectDesktopView ( )
2022-09-21 15:11:52 +01:00
}
}
2023-05-26 15:49:26 +04:00
private var chatListView : some View {
VStack {
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
chatList
2022-09-21 15:11:52 +01:00
}
2023-01-17 17:47:37 +00:00
. onDisappear ( ) { withAnimation { userPickerVisible = false } }
2023-07-05 09:09:56 +01:00
. refreshable {
AlertManager . shared . showAlert ( Alert (
title : Text ( " Reconnect servers? " ) ,
message : Text ( " Reconnect all connected servers to force message delivery. It uses additional traffic. " ) ,
primaryButton : . default ( Text ( " Ok " ) ) {
Task {
do {
try await reconnectAllServers ( )
} catch let error {
AlertManager . shared . showAlertMsg ( title : " Error " , message : " \( responseError ( error ) ) " )
}
}
} ,
secondaryButton : . cancel ( )
) )
}
2022-09-21 15:11:52 +01:00
. listStyle ( . plain )
. navigationBarTitleDisplayMode ( . inline )
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
. navigationBarHidden ( searchMode )
2022-09-21 15:11:52 +01:00
. toolbar {
ToolbarItem ( placement : . navigationBarLeading ) {
2023-07-10 07:57:23 +01:00
let user = chatModel . currentUser ? ? User . sampleData
ZStack ( alignment : . topTrailing ) {
ProfileImage ( imageStr : user . image , color : Color ( uiColor : . quaternaryLabel ) )
. frame ( width : 32 , height : 32 )
. padding ( . trailing , 4 )
let allRead = chatModel . users
. filter { u in ! u . user . activeUser && ! u . user . hidden }
. allSatisfy { u in u . unreadCount = = 0 }
if ! allRead {
unreadBadge ( size : 12 )
}
}
. onTapGesture {
2023-04-17 19:13:10 +02:00
if chatModel . users . filter ( { u in u . user . activeUser || ! u . user . hidden } ) . count > 1 {
2023-01-20 13:17:41 +00:00
withAnimation {
userPickerVisible . toggle ( )
}
} else {
showSettings = true
2023-01-17 17:47:37 +00:00
}
}
2022-09-21 15:11:52 +01:00
}
ToolbarItem ( placement : . principal ) {
2023-06-19 11:13:30 +01:00
HStack ( spacing : 4 ) {
Text ( " Chats " )
. font ( . headline )
if chatModel . chats . count > 0 {
toggleFilterButton ( )
2022-08-23 18:18:12 +04:00
}
}
2023-06-19 11:13:30 +01:00
. frame ( maxWidth : . infinity , alignment : . center )
2022-09-21 15:11:52 +01:00
}
ToolbarItem ( placement : . navigationBarTrailing ) {
switch chatModel . chatRunning {
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
case . some ( true ) : NewChatMenuButton ( newChatMenuOption : $ newChatMenuOption )
2022-09-21 15:11:52 +01:00
case . some ( false ) : chatStoppedIcon ( )
case . none : EmptyView ( )
2022-02-11 07:42:00 +00:00
}
}
2022-02-01 17:34:06 +00:00
}
2022-09-21 15:11:52 +01:00
}
2022-02-13 08:45:08 +00:00
2023-06-19 11:13:30 +01:00
private func toggleFilterButton ( ) -> some View {
Button {
showUnreadAndFavorites = ! showUnreadAndFavorites
} label : {
Image ( systemName : " line.3.horizontal.decrease.circle " + ( showUnreadAndFavorites ? " .fill " : " " ) )
. foregroundColor ( . accentColor )
}
}
2023-06-27 10:28:47 +01:00
@ ViewBuilder private var chatList : some View {
let cs = filteredChats ( )
ZStack {
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
VStack {
List {
if ! chatModel . chats . isEmpty {
ChatListSearchBar (
searchMode : $ searchMode ,
searchFocussed : $ searchFocussed ,
searchText : $ searchText ,
searchShowingSimplexLink : $ searchShowingSimplexLink ,
searchChatFilteredBySimplexLink : $ searchChatFilteredBySimplexLink
)
. listRowSeparator ( . hidden )
. frame ( maxWidth : . infinity )
}
ForEach ( cs , id : \ . viewId ) { chat in
ChatListNavLink ( chat : chat )
. padding ( . trailing , - 16 )
2024-01-10 23:57:34 +07:00
. disabled ( chatModel . chatRunning != true || chatModel . deletedChats . contains ( chat . chatInfo . id ) )
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
}
. offset ( x : - 8 )
2023-06-27 10:28:47 +01:00
}
2023-05-26 15:49:26 +04:00
}
2023-06-27 10:28:47 +01:00
. onChange ( of : chatModel . chatId ) { _ in
if chatModel . chatId = = nil , let chatId = chatModel . chatToTop {
chatModel . chatToTop = nil
chatModel . popChat ( chatId )
}
}
if cs . isEmpty && ! chatModel . chats . isEmpty {
Text ( " No filtered chats " ) . foregroundColor ( . secondary )
2023-05-26 15:49:26 +04:00
}
}
}
2023-01-20 13:17:41 +00:00
private func unreadBadge ( _ text : Text ? = Text ( " " ) , size : CGFloat = 18 ) -> some View {
Circle ( )
. frame ( width : size , height : size )
. foregroundColor ( . accentColor )
}
2022-09-21 15:11:52 +01:00
private func onboardingButtons ( ) -> some View {
VStack ( alignment : . trailing , spacing : 0 ) {
Path { p in
p . move ( to : CGPoint ( x : 8 , y : 0 ) )
p . addLine ( to : CGPoint ( x : 16 , y : 10 ) )
p . addLine ( to : CGPoint ( x : 0 , y : 10 ) )
p . addLine ( to : CGPoint ( x : 8 , y : 0 ) )
}
. fill ( Color . accentColor )
. frame ( width : 20 , height : 10 )
. padding ( . trailing , 12 )
connectButton ( " Tap to start a new chat " ) {
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
newChatMenuOption = . newContact
2022-09-21 15:11:52 +01:00
}
Spacer ( )
Text ( " You have no chats " )
. foregroundColor ( . secondary )
. frame ( maxWidth : . infinity )
}
. padding ( . trailing , 6 )
. frame ( maxHeight : . infinity )
}
private func connectButton ( _ label : LocalizedStringKey , action : @ escaping ( ) -> Void ) -> some View {
Button ( action : action ) {
Text ( label )
. padding ( . vertical , 10 )
. padding ( . horizontal , 20 )
2022-02-13 08:45:08 +00:00
}
2022-09-21 15:11:52 +01:00
. background ( Color . accentColor )
. foregroundColor ( . white )
. clipShape ( RoundedRectangle ( cornerRadius : 16 ) )
2022-02-13 08:45:08 +00:00
}
2022-12-30 21:47:11 +04:00
@ ViewBuilder private func chatView ( ) -> some View {
if let chatId = chatModel . chatId , let chat = chatModel . getChat ( chatId ) {
2022-08-29 14:08:46 +01:00
ChatView ( chat : chat ) . onAppear {
loadChat ( chat : chat )
}
}
}
2022-02-13 08:45:08 +00:00
private func filteredChats ( ) -> [ Chat ] {
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
if let linkChatId = searchChatFilteredBySimplexLink {
return chatModel . chats . filter { $0 . id = = linkChatId }
} else {
let s = searchString ( )
return s = = " " && ! showUnreadAndFavorites
2022-02-13 08:45:08 +00:00
? chatModel . chats
2022-08-25 17:36:26 +04:00
: chatModel . chats . filter { chat in
2023-06-27 10:28:47 +01:00
let cInfo = chat . chatInfo
switch cInfo {
2022-08-25 17:36:26 +04:00
case let . direct ( contact ) :
2023-06-27 10:28:47 +01:00
return s = = " "
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
? filtered ( chat )
: ( viewNameContains ( cInfo , s ) ||
contact . profile . displayName . localizedLowercase . contains ( s ) ||
contact . fullName . localizedLowercase . contains ( s ) )
2023-06-27 10:28:47 +01:00
case let . group ( gInfo ) :
return s = = " "
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
? ( filtered ( chat ) || gInfo . membership . memberStatus = = . memInvited )
: viewNameContains ( cInfo , s )
2024-01-18 22:57:14 +07:00
case . local :
return s = = " " || viewNameContains ( cInfo , s )
2023-06-27 10:28:47 +01:00
case . contactRequest :
return s = = " " || viewNameContains ( cInfo , s )
case let . contactConnection ( conn ) :
return s != " " && conn . localAlias . localizedLowercase . contains ( s )
case . invalidJSON :
return false
2022-08-25 17:36:26 +04:00
}
2022-04-25 10:39:28 +01:00
}
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
}
func searchString ( ) -> String {
searchShowingSimplexLink ? " " : searchText . trimmingCharacters ( in : . whitespaces ) . localizedLowercase
}
2023-06-27 10:28:47 +01:00
func filtered ( _ chat : Chat ) -> Bool {
2024-03-12 17:33:28 +00:00
( chat . chatInfo . chatSettings ? . favorite ? ? false ) ||
chat . chatStats . unreadChat ||
( chat . chatInfo . ntfsEnabled && chat . chatStats . unreadCount > 0 )
2023-06-27 10:28:47 +01:00
}
func viewNameContains ( _ cInfo : ChatInfo , _ s : String ) -> Bool {
cInfo . chatViewName . localizedLowercase . contains ( s )
}
2022-02-01 17:34:06 +00:00
}
}
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
struct ChatListSearchBar : View {
@ EnvironmentObject var m : ChatModel
@ Binding var searchMode : Bool
@ FocusState . Binding var searchFocussed : Bool
@ Binding var searchText : String
@ Binding var searchShowingSimplexLink : Bool
@ Binding var searchChatFilteredBySimplexLink : String ?
@ State private var ignoreSearchTextChange = false
@ State private var showScanCodeSheet = false
@ State private var alert : PlanAndConnectAlert ?
@ State private var sheet : PlanAndConnectActionSheet ?
var body : some View {
VStack ( spacing : 12 ) {
HStack ( spacing : 12 ) {
HStack ( spacing : 4 ) {
Image ( systemName : " magnifyingglass " )
TextField ( " Search or paste SimpleX link " , text : $ searchText )
2023-12-30 14:09:07 +00:00
. foregroundColor ( searchShowingSimplexLink ? . secondary : . primary )
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
. disabled ( searchShowingSimplexLink )
. focused ( $ searchFocussed )
. frame ( maxWidth : . infinity )
2023-12-30 14:09:07 +00:00
if ! searchText . isEmpty {
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
Image ( systemName : " xmark.circle.fill " )
. onTapGesture {
searchText = " "
}
2023-12-30 14:09:07 +00:00
} else if ! searchFocussed {
ios: rework UX of creating new connection (#3482)
* ios: connection UI (wip)
* custom search
* rework invite
* connect paste link ui
* scan rework, process errors, other fixes
* scan layout
* clear link on cancel
* improved search
* further improve search
* animation
* connect on paste in search
* layout
* layout
* layout
* layout, add conn
* delete unused invitation, create used invitation chat
* remove old views
* regular paste button
* new chat menu
* previews
* increase spacing
* animation, fix alerts
* swipe
* change text
* less sensitive gesture
* layout
* search cancel button transition
* slow down chat list animation (uses deprecated modifiers)
* icons
* update code scanner, layout
* manage camera permissions
* ask to delete unused invitation
* comment
* remove onDismiss
* don't filter chats on link in search, allow to paste text with link
* cleanup link after connection
* filter chat by link
* revert change
* show link descr
* disabled search
* underline
* filter own group
* simplify
* no animation
* add delay, move createInvitation
* update library
* possible fix for ios 15
* add explicit frame to qr code
* update library
* Revert "add explicit frame to qr code"
This reverts commit 95c7d31e47b3da39b5985cd57638885c45b77de1.
* remove comment
* fix pasteboardHasURLs, disable paste button based on it
* align help texts with changed button names
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
* update library
* Revert "fix pasteboardHasURLs, disable paste button based on it"
This reverts commit 46f63572e90dbf460faab9ce694181209712bd00.
* remove unused var
* restore disabled
* export localizations
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
2023-12-29 16:29:49 +04:00
HStack ( spacing : 24 ) {
if m . pasteboardHasStrings {
Image ( systemName : " doc " )
. onTapGesture {
if let str = UIPasteboard . general . string {
searchText = str
}
}
}
Image ( systemName : " qrcode " )
. resizable ( )
. scaledToFit ( )
. frame ( width : 20 , height : 20 )
. onTapGesture {
showScanCodeSheet = true
}
}
. padding ( . trailing , 2 )
}
}
. padding ( EdgeInsets ( top : 7 , leading : 7 , bottom : 7 , trailing : 7 ) )
. foregroundColor ( . secondary )
. background ( Color ( . tertiarySystemFill ) )
. cornerRadius ( 10.0 )
if searchFocussed {
Text ( " Cancel " )
. foregroundColor ( . accentColor )
. onTapGesture {
searchText = " "
searchFocussed = false
}
}
}
Divider ( )
}
. sheet ( isPresented : $ showScanCodeSheet ) {
NewChatView ( selection : . connect , showQRCodeScanner : true )
. environment ( \ EnvironmentValues . refresh as ! WritableKeyPath < EnvironmentValues , RefreshAction ? > , nil ) // f i x e s . r e f r e s h a b l e i n C h a t L i s t V i e w a f f e c t i n g n e s t e d v i e w
}
. onChange ( of : searchFocussed ) { sf in
withAnimation { searchMode = sf }
}
. onChange ( of : searchText ) { t in
if ignoreSearchTextChange {
ignoreSearchTextChange = false
} else {
if let link = strHasSingleSimplexLink ( t . trimmingCharacters ( in : . whitespaces ) ) { // i f S i m p l e X l i n k i s p a s t e d , s h o w c o n n e c t i o n d i a l o g u e
searchFocussed = false
if case let . simplexLink ( linkType , _ , smpHosts ) = link . format {
ignoreSearchTextChange = true
searchText = simplexLinkText ( linkType , smpHosts )
}
searchShowingSimplexLink = true
searchChatFilteredBySimplexLink = nil
connect ( link . text )
} else {
if t != " " { // i f s o m e o t h e r t e x t i s p a s t e d , e n t e r s e a r c h m o d e
searchFocussed = true
}
searchShowingSimplexLink = false
searchChatFilteredBySimplexLink = nil
}
}
}
. alert ( item : $ alert ) { a in
planAndConnectAlert ( a , dismiss : true , cleanup : { searchText = " " } )
}
. actionSheet ( item : $ sheet ) { s in
planAndConnectActionSheet ( s , dismiss : true , cleanup : { searchText = " " } )
}
}
private func connect ( _ link : String ) {
planAndConnect (
link ,
showAlert : { alert = $0 } ,
showActionSheet : { sheet = $0 } ,
dismiss : false ,
incognito : nil ,
filterKnownContact : { searchChatFilteredBySimplexLink = $0 . id } ,
filterKnownGroup : { searchChatFilteredBySimplexLink = $0 . id }
)
}
}
2022-06-24 13:52:20 +01:00
func chatStoppedIcon ( ) -> some View {
Button {
AlertManager . shared . showAlertMsg (
title : " Chat is stopped " ,
message : " You can start chat via app Settings / Database or by restarting the app "
)
} label : {
Image ( systemName : " exclamationmark.octagon.fill " ) . foregroundColor ( . red )
}
}
2022-02-01 17:34:06 +00:00
struct ChatListView_Previews : PreviewProvider {
static var previews : some View {
let chatModel = ChatModel ( )
2022-02-02 12:51:39 +00:00
chatModel . chats = [
2022-02-01 17:34:06 +00:00
Chat (
2022-02-08 09:19:25 +00:00
chatInfo : ChatInfo . sampleData . direct ,
chatItems : [ ChatItem . getSample ( 1 , . directSnd , . now , " hello " ) ]
2022-02-01 17:34:06 +00:00
) ,
Chat (
2022-02-08 09:19:25 +00:00
chatInfo : ChatInfo . sampleData . group ,
chatItems : [ ChatItem . getSample ( 1 , . directSnd , . now , " Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. " ) ]
2022-02-01 17:34:06 +00:00
) ,
Chat (
2022-02-08 09:19:25 +00:00
chatInfo : ChatInfo . sampleData . contactRequest ,
2022-02-01 17:34:06 +00:00
chatItems : [ ]
)
]
2022-02-11 07:42:00 +00:00
return Group {
2023-04-12 12:22:55 +02:00
ChatListView ( showSettings : Binding . constant ( false ) )
2022-02-11 07:42:00 +00:00
. environmentObject ( chatModel )
2023-04-12 12:22:55 +02:00
ChatListView ( showSettings : Binding . constant ( false ) )
2022-02-11 07:42:00 +00:00
. environmentObject ( ChatModel ( ) )
}
2022-02-01 17:34:06 +00:00
}
}