Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-ios
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
27
Issues
27
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-client-ios
Commits
4ce923e1
Commit
4ce923e1
authored
Nov 10, 2019
by
Kateryna Kostiuk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conversation: fix UI filetransfer lag
Change-Id: I14c3da8dc05cf05d0cd48b2fb0e8607da6ccdc25
parent
94cd91d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
44 deletions
+7
-44
Ring/Ring/Features/Conversations/Conversation/Cells/MessageCell.swift
...atures/Conversations/Conversation/Cells/MessageCell.swift
+1
-1
Ring/Ring/UI/ProgressView.swift
Ring/Ring/UI/ProgressView.swift
+6
-43
No files found.
Ring/Ring/Features/Conversations/Conversation/Cells/MessageCell.swift
View file @
4ce923e1
...
...
@@ -451,7 +451,7 @@ class MessageCell: UITableViewCell, NibReusable {
self
.
transferImageView
.
bottomAnchor
.
constraint
(
equalTo
:
self
.
bubble
.
bottomAnchor
,
constant
:
0
)
.
isActive
=
true
if
!
message
.
message
.
incoming
&&
message
.
initialTransferStatus
!=
.
success
{
self
.
transferProgressView
.
frame
=
self
.
transferImageView
.
frame
self
.
transferProgressView
.
image
=
image
self
.
transferProgressView
.
configureViews
()
self
.
transferProgressView
.
progress
=
0
self
.
transferProgressView
.
target
=
100
self
.
transferProgressView
.
currentProgress
=
0
...
...
Ring/Ring/UI/ProgressView.swift
View file @
4ce923e1
...
...
@@ -24,7 +24,7 @@ import RxSwift
class
ProgressView
:
UIView
{
var
maximumValue
:
CGFloat
=
100
var
imageView
:
UI
ImageView
=
UIImage
View
()
var
imageView
:
UI
VisualEffectView
=
UIVisualEffect
View
()
var
statusLabel
=
UILabel
()
var
disposeBug
=
DisposeBag
()
...
...
@@ -43,7 +43,7 @@ class ProgressView: UIView {
default
:
return
""
}
}),
progressVariable
}),
progressVariable
.
asObservable
()
.
map
({
progressValue
in
return
floor
(
progressValue
)
...
...
@@ -62,7 +62,6 @@ class ProgressView: UIView {
currentProgress
+=
(
target
-
currentProgress
)
*
0.1
innerProgress
=
currentProgress
*
toAngleScaler
self
.
progressVariable
.
value
=
newProgress
if
self
.
bluredImage
==
nil
{
return
}
setImage
()
}
get
{
...
...
@@ -70,21 +69,6 @@ class ProgressView: UIView {
}
}
var
image
:
UIImage
?
{
didSet
{
guard
let
image
=
image
else
{
return
}
if
bluredImage
!=
nil
{
return
}
guard
let
blureImage
=
self
.
blureImage
(
image
:
image
)
else
{
return
}
self
.
bluredImage
=
blureImage
self
.
configureViews
()
}
}
var
bluredImage
:
UIImage
?
// MARK: configure path
private
var
startPoint
:
CGPoint
{
...
...
@@ -156,7 +140,6 @@ class ProgressView: UIView {
let
maskLayer
=
CAShapeLayer
.
init
()
override
func
removeFromSuperview
()
{
self
.
bluredImage
=
nil
self
.
disposeBug
=
DisposeBag
()
self
.
progress
=
0.00
self
.
target
=
100
...
...
@@ -166,34 +149,14 @@ class ProgressView: UIView {
super
.
removeFromSuperview
()
}
func
blureImage
(
image
:
UIImage
)
->
UIImage
?
{
let
context
=
CIContext
(
options
:
nil
)
let
inputImage
=
CIImage
(
image
:
image
)
let
originalOrientation
=
image
.
imageOrientation
let
originalScale
=
image
.
scale
let
filterColor
=
CIFilter
(
name
:
"CIExposureAdjust"
)
filterColor
?
.
setValue
(
-
2
,
forKey
:
"inputEV"
)
filterColor
?
.
setValue
(
inputImage
,
forKey
:
kCIInputImageKey
)
let
filterClamp
=
CIFilter
(
name
:
"CIAffineClamp"
)
let
transform
=
CGAffineTransform
.
identity
filterClamp
?
.
setValue
(
transform
,
forKey
:
"inputTransform"
)
filterClamp
?
.
setValue
(
filterColor
?
.
outputImage
,
forKey
:
kCIInputImageKey
)
let
filterGausse
=
CIFilter
(
name
:
"CIGaussianBlur"
)
filterGausse
?
.
setValue
(
4.0
,
forKey
:
kCIInputRadiusKey
)
filterGausse
?
.
setValue
(
filterClamp
?
.
outputImage
,
forKey
:
kCIInputImageKey
)
let
outputImage
=
filterGausse
?
.
outputImage
var
cgImage
:
CGImage
?
guard
let
blurImage
=
outputImage
else
{
return
nil
}
cgImage
=
context
.
createCGImage
(
blurImage
,
from
:
(
inputImage
?
.
extent
)
!
)
guard
let
finaleImage
=
cgImage
else
{
return
nil
}
return
UIImage
(
cgImage
:
finaleImage
,
scale
:
originalScale
,
orientation
:
originalOrientation
)
}
func
configureViews
()
{
self
.
backgroundColor
=
UIColor
.
clear
self
.
layer
.
cornerRadius
=
20
self
.
layer
.
masksToBounds
=
true
let
darkBlur
=
UIBlurEffect
(
style
:
UIBlurEffect
.
Style
.
dark
)
self
.
imageView
=
UIVisualEffectView
(
effect
:
darkBlur
)
self
.
imageView
.
alpha
=
0.9
self
.
imageView
.
frame
=
self
.
bounds
self
.
imageView
.
image
=
bluredImage
maskLayer
.
frame
=
self
.
bounds
self
.
imageView
.
layer
.
mask
=
maskLayer
self
.
addSubview
(
self
.
imageView
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment