From 1ddf2602b91b8c6694260eb542ff2794c3f8eed9 Mon Sep 17 00:00:00 2001 From: QuentinArguillere Date: Tue, 9 Jan 2024 16:50:40 +0100 Subject: [PATCH] Fix or disable several swiftlint warnings --- Linphone/UI/Call/CallView.swift | 4 +++- .../UI/Main/Contacts/Fragments/ContactsListFragment.swift | 5 ++++- Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift | 6 ++++-- Linphone/UI/Main/ContentView.swift | 2 ++ .../UI/Main/History/Fragments/HistoryContactFragment.swift | 4 ++++ .../UI/Main/History/Fragments/HistoryListFragment.swift | 4 ++++ 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Linphone/UI/Call/CallView.swift b/Linphone/UI/Call/CallView.swift index 9f1d99f5a..4c0bec411 100644 --- a/Linphone/UI/Call/CallView.swift +++ b/Linphone/UI/Call/CallView.swift @@ -18,6 +18,7 @@ */ // swiftlint:disable type_body_length +// swiftlint:disable line_length import SwiftUI import CallKit import AVFAudio @@ -131,7 +132,7 @@ struct CallView: View { .foregroundStyle(.white) .frame(width: 32, height: 32) .onAppear(perform: getAudioRouteImage) - .onReceive(pub) { (output) in + .onReceive(pub) { _ in self.getAudioRouteImage() } @@ -836,3 +837,4 @@ struct CallView: View { CallView(callViewModel: CallViewModel()) } // swiftlint:enable type_body_length +// swiftlint:enable line_length diff --git a/Linphone/UI/Main/Contacts/Fragments/ContactsListFragment.swift b/Linphone/UI/Main/Contacts/Fragments/ContactsListFragment.swift index 41bfc686b..3f594f977 100644 --- a/Linphone/UI/Main/Contacts/Fragments/ContactsListFragment.swift +++ b/Linphone/UI/Main/Contacts/Fragments/ContactsListFragment.swift @@ -98,5 +98,8 @@ struct ContactsListFragment: View { } #Preview { - ContactsListFragment(contactViewModel: ContactViewModel(), contactsListViewModel: ContactsListViewModel(), showingSheet: .constant(false), startCallFunc: {_ in }) + ContactsListFragment(contactViewModel: ContactViewModel() + , contactsListViewModel: ContactsListViewModel() + , showingSheet: .constant(false) + , startCallFunc: {_ in }) } diff --git a/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift b/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift index fb469c160..efd2e1426 100644 --- a/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift +++ b/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift @@ -44,7 +44,8 @@ class ContactAvatarModel: ObservableObject { if friend!.consolidatedPresence == .Online || friend!.consolidatedPresence == .Busy { if friend!.consolidatedPresence == .Online || friend!.presenceModel!.latestActivityTimestamp != -1 { - self.lastPresenceInfo = friend!.consolidatedPresence == .Online ? "Online" : getCallTime(startDate: friend!.presenceModel!.latestActivityTimestamp) + self.lastPresenceInfo = (friend!.consolidatedPresence == .Online) ? + "Online" : getCallTime(startDate: friend!.presenceModel!.latestActivityTimestamp) } else { self.lastPresenceInfo = "Away" } @@ -68,7 +69,8 @@ class ContactAvatarModel: ObservableObject { self.presenceStatus = cbValue.consolidatedPresence if cbValue.consolidatedPresence == .Online || cbValue.consolidatedPresence == .Busy { if cbValue.consolidatedPresence == .Online || cbValue.presenceModel!.latestActivityTimestamp != -1 { - self.lastPresenceInfo = cbValue.consolidatedPresence == .Online ? "Online" : self.getCallTime(startDate: cbValue.presenceModel!.latestActivityTimestamp) + self.lastPresenceInfo = cbValue.consolidatedPresence == .Online ? + "Online" : self.getCallTime(startDate: cbValue.presenceModel!.latestActivityTimestamp) } else { self.lastPresenceInfo = "Away" } diff --git a/Linphone/UI/Main/ContentView.swift b/Linphone/UI/Main/ContentView.swift index ee403524a..69886fde9 100644 --- a/Linphone/UI/Main/ContentView.swift +++ b/Linphone/UI/Main/ContentView.swift @@ -18,6 +18,7 @@ */ // swiftlint:disable type_body_length +// swiftlint:disable line_length import SwiftUI import linphonesw @@ -731,3 +732,4 @@ struct ContentView: View { ) } // swiftlint:enable type_body_length +// swiftlint:enable line_length diff --git a/Linphone/UI/Main/History/Fragments/HistoryContactFragment.swift b/Linphone/UI/Main/History/Fragments/HistoryContactFragment.swift index 7ebc04890..370009462 100644 --- a/Linphone/UI/Main/History/Fragments/HistoryContactFragment.swift +++ b/Linphone/UI/Main/History/Fragments/HistoryContactFragment.swift @@ -17,6 +17,8 @@ * along with this program. If not, see . */ +// swiftlint:disable line_length + import SwiftUI import UniformTypeIdentifiers @@ -549,3 +551,5 @@ struct HistoryContactFragment: View { indexPage: .constant(1) ) } + +// swiftlint:enable line_length diff --git a/Linphone/UI/Main/History/Fragments/HistoryListFragment.swift b/Linphone/UI/Main/History/Fragments/HistoryListFragment.swift index ceafcb884..71af38981 100644 --- a/Linphone/UI/Main/History/Fragments/HistoryListFragment.swift +++ b/Linphone/UI/Main/History/Fragments/HistoryListFragment.swift @@ -17,6 +17,8 @@ * along with this program. If not, see . */ +// swiftlint:disable line_length + import SwiftUI import linphonesw @@ -217,3 +219,5 @@ struct HistoryListFragment: View { #Preview { HistoryListFragment(historyListViewModel: HistoryListViewModel(), historyViewModel: HistoryViewModel(), showingSheet: .constant(false)) } + +// swiftlint:enable line_length