Skip to content

Commit 1735c22

Browse files
author
xia ning
authored
Merge pull request #110 from AgoraIO/feature/mac-ui
Feature/mac UI
2 parents 44860ef + 1981d06 commit 1735c22

49 files changed

Lines changed: 6641 additions & 4835 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎macOS/APIExample.xcodeproj/project.pbxproj‎

Lines changed: 46 additions & 18 deletions
Large diffs are not rendered by default.

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

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@
685685
<scene sceneID="R2V-B0-nI4">
686686
<objects>
687687
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
688-
<window key="window" title="Agora API Example" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
688+
<window key="window" title="Agora API Example" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" toolbarStyle="expanded" id="IQv-IB-iLA">
689689
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
690690
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
691691
<rect key="contentRect" x="196" y="240" width="800" height="600"/>
@@ -708,12 +708,12 @@
708708
<objects>
709709
<splitViewController id="sL9-0i-oWK" sceneMemberID="viewController">
710710
<splitViewItems>
711-
<splitViewItem id="63c-uO-XIT"/>
712-
<splitViewItem id="Lq1-uY-z7v"/>
711+
<splitViewItem holdingPriority="255" behavior="contentList" separatorStyle="none" id="63c-uO-XIT"/>
712+
<splitViewItem canCollapse="YES" separatorStyle="none" id="Lq1-uY-z7v"/>
713713
</splitViewItems>
714-
<splitView key="splitView" dividerStyle="thin" vertical="YES" id="1JX-5Q-i5O">
714+
<splitView key="splitView" arrangesAllSubviews="NO" dividerStyle="thin" vertical="YES" id="1JX-5Q-i5O">
715715
<rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
716-
<autoresizingMask key="autoresizingMask"/>
716+
<autoresizingMask key="autoresizingMask" heightSizable="YES"/>
717717
<connections>
718718
<outlet property="delegate" destination="sL9-0i-oWK" id="Z37-lV-mn6"/>
719719
</connections>
@@ -734,7 +734,7 @@
734734
<viewController id="frP-Og-4hq" customClass="MenuController" customModule="APIExample" customModuleProvider="target" sceneMemberID="viewController">
735735
<view key="view" id="bDS-2Z-AsB">
736736
<rect key="frame" x="0.0" y="0.0" width="280" height="602"/>
737-
<autoresizingMask key="autoresizingMask"/>
737+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
738738
<subviews>
739739
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jvf-iG-0lJ">
740740
<rect key="frame" x="0.0" y="30" width="280" height="572"/>
@@ -750,7 +750,7 @@
750750
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
751751
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
752752
<tableColumns>
753-
<tableColumn width="266" minWidth="10" maxWidth="3.4028234663852886e+38" id="b03-7M-wbu">
753+
<tableColumn width="237" minWidth="10" maxWidth="3.4028234663852886e+38" id="b03-7M-wbu">
754754
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
755755
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
756756
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -763,37 +763,51 @@
763763
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
764764
<prototypeCellViews>
765765
<tableCellView identifier="menuCell" id="2hx-oV-azK">
766-
<rect key="frame" x="1" y="1" width="275" height="17"/>
766+
<rect key="frame" x="1" y="1" width="246" height="17"/>
767767
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
768768
<subviews>
769-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Yoo-BB-x79">
770-
<rect key="frame" x="20" y="0.0" width="275" height="17"/>
771-
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
769+
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Yoo-BB-x79">
770+
<rect key="frame" x="20" y="0.0" width="246" height="17"/>
771+
<constraints>
772+
<constraint firstAttribute="height" constant="17" id="mQT-GL-T2e"/>
773+
</constraints>
772774
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="qG2-7c-SRN">
773775
<font key="font" metaFont="system"/>
774776
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
775777
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
776778
</textFieldCell>
777779
</textField>
778780
</subviews>
781+
<constraints>
782+
<constraint firstItem="Yoo-BB-x79" firstAttribute="leading" secondItem="2hx-oV-azK" secondAttribute="leading" constant="22" id="HWS-Cq-T0H"/>
783+
<constraint firstAttribute="trailing" secondItem="Yoo-BB-x79" secondAttribute="trailing" constant="-18" id="MIA-Un-2ml"/>
784+
<constraint firstItem="Yoo-BB-x79" firstAttribute="centerY" secondItem="2hx-oV-azK" secondAttribute="centerY" id="w24-aV-GTb"/>
785+
</constraints>
779786
<connections>
780787
<outlet property="textField" destination="Yoo-BB-x79" id="VOp-vS-5SV"/>
781788
</connections>
782789
</tableCellView>
783790
<tableCellView identifier="headerCell" id="uWY-5d-ieJ">
784-
<rect key="frame" x="1" y="20" width="275" height="17"/>
791+
<rect key="frame" x="1" y="20" width="246" height="17"/>
785792
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
786793
<subviews>
787-
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QTx-vV-DAq">
788-
<rect key="frame" x="20" y="0.0" width="275" height="14"/>
789-
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
794+
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="QTx-vV-DAq">
795+
<rect key="frame" x="20" y="0.0" width="246" height="14"/>
796+
<constraints>
797+
<constraint firstAttribute="height" constant="14" id="tIf-oG-A6G"/>
798+
</constraints>
790799
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Nlt-pS-UAz">
791800
<font key="font" metaFont="systemBold" size="10"/>
792801
<color key="textColor" name="windowFrameTextColor" catalog="System" colorSpace="catalog"/>
793802
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
794803
</textFieldCell>
795804
</textField>
796805
</subviews>
806+
<constraints>
807+
<constraint firstItem="QTx-vV-DAq" firstAttribute="leading" secondItem="uWY-5d-ieJ" secondAttribute="leading" constant="22" id="4bc-EZ-xcB"/>
808+
<constraint firstAttribute="trailing" secondItem="QTx-vV-DAq" secondAttribute="trailing" constant="-18" id="G7X-dG-F0f"/>
809+
<constraint firstItem="QTx-vV-DAq" firstAttribute="top" secondItem="uWY-5d-ieJ" secondAttribute="top" constant="3" id="Ltm-P5-nao"/>
810+
</constraints>
797811
<connections>
798812
<outlet property="textField" destination="QTx-vV-DAq" id="XPu-Pj-H4e"/>
799813
</connections>
@@ -810,18 +824,21 @@
810824
</clipView>
811825
<edgeInsets key="contentInsets" left="0.0" right="0.0" top="20" bottom="0.0"/>
812826
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Bqm-bb-aGK">
813-
<rect key="frame" x="1" y="583" width="238" height="16"/>
827+
<rect key="frame" x="-100" y="-100" width="238" height="16"/>
814828
<autoresizingMask key="autoresizingMask"/>
815829
</scroller>
816830
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="iWF-Ou-WIP">
817831
<rect key="frame" x="-100" y="-100" width="15" height="102"/>
818832
<autoresizingMask key="autoresizingMask"/>
819833
</scroller>
820834
</scrollView>
821-
<button id="1eW-RY-z9X">
835+
<button translatesAutoresizingMaskIntoConstraints="NO" id="1eW-RY-z9X">
822836
<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">
837+
<constraints>
838+
<constraint firstAttribute="height" constant="32" id="8Dp-kj-zaV"/>
839+
<constraint firstAttribute="width" constant="32" id="yN4-V5-R92"/>
840+
</constraints>
841+
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSSmartBadgeTemplate" imagePosition="only" alignment="center" inset="2" id="PTe-Da-jjD">
825842
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
826843
<font key="font" metaFont="system"/>
827844
</buttonCell>
@@ -830,6 +847,10 @@
830847
</connections>
831848
</button>
832849
</subviews>
850+
<constraints>
851+
<constraint firstItem="1eW-RY-z9X" firstAttribute="leading" secondItem="bDS-2Z-AsB" secondAttribute="leading" id="Fd3-a2-JD3"/>
852+
<constraint firstAttribute="bottom" secondItem="1eW-RY-z9X" secondAttribute="bottom" id="OWg-RV-3rO"/>
853+
</constraints>
833854
</view>
834855
<connections>
835856
<outlet property="tableView" destination="arv-VN-9VJ" id="ixD-0e-74k"/>

0 commit comments

Comments
 (0)