forked from mirrors/linphone-iphone
- Added small padding to back/next navitation buttons
- filtered out instant group calls from conference menu
This commit is contained in:
parent
0bfa04fce6
commit
5cfda32547
2 changed files with 4 additions and 3 deletions
|
|
@ -50,7 +50,7 @@ class ScheduledConferencesViewModel {
|
|||
conferences.value!.removeAll()
|
||||
let now = Date().timeIntervalSince1970 // Linphone uses time_t in seconds
|
||||
let oneHourAgo = now - 3600 // Show all conferences from 1 hour ago and forward
|
||||
core.getConferenceInformationListAfterTime(time: time_t(oneHourAgo)).forEach { conferenceInfo in
|
||||
core.getConferenceInformationListAfterTime(time: time_t(oneHourAgo)).filter{$0.duration != 0}.forEach { conferenceInfo in
|
||||
conferences.value!.append(ScheduledConferenceData(conferenceInfo: conferenceInfo))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import linphonesw
|
|||
let top_bar_height = 66.0
|
||||
let navigation_buttons_padding = 18.0
|
||||
let content_margin_top = 20
|
||||
let side_buttons_margin = 5
|
||||
|
||||
// User by subviews
|
||||
let form_margin = 10.0
|
||||
|
|
@ -58,11 +59,11 @@ import linphonesw
|
|||
topBar.alignParentTop().height(top_bar_height).matchParentSideBorders().done()
|
||||
|
||||
topBar.addSubview(backButton)
|
||||
backButton.alignParentLeft().matchParentHeight().done()
|
||||
backButton.alignParentLeft(withMargin: side_buttons_margin).matchParentHeight().done()
|
||||
backButton.onClickAction = backAction
|
||||
|
||||
topBar.addSubview(nextButton)
|
||||
nextButton.alignParentRight().matchParentHeight().done()
|
||||
nextButton.alignParentRight(withMargin: side_buttons_margin).matchParentHeight().done()
|
||||
nextButton.onClickAction = nextAction
|
||||
nextActionEnableCondition.readCurrentAndObserve { (enableNext) in
|
||||
self.nextButton.isEnabled = enableNext == true
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue