Browse Source

节拍器UI

Steven 11 months ago
parent
commit
cfbc19a812

+ 22 - 0
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/beat_title.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "beat_title@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "beat_title@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/beat_title.imageset/beat_title@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/beat_title.imageset/beat_title@3x.png


+ 22 - 0
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/tuning_title.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tuning_title@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tuning_title@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/tuning_title.imageset/tuning_title@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/SmallTool/tuning_title.imageset/tuning_title@3x.png


+ 8 - 10
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/Metronome/WidgetNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -29,22 +29,19 @@
                                 <action selector="backAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="SpQ-th-fns"/>
                             </connections>
                         </button>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="节拍器" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yk0-dS-WZy">
-                            <rect key="frame" x="179" y="11" width="56" height="22"/>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="beat_title" translatesAutoresizingMaskIntoConstraints="NO" id="9Bq-lB-sRU">
+                            <rect key="frame" x="180.5" y="13.5" width="53" height="17"/>
+                        </imageView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="yk0-dS-WZy" firstAttribute="centerX" secondItem="SUk-Ag-K6M" secondAttribute="centerX" id="0i1-EH-ueL"/>
                         <constraint firstItem="DDF-Ml-1qT" firstAttribute="centerY" secondItem="SUk-Ag-K6M" secondAttribute="centerY" id="9S9-KI-omf"/>
+                        <constraint firstItem="9Bq-lB-sRU" firstAttribute="centerY" secondItem="SUk-Ag-K6M" secondAttribute="centerY" id="JJz-K2-il6"/>
                         <constraint firstItem="yeM-eb-aeH" firstAttribute="leading" secondItem="SUk-Ag-K6M" secondAttribute="leading" id="MBb-cm-NxT"/>
-                        <constraint firstItem="yk0-dS-WZy" firstAttribute="centerY" secondItem="SUk-Ag-K6M" secondAttribute="centerY" id="MK3-Qc-twi"/>
                         <constraint firstItem="DDF-Ml-1qT" firstAttribute="leading" secondItem="SUk-Ag-K6M" secondAttribute="leading" constant="14" id="U6P-oC-62I"/>
                         <constraint firstAttribute="bottom" secondItem="yeM-eb-aeH" secondAttribute="bottom" id="VHC-dZ-gcV"/>
                         <constraint firstAttribute="height" constant="44" id="de5-7W-Mcn"/>
+                        <constraint firstItem="9Bq-lB-sRU" firstAttribute="centerX" secondItem="SUk-Ag-K6M" secondAttribute="centerX" id="gYk-hc-DEw"/>
                         <constraint firstItem="yeM-eb-aeH" firstAttribute="top" secondItem="SUk-Ag-K6M" secondAttribute="top" id="gln-eQ-4h0"/>
                     </constraints>
                 </view>
@@ -63,5 +60,6 @@
     </objects>
     <resources>
         <image name="back_black" width="12" height="20"/>
+        <image name="beat_title" width="53" height="17"/>
     </resources>
 </document>

+ 8 - 10
KulexiuForStudent/KulexiuForStudent/Module/Widget/View/toneTuning/TuningNavView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -29,12 +29,6 @@
                                 <action selector="backAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="O0M-F8-PQy"/>
                             </connections>
                         </button>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="调音器" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kAY-IQ-kPT">
-                            <rect key="frame" x="167" y="11" width="56" height="22"/>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tuning_setting" translatesAutoresizingMaskIntoConstraints="NO" id="YlL-14-R48">
                             <rect key="frame" x="344" y="10" width="24" height="24"/>
                         </imageView>
@@ -45,6 +39,9 @@
                                 <action selector="settingAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="10h-IE-KXJ"/>
                             </connections>
                         </button>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tuning_title" translatesAutoresizingMaskIntoConstraints="NO" id="WUo-55-1q9">
+                            <rect key="frame" x="168" y="13.666666666666664" width="54" height="16.999999999999993"/>
+                        </imageView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
@@ -52,16 +49,16 @@
                         <constraint firstItem="pFx-8o-VCU" firstAttribute="leading" secondItem="XRC-8p-p4e" secondAttribute="leading" id="0la-07-HRD"/>
                         <constraint firstItem="BFU-Xz-2Xu" firstAttribute="top" secondItem="XRC-8p-p4e" secondAttribute="top" id="1ZM-4W-pkR"/>
                         <constraint firstAttribute="bottom" secondItem="BFU-Xz-2Xu" secondAttribute="bottom" id="MLk-Cq-pRw"/>
-                        <constraint firstItem="kAY-IQ-kPT" firstAttribute="centerX" secondItem="XRC-8p-p4e" secondAttribute="centerX" id="NyJ-R5-o14"/>
                         <constraint firstItem="BFU-Xz-2Xu" firstAttribute="leading" secondItem="YlL-14-R48" secondAttribute="leading" id="S7q-SJ-hjs"/>
+                        <constraint firstItem="WUo-55-1q9" firstAttribute="centerX" secondItem="XRC-8p-p4e" secondAttribute="centerX" id="Z50-LT-87O"/>
                         <constraint firstItem="YlL-14-R48" firstAttribute="centerY" secondItem="XRC-8p-p4e" secondAttribute="centerY" id="Zc8-0c-TcZ"/>
                         <constraint firstItem="EN2-WR-x5g" firstAttribute="centerY" secondItem="XRC-8p-p4e" secondAttribute="centerY" id="Zdd-20-X1y"/>
                         <constraint firstAttribute="height" constant="44" id="cm1-xm-D5Z"/>
                         <constraint firstAttribute="bottom" secondItem="pFx-8o-VCU" secondAttribute="bottom" id="dGQ-eq-OMp"/>
+                        <constraint firstItem="WUo-55-1q9" firstAttribute="centerY" secondItem="XRC-8p-p4e" secondAttribute="centerY" id="j4n-zh-Pde"/>
                         <constraint firstAttribute="trailing" secondItem="YlL-14-R48" secondAttribute="trailing" constant="22" id="jwl-X5-VvP"/>
                         <constraint firstItem="EN2-WR-x5g" firstAttribute="leading" secondItem="XRC-8p-p4e" secondAttribute="leading" constant="14" id="p0O-O5-qtS"/>
                         <constraint firstItem="pFx-8o-VCU" firstAttribute="top" secondItem="XRC-8p-p4e" secondAttribute="top" id="u6y-gg-F2T"/>
-                        <constraint firstItem="kAY-IQ-kPT" firstAttribute="centerY" secondItem="XRC-8p-p4e" secondAttribute="centerY" id="wBj-40-9AW"/>
                     </constraints>
                 </view>
             </subviews>
@@ -80,5 +77,6 @@
     <resources>
         <image name="back_black" width="12" height="20"/>
         <image name="tuning_setting" width="24" height="24"/>
+        <image name="tuning_title" width="54" height="17"/>
     </resources>
 </document>