Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-ios
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository 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
savoirfairelinux
jami-client-ios
Commits
7420cc22
Commit
7420cc22
authored
5 years ago
by
Kateryna Kostiuk
Browse files
Options
Downloads
Patches
Plain Diff
UI: fix color and layout
Change-Id: I91a27370fb97488cc62946d339704ae02ee313a6
parent
08808e23
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Ring/Ring/Calls/CallViewController.swift
+3
-3
3 additions, 3 deletions
Ring/Ring/Calls/CallViewController.swift
Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift
+1
-0
1 addition, 0 deletions
...nversations/Conversation/ConversationViewController.swift
with
4 additions
and
3 deletions
Ring/Ring/Calls/CallViewController.swift
+
3
−
3
View file @
7420cc22
...
...
@@ -109,13 +109,13 @@ class CallViewController: UIViewController, StoryboardBased, ViewModelBased {
self
.
setUpCallButtons
()
self
.
setupBindings
()
self
.
profileImageView
.
tintColor
=
UIColor
.
jamiDefaultAvatar
nameLabel
.
textColor
=
UIColor
.
jamiLabelColor
durationLabel
.
textColor
=
UIColor
.
jamiLabelColor
infoBottomLabel
.
textColor
=
UIColor
.
jamiLabelColor
if
self
.
viewModel
.
isAudioOnly
{
// The durationLabel and buttonsContainer alpha is set here to 0, and to 1 (with a duration) when appear on the screen to have a fade in animation
self
.
durationLabel
.
alpha
=
0
self
.
buttonsContainer
.
stackView
.
alpha
=
0
nameLabel
.
textColor
=
UIColor
.
jamiLabelColor
durationLabel
.
textColor
=
UIColor
.
jamiLabelColor
infoBottomLabel
.
textColor
=
UIColor
.
jamiLabelColor
self
.
showAllInfo
()
self
.
setWhiteAvatarView
()
}
...
...
This diff is collapsed.
Click to expand it.
Ring/Ring/Features/Conversations/Conversation/ConversationViewController.swift
+
1
−
0
View file @
7420cc22
...
...
@@ -77,6 +77,7 @@ class ConversationViewController: UIViewController,
self
.
setupNavTitle
(
profileImageData
:
self
.
viewModel
.
profileImageData
.
value
,
displayName
:
self
.
viewModel
.
displayName
.
value
,
username
:
self
.
viewModel
.
userName
.
value
)
self
.
tableView
.
reloadData
()
})
.
disposed
(
by
:
self
.
disposeBag
)
/*
...
...
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