Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 4.5.0, merge feature/media-optimizations #169

Merged
merged 6 commits into from
Aug 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
source 'https://cdn.cocoapods.org/'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not required but nice to be explicit, IMHO.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this way we don't have to change this when switching between public and private pod. I thoughts that how it was but it must have gotten removed somehow.


platform :ios, '12.0'
inhibit_all_warnings!
use_frameworks!
Expand All @@ -14,7 +16,7 @@ target 'Video-Internal' do
pod 'FirebaseUI/Google', '~> 9'
pod 'IGListDiffKit', '~> 4'
pod 'KeychainAccess', '~> 4'
pod 'TwilioVideo', '~> 4'
pod 'TwilioVideo', '~> 4.5'

target 'Video-InternalTests' do
pod 'Nimble', '~> 9'
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ PODS:
- Nimble (9.2.0)
- PromisesObjC (1.2.12)
- Quick (3.1.2)
- TwilioVideo (4.4.0)
- TwilioVideo (4.5.0)

DEPENDENCIES:
- Alamofire (~> 5)
Expand All @@ -119,7 +119,7 @@ DEPENDENCIES:
- KeychainAccess (~> 4)
- Nimble (~> 9)
- Quick (~> 3)
- TwilioVideo (~> 4)
- TwilioVideo (~> 4.5)

SPEC REPOS:
trunk:
Expand Down Expand Up @@ -172,8 +172,8 @@ SPEC CHECKSUMS:
Nimble: 4f4a345c80b503b3ea13606a4f98405974ee4d0b
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
Quick: 60f0ea3b8e0cfc0df3259a5c06a238ad8b3c46e0
TwilioVideo: fcf10b7460e582570887d194b73e75425685d813
TwilioVideo: a765f519bb8646187eaa0e9f7443d08529ccba0a

PODFILE CHECKSUM: f22db36db4545a131be7417d00df2ce176070bc3
PODFILE CHECKSUM: c163b224068a95f3dc2d7bb74947cb70cb32e56a

COCOAPODS: 1.10.2
132 changes: 44 additions & 88 deletions VideoApp/Video-InternalTests/Mocks/MockAppSettingsStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -282,28 +282,6 @@ class MockAppSettingsStore: AppSettingsStoreWriting {
}
}

var invokedMaxTracksSetter = false
var invokedMaxTracksSetterCount = 0
var invokedMaxTracks: Int?
var invokedMaxTracksList = [Int?]()
var invokedMaxTracksGetter = false
var invokedMaxTracksGetterCount = 0
var stubbedMaxTracks: Int!

var maxTracks: Int? {
set {
invokedMaxTracksSetter = true
invokedMaxTracksSetterCount += 1
invokedMaxTracks = newValue
invokedMaxTracksList.append(newValue)
}
get {
invokedMaxTracksGetter = true
invokedMaxTracksGetterCount += 1
return stubbedMaxTracks
}
}

var invokedDominantSpeakerPrioritySetter = false
var invokedDominantSpeakerPrioritySetterCount = 0
var invokedDominantSpeakerPriority: TrackPriority?
Expand Down Expand Up @@ -348,72 +326,6 @@ class MockAppSettingsStore: AppSettingsStoreWriting {
}
}

var invokedLowRenderDimensionsSetter = false
var invokedLowRenderDimensionsSetterCount = 0
var invokedLowRenderDimensions: VideoDimensionsName?
var invokedLowRenderDimensionsList = [VideoDimensionsName]()
var invokedLowRenderDimensionsGetter = false
var invokedLowRenderDimensionsGetterCount = 0
var stubbedLowRenderDimensions: VideoDimensionsName!

var lowRenderDimensions: VideoDimensionsName {
set {
invokedLowRenderDimensionsSetter = true
invokedLowRenderDimensionsSetterCount += 1
invokedLowRenderDimensions = newValue
invokedLowRenderDimensionsList.append(newValue)
}
get {
invokedLowRenderDimensionsGetter = true
invokedLowRenderDimensionsGetterCount += 1
return stubbedLowRenderDimensions
}
}

