Skip to content

Commit

Permalink
Merge pull request #49 from AgoraIO-Community/default-floating
Browse files Browse the repository at this point in the history 
Default Style - `.floating`
  • Loading branch information
@maxxfrazer
maxxfrazer authored Oct 20, 2021
2 parents e763cad + 07be876 commit 662a3d8
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 66 deletions.
80 changes: 18 additions & 62 deletions Agora-UIKit-Example/Agora-UIKit-Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
6CDFA38FFBD674EAD30A7521 /* Pods_Agora_UIKit_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1077E08A498B242C67ADA47 /* Pods_Agora_UIKit_Example.framework */; };
F39B87D327200A8900C644C7 /* AgoraUIKit_iOS in Frameworks */ = {isa = PBXBuildFile; productRef = F39B87D227200A8900C644C7 /* AgoraUIKit_iOS */; };
F3C4328E256FB56C00E2AD43 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3C4328D256FB56C00E2AD43 /* AppDelegate.swift */; };
F3C43290256FB56C00E2AD43 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3C4328F256FB56C00E2AD43 /* SceneDelegate.swift */; };
F3C43292256FB56C00E2AD43 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3C43291256FB56C00E2AD43 /* ViewController.swift */; };
Expand All @@ -17,9 +17,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
61D062AD9E5E9D696CD4CCCA /* Pods-Agora-UIKit-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Agora-UIKit-Example.release.xcconfig"; path = "Target Support Files/Pods-Agora-UIKit-Example/Pods-Agora-UIKit-Example.release.xcconfig"; sourceTree = "<group>"; };
6AE58E9592D06832C5338931 /* Pods-Agora-UIKit-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Agora-UIKit-Example.debug.xcconfig"; path = "Target Support Files/Pods-Agora-UIKit-Example/Pods-Agora-UIKit-Example.debug.xcconfig"; sourceTree = "<group>"; };
C1077E08A498B242C67ADA47 /* Pods_Agora_UIKit_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Agora_UIKit_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F39B87D0272009FA00C644C7 /* iOS-UIKit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "iOS-UIKit"; path = ..; sourceTree = "<group>"; };
F3C4328A256FB56C00E2AD43 /* Agora-UIKit-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Agora-UIKit-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
F3C4328D256FB56C00E2AD43 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
F3C4328F256FB56C00E2AD43 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -35,37 +33,35 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
6CDFA38FFBD674EAD30A7521 /* Pods_Agora_UIKit_Example.framework in Frameworks */,
F39B87D327200A8900C644C7 /* AgoraUIKit_iOS in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
B19AC7050535D55DCF110DEE /* Pods */ = {
F39B87CF272009FA00C644C7 /* Packages */ = {
isa = PBXGroup;
children = (
6AE58E9592D06832C5338931 /* Pods-Agora-UIKit-Example.debug.xcconfig */,
61D062AD9E5E9D696CD4CCCA /* Pods-Agora-UIKit-Example.release.xcconfig */,
F39B87D0272009FA00C644C7 /* iOS-UIKit */,
);
path = Pods;
name = Packages;
sourceTree = "<group>";
};
D2EDB93A451692F721281A42 /* Frameworks */ = {
F39B87D127200A8900C644C7 /* Frameworks */ = {
isa = PBXGroup;
children = (
C1077E08A498B242C67ADA47 /* Pods_Agora_UIKit_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
F3C43281256FB56C00E2AD43 = {
isa = PBXGroup;
children = (
F39B87CF272009FA00C644C7 /* Packages */,
F3C4328C256FB56C00E2AD43 /* Agora-UIKit-Example */,
F3C4328B256FB56C00E2AD43 /* Products */,
B19AC7050535D55DCF110DEE /* Pods */,
D2EDB93A451692F721281A42 /* Frameworks */,
F39B87D127200A8900C644C7 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -98,18 +94,17 @@
isa = PBXNativeTarget;
buildConfigurationList = F3C4329E256FB56F00E2AD43 /* Build configuration list for PBXNativeTarget "Agora-UIKit-Example" */;
buildPhases = (
C091744E81377ECE154B2E85 /* [CP] Check Pods Manifest.lock */,
F3C43286256FB56C00E2AD43 /* Sources */,
F3C43287256FB56C00E2AD43 /* Frameworks */,
F3C43288256FB56C00E2AD43 /* Resources */,
04549052F641424C2F9CA737 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = "Agora-UIKit-Example";
packageProductDependencies = (
F39B87D227200A8900C644C7 /* AgoraUIKit_iOS */,
);
productName = "Agora-UIKit-Example";
productReference = F3C4328A256FB56C00E2AD43 /* Agora-UIKit-Example.app */;
Expand Down Expand Up @@ -138,8 +133,6 @@
Base,
);
mainGroup = F3C43281256FB56C00E2AD43;
packageReferences = (
);
productRefGroup = F3C4328B256FB56C00E2AD43 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand All @@ -162,48 +155,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
04549052F641424C2F9CA737 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Agora-UIKit-Example/Pods-Agora-UIKit-Example-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Agora-UIKit-Example/Pods-Agora-UIKit-Example-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Agora-UIKit-Example/Pods-Agora-UIKit-Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
C091744E81377ECE154B2E85 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Agora-UIKit-Example-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
F3C43286256FB56C00E2AD43 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -355,7 +306,6 @@
};
F3C4329F256FB56F00E2AD43 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6AE58E9592D06832C5338931 /* Pods-Agora-UIKit-Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand All @@ -375,7 +325,6 @@
};
F3C432A0256FB56F00E2AD43 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 61D062AD9E5E9D696CD4CCCA /* Pods-Agora-UIKit-Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
Expand Down Expand Up @@ -415,6 +364,13 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCSwiftPackageProductDependency section */
F39B87D227200A8900C644C7 /* AgoraUIKit_iOS */ = {
isa = XCSwiftPackageProductDependency;
productName = AgoraUIKit_iOS;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = F3C43282256FB56C00E2AD43 /* Project object */;
}
2 changes: 1 addition & 1 deletion AgoraUIKit_iOS.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'AgoraUIKit_iOS'
s.version = '1.6.8'
s.version = '1.6.9'
s.summary = 'Agora video session UIKit template.'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion AgoraUIKit_macOS.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'AgoraUIKit_macOS'
s.version = '1.6.8'
s.version = '1.6.9'
s.summary = 'Agora video session AppKit template.'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion Sources/Agora-UIKit/AgoraUIKit.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public struct AgoraUIKit: Codable {
/// Framework type of UIKit. "native", "flutter", "reactnative"
fileprivate(set) var framework: String
/// Version of UIKit being used
static let version = "1.6.8"
static let version = "1.6.9"
/// Framework type of UIKit. "native", "flutter", "reactnative"
static let framework = "native"
#if os(iOS)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Agora-UIKit/AgoraVideoViewer.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ open class AgoraVideoViewer: MPView, SingleVideoViewDelegate {
/// - agoraSettings: Settings for this viewer. This can include style customisations and information of where to get new tokens from.
/// - delegate: Delegate for the AgoraVideoViewer, used for some important callback methods.
public init(
connectionData: AgoraConnectionData, style: AgoraVideoViewer.Style = .grid,
connectionData: AgoraConnectionData, style: AgoraVideoViewer.Style = .floating,
agoraSettings: AgoraSettings = AgoraSettings(), delegate: AgoraVideoViewerDelegate? = nil
) {
self.agoraSettings = agoraSettings
Expand Down

0 comments on commit 662a3d8

Please sign in to comment.