Skip to content

Commit

Permalink
Merge commit '802317e018f9ef114b5be6d3dd25471ec0b08c1b'
Browse files Browse the repository at this point in the history 
* commit '802317e018f9ef114b5be6d3dd25471ec0b08c1b':
  enable Hardened Runtime for helper app
  bump version
  update MusicPlayer
  enable Hardened Runtime
  optimize for dark mode
  New translations InfoPlist.strings (Chinese Simplified)
  New translations Perference.strings (Chinese Simplified)
  fix: string files
  remove preferred lyrics source function
  update: shortcut binding
  • Loading branch information
@ddddxxx
ddddxxx committed Oct 10, 2018
2 parents f2f6593 + 802317e commit 17ae623
Show file tree
Hide file tree
Showing 17 changed files with 65 additions and 110 deletions.
2 changes: 1 addition & 1 deletion Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "ddddxxx/LyricsProvider" == 0.4.3

github "ddddxxx/MusicPlayer" == 0.1.1
github "ddddxxx/MusicPlayer" == 0.2.0

github "ddddxxx/GenericID" == 0.3.0

Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "SnapKit/SnapKit" "4.0.1"
github "ddddxxx/GenericID" "v0.3.0"
github "ddddxxx/LyricsProvider" "v0.4.3"
github "ddddxxx/MusicPlayer" "v0.1.1"
github "ddddxxx/MusicPlayer" "v0.2.0"
github "ddddxxx/Semver" "v0.1.2"
github "ddddxxx/SwiftyOpenCC" "v0.2.2"
github "ddddxxx/TouchBarHelper" "v1.0.0"
Expand Down
10 changes: 10 additions & 0 deletions LyricsX.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,9 @@
com.apple.ApplicationGroups.Mac = {
enabled = 1;
};
com.apple.HardenedRuntime = {
enabled = 1;
};
com.apple.Sandbox = {
enabled = 1;
};
Expand All @@ -451,6 +454,9 @@
com.apple.ApplicationGroups.Mac = {
enabled = 1;
};
com.apple.HardenedRuntime = {
enabled = 1;
};
com.apple.Sandbox = {
enabled = 1;
};
Expand Down Expand Up @@ -794,6 +800,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 3665V726AE;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
Expand All @@ -818,6 +825,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 3665V726AE;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
Expand All @@ -842,6 +850,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 3665V726AE;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = LyricsXHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
Expand All @@ -859,6 +868,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 3665V726AE;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = LyricsXHelper/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
Expand Down
18 changes: 9 additions & 9 deletions LyricsX/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,11 +567,11 @@
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="LM5-Vb-sGT"/>
</constraints>
<edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="0.0"/>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" controlSize="mini" horizontal="YES" id="I0t-r3-nYK">
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" controlSize="mini" horizontal="YES" id="I0t-r3-nYK">
<rect key="frame" x="-100" y="-100" width="87" height="11"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" controlSize="mini" horizontal="NO" id="BuP-Au-Ruu">
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="mini" horizontal="NO" id="BuP-Au-Ruu">
<rect key="frame" x="-100" y="-100" width="14" height="264"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
Expand Down Expand Up @@ -817,11 +817,11 @@ IA
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="320" id="TUa-AY-N9g"/>
</constraints>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="wh1-5U-gVg">
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="wh1-5U-gVg">
<rect key="frame" x="0.0" y="184" width="399" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="drD-x2-h4Y">
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="drD-x2-h4Y">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
Expand Down Expand Up @@ -887,11 +887,11 @@ IA
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="200" id="uht-5l-gZY"/>
</constraints>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="gf0-uJ-7Mf">
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="gf0-uJ-7Mf">
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="gNp-w1-80P">
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="gNp-w1-80P">
<rect key="frame" x="584" y="0.0" width="16" height="200"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
Expand Down Expand Up @@ -1033,7 +1033,7 @@ IA
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="SY5-cn-UXd">
<rect key="frame" x="0.0" y="180" width="300" height="5"/>
</box>
<scrollView wantsLayer="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5X9-bS-DKD">
<scrollView wantsLayer="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" verticalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="5X9-bS-DKD">
<rect key="frame" x="0.0" y="42" width="300" height="140"/>
<clipView key="contentView" drawsBackground="NO" id="XIB-fT-5rI">
<rect key="frame" x="0.0" y="0.0" width="300" height="140"/>
Expand All @@ -1053,11 +1053,11 @@ IA
<constraints>
<constraint firstAttribute="height" constant="140" id="50M-CA-dlO"/>
</constraints>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="IqI-vO-eog">
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="IqI-vO-eog">
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="8L8-Ts-4ej">
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="8L8-Ts-4ej">
<rect key="frame" x="284" y="0.0" width="16" height="140"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
Expand Down
Loading

0 comments on commit 17ae623

Please sign in to comment.