var invokedStandardRenderDimensionsSetter = false
var invokedStandardRenderDimensionsSetterCount = 0
var invokedStandardRenderDimensions: VideoDimensionsName?
var invokedStandardRenderDimensionsList = [VideoDimensionsName]()
var invokedStandardRenderDimensionsGetter = false
var invokedStandardRenderDimensionsGetterCount = 0
var stubbedStandardRenderDimensions: VideoDimensionsName!

var standardRenderDimensions: VideoDimensionsName {
set {
invokedStandardRenderDimensionsSetter = true
invokedStandardRenderDimensionsSetterCount += 1
invokedStandardRenderDimensions = newValue
invokedStandardRenderDimensionsList.append(newValue)
}
get {
invokedStandardRenderDimensionsGetter = true
invokedStandardRenderDimensionsGetterCount += 1
return stubbedStandardRenderDimensions
}
}

var invokedHighRenderDimensionsSetter = false
var invokedHighRenderDimensionsSetterCount = 0
var invokedHighRenderDimensions: VideoDimensionsName?
var invokedHighRenderDimensionsList = [VideoDimensionsName]()
var invokedHighRenderDimensionsGetter = false
var invokedHighRenderDimensionsGetterCount = 0
var stubbedHighRenderDimensions: VideoDimensionsName!

var highRenderDimensions: VideoDimensionsName {
set {
invokedHighRenderDimensionsSetter = true
invokedHighRenderDimensionsSetterCount += 1
invokedHighRenderDimensions = newValue
invokedHighRenderDimensionsList.append(newValue)
}
get {
invokedHighRenderDimensionsGetter = true
invokedHighRenderDimensionsGetterCount += 1
return stubbedHighRenderDimensions
}
}

var invokedRemoteRoomTypeSetter = false
var invokedRemoteRoomTypeSetterCount = 0
var invokedRemoteRoomType: CommunityCreateTwilioAccessTokenResponse.RoomType?
Expand All @@ -436,6 +348,50 @@ class MockAppSettingsStore: AppSettingsStoreWriting {
}
}

var invokedClientTrackSwitchOffControlSetter = false
var invokedClientTrackSwitchOffControlSetterCount = 0
var invokedClientTrackSwitchOffControl: ClientTrackSwitchOffControl?
var invokedClientTrackSwitchOffControlList = [ClientTrackSwitchOffControl]()
var invokedClientTrackSwitchOffControlGetter = false
var invokedClientTrackSwitchOffControlGetterCount = 0
var stubbedClientTrackSwitchOffControl: ClientTrackSwitchOffControl!

var clientTrackSwitchOffControl: ClientTrackSwitchOffControl {
set {
invokedClientTrackSwitchOffControlSetter = true
invokedClientTrackSwitchOffControlSetterCount += 1
invokedClientTrackSwitchOffControl = newValue
invokedClientTrackSwitchOffControlList.append(newValue)
}
get {
invokedClientTrackSwitchOffControlGetter = true
invokedClientTrackSwitchOffControlGetterCount += 1
return stubbedClientTrackSwitchOffControl
}
}

var invokedVideoContentPreferencesModeSetter = false
var invokedVideoContentPreferencesModeSetterCount = 0
var invokedVideoContentPreferencesMode: VideoContentPreferencesMode?
var invokedVideoContentPreferencesModeList = [VideoContentPreferencesMode]()
var invokedVideoContentPreferencesModeGetter = false
var invokedVideoContentPreferencesModeGetterCount = 0
var stubbedVideoContentPreferencesMode: VideoContentPreferencesMode!

var videoContentPreferencesMode: VideoContentPreferencesMode {
set {
invokedVideoContentPreferencesModeSetter = true
invokedVideoContentPreferencesModeSetterCount += 1
invokedVideoContentPreferencesMode = newValue
invokedVideoContentPreferencesModeList.append(newValue)
}
get {
invokedVideoContentPreferencesModeGetter = true
invokedVideoContentPreferencesModeGetterCount += 1
return stubbedVideoContentPreferencesMode
}
}

var invokedReset = false
var invokedResetCount = 0

Expand Down
Loading