Skip to content

Commit

Permalink
Merge pull request #10 from terwanerik/ui-fixes
Browse files Browse the repository at this point in the history 
Fixed some UI issues that entered from macOS mojave / dark mode
  • Loading branch information
@terwanerik
terwanerik committed Nov 13, 2019
2 parents 8c1d611 + 76debb9 commit 13a3ac8
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 49 deletions.
32 changes: 30 additions & 2 deletions Pods/Pods.xcodeproj/project.pbxproj
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Pods/Pods.xcodeproj/xcuserdata/Erik.xcuserdatad/xcschemes/AFNetworking.xcscheme
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Pods/Pods.xcodeproj/xcuserdata/Erik.xcuserdatad/xcschemes/Pods-Retini.xcscheme
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Pods/Pods.xcodeproj/xcuserdata/Erik.xcuserdatad/xcschemes/Pods-RetiniTests.xcscheme
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Pods/Pods.xcodeproj/xcuserdata/Erik.xcuserdatad/xcschemes/Pods.xcscheme
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Retini.xcodeproj/project.pbxproj
View file
Expand Up @@ -480,8 +480,8 @@
DEVELOPMENT_TEAM = DAQ444SUMR;
INFOPLIST_FILE = Retini/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.8;
MARKETING_VERSION = 1.3.1;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = com.erikterwan.Retini;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -499,8 +499,8 @@
DEVELOPMENT_TEAM = DAQ444SUMR;
INFOPLIST_FILE = Retini/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.8;
MARKETING_VERSION = 1.3.1;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = com.erikterwan.Retini;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
24 changes: 10 additions & 14 deletions Retini.xcodeproj/xcuserdata/Erik.xcuserdatad/xcschemes/Retini.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
LastUpgradeVersion = "1110"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -41,6 +41,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "038880AD1B305F6300F8807F"
BuildableName = "Retini.app"
BlueprintName = "Retini"
ReferencedContainer = "container:Retini.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -53,17 +62,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "038880AD1B305F6300F8807F"
BuildableName = "Retini.app"
BlueprintName = "Retini"
ReferencedContainer = "container:Retini.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -85,8 +83,6 @@
ReferencedContainer = "container:Retini.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Binary file modified Retini.xcworkspace/xcuserdata/Erik.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
Binary file modified Retini.zip
View file
Binary file not shown.
18 changes: 10 additions & 8 deletions Retini/Base.lproj/MainMenu.xib
View file
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -90,12 +90,13 @@
</menu>
</menuItem>
</items>
<point key="canvasLocation" x="139" y="271"/>
</menu>
<window title="Retini" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="MainWindow">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" fullSizeContentView="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="335" y="390" width="480" height="360"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
<view key="contentView" id="EiT-Mj-1SZ">
<rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
<autoresizingMask key="autoresizingMask"/>
Expand All @@ -113,7 +114,7 @@
</textFieldCell>
</textField>
<stepper focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZjH-sF-SEO">
<rect key="frame" x="97" y="-85" width="19" height="26"/>
<rect key="frame" x="97" y="-86" width="19" height="28"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="MuD-0Z-2vW"/>
<constraint firstAttribute="width" constant="13" id="gvl-98-OSH"/>
Expand All @@ -126,7 +127,7 @@
<customView translatesAutoresizingMaskIntoConstraints="NO" id="UFV-hG-527" customClass="DragDropView">
<rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
<subviews>
<progressIndicator wantsLayer="YES" focusRingType="none" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="rli-D0-rtJ">
<progressIndicator hidden="YES" wantsLayer="YES" focusRingType="none" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="rli-D0-rtJ">
<rect key="frame" x="20" y="46" width="440" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="k7p-Fl-f1F"/>
Expand Down Expand Up @@ -158,7 +159,7 @@
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Settings" id="NSa-IL-8Ni">
<font key="font" metaFont="systemBold" size="15"/>
<color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="textColor" red="0.87058823529411766" green="0.87058823529411766" blue="0.87058823529411766" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
Expand All @@ -169,7 +170,7 @@
<constraint firstAttribute="width" constant="150" id="jni-1z-Kpo"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="JPEG quality" id="gaC-6k-wVT">
<font key="font" metaFont="smallSystem"/>
<font key="font" metaFont="palette"/>
<color key="textColor" red="1" green="1" blue="1" alpha="0.60218860815602837" colorSpace="calibratedRGB"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
Expand All @@ -181,7 +182,7 @@
<constraint firstAttribute="width" constant="166" id="ROE-5D-DZg"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Crush png (@3x, @2x and 1x)" id="V5O-zW-Agw">
<font key="font" metaFont="smallSystem"/>
<font key="font" metaFont="palette"/>
<color key="textColor" red="1" green="1" blue="1" alpha="0.60218860819999998" colorSpace="calibratedRGB"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
Expand Down Expand Up @@ -265,6 +266,7 @@
<outlet property="settingsButton" destination="w6r-fJ-7xs" id="Fc2-v9-c6Y"/>
<outlet property="topDragConstraint" destination="siT-LZ-tfa" id="PBM-pw-9oK"/>
</connections>
<point key="canvasLocation" x="139" y="158"/>
</window>
</objects>
</document>
4 changes: 3 additions & 1 deletion Retini/ResizeModel.m
View file
Expand Up @@ -237,7 +237,8 @@ - (BOOL)crushPng:(NSString *)fileName

[pngCrushLoader setMaxValue:pngCrushLoader.maxValue + 1];
[pngCrushLoader setAlphaValue:1.0];

[pngCrushLoader setHidden:NO];

dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
NSTask *task = [[NSTask alloc] init];
task.launchPath = [[NSBundle mainBundle] pathForResource:@"pngout" ofType:@""];
Expand All @@ -253,6 +254,7 @@ - (BOOL)crushPng:(NSString *)fileName
[pngCrushLoader setAlphaValue:0.0];
[pngCrushLoader setDoubleValue:0];
[pngCrushLoader setMaxValue:0];
[pngCrushLoader setHidden:YES];
}
});
});
Expand Down

0 comments on commit 13a3ac8

Please sign in to comment.