Skip to content

Commit 2decc0f

Browse files
author
Xia Ning
committed
Merge branch 'master' of https://github.com/AgoraIO/API-Examples 
2 parents ed37f47 + 633f2b6 commit 2decc0f

18 files changed

Lines changed: 443 additions & 100 deletions

File tree

‎macOS/APIExample.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@
7171
03B12DA4250E8F7F00E55818 /* AgoraExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B12DA3250E8F7F00E55818 /* AgoraExtension.swift */; };
7272
03B321DB24FC0D5E008EBD2C /* AgoraCameraSourceMediaIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B321D724FC0D5D008EBD2C /* AgoraCameraSourceMediaIO.swift */; };
7373
4667B9F286200B077FFDFDE1 /* Pods_APIExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CA9B97F4DF8A31A030414B3 /* Pods_APIExampleTests.framework */; };
74+
57887A67258856B7006E962A /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 57887A69258856B7006E962A /* Settings.storyboard */; };
75+
57887A75258859D8006E962A /* SettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57887A74258859D8006E962A /* SettingsController.swift */; };
76+
57887A83258886E1006E962A /* SettingCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57887A82258886E1006E962A /* SettingCells.swift */; };
77+
57887A87258889ED006E962A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57887A86258889ED006E962A /* SettingsViewController.swift */; };
7478
596A9F79AF0CD8DC1CA93253 /* Pods_APIExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F65EF2B97B89DE4581B426B /* Pods_APIExample.framework */; };
7579
EBDD0209B272C276B21B6270 /* Pods_APIExample_APIExampleUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC2BAB0AC82140B7CEEA31DA /* Pods_APIExample_APIExampleUITests.framework */; };
7680
/* End PBXBuildFile section */
@@ -203,6 +207,10 @@
203207
0CA9B97F4DF8A31A030414B3 /* Pods_APIExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_APIExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
204208
1784955BB217D1790A452465 /* Pods-APIExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExampleTests.release.xcconfig"; path = "Target Support Files/Pods-APIExampleTests/Pods-APIExampleTests.release.xcconfig"; sourceTree = "<group>"; };
205209
4C8551EF6F12F734D8F7C1F5 /* Pods-APIExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExample.release.xcconfig"; path = "Target Support Files/Pods-APIExample/Pods-APIExample.release.xcconfig"; sourceTree = "<group>"; };
210+
57887A68258856B7006E962A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Settings.storyboard; sourceTree = "<group>"; };
211+
57887A74258859D8006E962A /* SettingsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsController.swift; sourceTree = "<group>"; };
212+
57887A82258886E1006E962A /* SettingCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingCells.swift; sourceTree = "<group>"; };
213+
57887A86258889ED006E962A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
206214
6F65EF2B97B89DE4581B426B /* Pods_APIExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_APIExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
207215
84C863718A380DFD36ABF19F /* Pods-APIExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExample.debug.xcconfig"; path = "Target Support Files/Pods-APIExample/Pods-APIExample.debug.xcconfig"; sourceTree = "<group>"; };
208216
B53F41CB5AC550EA43C47363 /* Pods-APIExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-APIExampleTests/Pods-APIExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -501,6 +509,8 @@
501509
03896D3524F8A011008593CD /* Main.storyboard */,
502510
03896D3824F8A011008593CD /* Info.plist */,
503511
03896D3924F8A011008593CD /* APIExample.entitlements */,
512+
57887A69258856B7006E962A /* Settings.storyboard */,
513+
57887A74258859D8006E962A /* SettingsController.swift */,
504514
);
505515
path = APIExample;
506516
sourceTree = "<group>";
@@ -526,6 +536,7 @@
526536
03896D5B24F8D437008593CD /* Commons */ = {
527537
isa = PBXGroup;
528538
children = (
539+
57887A7F25885FC2006E962A /* Settings */,
529540
034C62922528474D00296ECF /* StatisticsInfo.swift */,
530541
034C62862528255F00296ECF /* WindowsCenter.swift */,
531542
034C626325257EA600296ECF /* GlobalSettings.swift */,
@@ -556,6 +567,15 @@
556567
path = ExternalVideo;
557568
sourceTree = "<group>";
558569
};
570+
57887A7F25885FC2006E962A /* Settings */ = {
571+
isa = PBXGroup;
572+
children = (
573+
57887A82258886E1006E962A /* SettingCells.swift */,
574+
57887A86258889ED006E962A /* SettingsViewController.swift */,
575+
);
576+
path = Settings;
577+
sourceTree = "<group>";
578+
};
559579
72510F6AF209B24C1F66A819 /* Pods */ = {
560580
isa = PBXGroup;
561581
children = (
@@ -693,6 +713,7 @@
693713
033A9FDB252EB05A00BC26E1 /* PrecallTest.storyboard in Resources */,
694714
033A9FFA252EB5FD00BC26E1 /* ScreenShare.storyboard in Resources */,
695715
033AA005252EBBEC00BC26E1 /* Localizable.strings in Resources */,
716+
57887A67258856B7006E962A /* Settings.storyboard in Resources */,
696717
033A9FFF252EB60800BC26E1 /* StreamEncryption.storyboard in Resources */,
697718
0301D31D2507C0F300DF3BEA /* MetalVideoView.xib in Resources */,
698719
033A9FB8252EAEF700BC26E1 /* JoinChannelAudio.storyboard in Resources */,
@@ -843,6 +864,7 @@
843864
files = (
844865
0301D3182507B4A800DF3BEA /* AgoraMetalShader.metal in Sources */,
845866
0333E63724FA32000063C5B0 /* VideoView.swift in Sources */,
867+
57887A83258886E1006E962A /* SettingCells.swift in Sources */,
846868
03B321DB24FC0D5E008EBD2C /* AgoraCameraSourceMediaIO.swift in Sources */,
847869
034C628A25282D5D00296ECF /* JoinMultiChannel.swift in Sources */,
848870
034C62A6252ABA5C00296ECF /* VoiceChanger.swift in Sources */,
@@ -863,6 +885,7 @@
863885
033A9F9F252EA86A00BC26E1 /* CustomVideoRender.swift in Sources */,
864886
0336A1CB25034F4700D61B7F /* AudioController.m in Sources */,
865887
034C62672525857200296ECF /* JoinChannelAudio.swift in Sources */,
888+
57887A87258889ED006E962A /* SettingsViewController.swift in Sources */,
866889
034C62932528474D00296ECF /* StatisticsInfo.swift in Sources */,
867890
033A9FA4252EA86A00BC26E1 /* RTMPStreaming.swift in Sources */,
868891
03267E232500C265004A91A6 /* AgoraMediaRawData.m in Sources */,
@@ -875,6 +898,7 @@
875898
033A9FA1252EA86A00BC26E1 /* CustomAudioRender.swift in Sources */,
876899
034C627C2526C43900296ECF /* ScreenShare.swift in Sources */,
877900
034C62712525A35800296ECF /* StreamEncryption.swift in Sources */,
901+
57887A75258859D8006E962A /* SettingsController.swift in Sources */,
878902
036D3A9E24FA3A1000B1D8DC /* LogUtils.swift in Sources */,
879903
033A9EE2252C191000BC26E1 /* PrecallTest.swift in Sources */,
880904
0333E63524FA30310063C5B0 /* BaseViewController.swift in Sources */,
@@ -1066,6 +1090,14 @@
10661090
name = Main.storyboard;
10671091
sourceTree = "<group>";
10681092
};
1093+
57887A69258856B7006E962A /* Settings.storyboard */ = {
1094+
isa = PBXVariantGroup;
1095+
children = (
1096+
57887A68258856B7006E962A /* Base */,
1097+
);
1098+
name = Settings.storyboard;
1099+
sourceTree = "<group>";
1100+
};
10691101
/* End PBXVariantGroup section */
10701102

10711103
/* Begin XCBuildConfiguration section */

‎macOS/APIExample/Base.lproj/Main.storyboard‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.2"/>
4+
<deployment identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
56
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
67
</dependencies>
78
<scenes>
@@ -732,24 +733,24 @@
732733
<objects>
733734
<viewController id="frP-Og-4hq" customClass="MenuController" customModule="APIExample" customModuleProvider="target" sceneMemberID="viewController">
734735
<view key="view" id="bDS-2Z-AsB">
735-
<rect key="frame" x="0.0" y="0.0" width="280" height="600"/>
736+
<rect key="frame" x="0.0" y="0.0" width="280" height="602"/>
736737
<autoresizingMask key="autoresizingMask"/>
737738
<subviews>
738-
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jvf-iG-0lJ">
739-
<rect key="frame" x="0.0" y="0.0" width="320" height="600"/>
739+
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jvf-iG-0lJ">
740+
<rect key="frame" x="0.0" y="30" width="280" height="572"/>
740741
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
741742
<clipView key="contentView" id="cyL-uB-YCU">
742-
<rect key="frame" x="1" y="1" width="318" height="598"/>
743+
<rect key="frame" x="1" y="1" width="278" height="570"/>
743744
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
744745
<subviews>
745746
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="arv-VN-9VJ">
746-
<rect key="frame" x="0.0" y="0.0" width="318" height="579"/>
747+
<rect key="frame" x="0.0" y="0.0" width="278" height="551"/>
747748
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
748749
<size key="intercellSpacing" width="3" height="2"/>
749750
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
750751
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
751752
<tableColumns>
752-
<tableColumn width="315" minWidth="10" maxWidth="3.4028234663852886e+38" id="b03-7M-wbu">
753+
<tableColumn width="266" minWidth="10" maxWidth="3.4028234663852886e+38" id="b03-7M-wbu">
753754
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
754755
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
755756
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -762,11 +763,11 @@
762763
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
763764
<prototypeCellViews>
764765
<tableCellView identifier="menuCell" id="2hx-oV-azK">
765-
<rect key="frame" x="1" y="1" width="315" height="17"/>
766+
<rect key="frame" x="1" y="1" width="275" height="17"/>
766767
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
767768
<subviews>
768769
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Yoo-BB-x79">
769-
<rect key="frame" x="20" y="0.0" width="315" height="17"/>
770+
<rect key="frame" x="20" y="0.0" width="275" height="17"/>
770771
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
771772
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="qG2-7c-SRN">
772773
<font key="font" metaFont="system"/>
@@ -780,11 +781,11 @@
780781
</connections>
781782
</tableCellView>
782783
<tableCellView identifier="headerCell" id="uWY-5d-ieJ">
783-
<rect key="frame" x="1" y="20" width="315" height="17"/>
784+
<rect key="frame" x="1" y="20" width="275" height="17"/>
784785
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
785786
<subviews>
786787
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QTx-vV-DAq">
787-
<rect key="frame" x="20" y="0.0" width="315" height="14"/>
788+
<rect key="frame" x="20" y="0.0" width="275" height="14"/>
788789
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
789790
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Nlt-pS-UAz">
790791
<font key="font" metaFont="systemBold" size="10"/>
@@ -813,10 +814,21 @@
813814
<autoresizingMask key="autoresizingMask"/>
814815
</scroller>
815816
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="iWF-Ou-WIP">
816-
<rect key="frame" x="224" y="17" width="15" height="102"/>
817+
<rect key="frame" x="-100" y="-100" width="15" height="102"/>
817818
<autoresizingMask key="autoresizingMask"/>
818819
</scroller>
819820
</scrollView>
821+
<button id="1eW-RY-z9X">
822+
<rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
823+
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
824+
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSSmartBadgeTemplate" imagePosition="overlaps" alignment="center" inset="2" id="PTe-Da-jjD">
825+
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
826+
<font key="font" metaFont="system"/>
827+
</buttonCell>
828+
<connections>
829+
<action selector="onClickSetting:" target="frP-Og-4hq" id="LYl-a0-Sxl"/>
830+
</connections>
831+
</button>
820832
</subviews>
821833
</view>
822834
<connections>
@@ -825,7 +837,7 @@
825837
</viewController>
826838
<customObject id="nr4-u5-WOG" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
827839
</objects>
828-
<point key="canvasLocation" x="798" y="198"/>
840+
<point key="canvasLocation" x="798" y="199"/>
829841
</scene>
830842
<!--View Controller-->
831843
<scene sceneID="KsQ-B6-tlj">
@@ -841,4 +853,7 @@
841853
<point key="canvasLocation" x="868" y="898"/>
842854
</scene>
843855
</scenes>
856+
<resources>
857+
<image name="NSSmartBadgeTemplate" width="14" height="14"/>
858+
</resources>
844859
</document>

0 commit comments

Comments
 (0)