Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
enzevalos_iphone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
enzevalos
enzevalos_iphone
Commits
6054870f
Commit
6054870f
authored
4 years ago
by
cruxfilm
Browse files
Options
Downloads
Patches
Plain Diff
Resolves duplicates
parent
78b50b2b
No related branches found
No related tags found
1 merge request
!74
Integration of new ComposeView
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
enzevalos_iphone/SwiftUI/Contact/ContactView.swift
+0
-4
0 additions, 4 deletions
enzevalos_iphone/SwiftUI/Contact/ContactView.swift
enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
+10
-6
10 additions, 6 deletions
enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
with
10 additions
and
10 deletions
enzevalos_iphone/SwiftUI/Contact/ContactView.swift
+
0
−
4
View file @
6054870f
...
...
@@ -15,10 +15,6 @@ struct ContactView <C: DisplayContact, M: DisplayMail>: View {
public
var
fromMail
:
M
?
public
var
derivedFromKey
:
Bool
=
true
// init(contact: C, fromMail: M? = nil) {
// self.contact = contact
// }
var
body
:
some
View
{
TabView
{
ForEach
(
Tabs
,
id
:
\
.
id
){
tab
in
...
...
This diff is collapsed.
Click to expand it.
enzevalos_iphone/SwiftUI/Inbox/MailListView.swift
+
10
−
6
View file @
6054870f
...
...
@@ -51,6 +51,7 @@ struct MailListView: View {
.
padding
(
-
10
)
// Toolbar
HStack
{
self
.
idButton
Spacer
()
self
.
lastUpdate
Spacer
()
...
...
@@ -70,6 +71,12 @@ struct MailListView: View {
.
resignKeyboardOnDragGesture
()
// hide keyboard when dragging
}
private
var
idButton
:
some
View
{
Button
(
action
:
{
print
(
"Go to my id"
)
})
{
Text
(
NSLocalizedString
(
"KeyID"
,
comment
:
"id"
))
}
}
private
var
composeButton
:
some
View
{
Button
(
action
:
{
composeMail
=
true
...
...
@@ -115,14 +122,11 @@ struct MailListView: View {
let
query
=
self
.
searchText
.
lowercased
()
if
(
searchType
==
.
All
||
searchType
==
.
Sender
)
&&
(
containsSearchTerms
(
content
:
keyRecord
.
sender
.
displayname
,
searchText
:
query
)
||
containsSearchTerms
(
content
:
keyRecord
.
sender
.
email
,
searchText
:
query
))
{
return
true
}
else
if
(
searchType
==
.
All
||
searchType
==
.
Sender
)
&&
keyRecord
.
addresses
.
filter
({
containsSearchTerms
(
content
:
$0
.
email
,
searchText
:
query
)})
.
count
>
0
{
}
else
if
(
searchType
==
.
All
||
searchType
==
.
Sender
)
&&
keyRecord
.
addresses
.
filter
({
containsSearchTerms
(
content
:
$0
.
email
,
searchText
:
query
)})
.
count
>
0
{
return
true
}
else
if
(
searchType
==
.
All
||
searchType
==
.
Subject
)
&&
containsSearchTerms
(
content
:
keyRecord
.
subject
,
searchText
:
query
){
}
else
if
(
searchType
==
.
All
||
searchType
==
.
Subject
)
&&
containsSearchTerms
(
content
:
keyRecord
.
subject
,
searchText
:
query
){
return
true
}
else
if
(
searchType
==
.
All
||
searchType
==
.
Body
)
&&
containsSearchTerms
(
content
:
keyRecord
.
body
,
searchText
:
query
){
}
else
if
(
searchType
==
.
All
||
searchType
==
.
Body
)
&&
containsSearchTerms
(
content
:
keyRecord
.
body
,
searchText
:
query
){
return
true
}
return
false
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment