Merging of PR #2

ZonD80 · Jun 5, 2020 · 3131d92 · 3131d92
1 parent f8181ad
commit 3131d92
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 11 deletions.
diff --git a/duppy2.xcodeproj/project.pbxproj b/duppy2.xcodeproj/project.pbxproj
@@ -22,6 +22,7 @@
 		88D4A5DE247983E500469190 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 88D4A5DD247983E500469190 /* LICENSE */; };
 		88D4A5E0247985C200469190 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 88D4A5DF247985C200469190 /* icon.png */; };
 		88D4A5E22479952D00469190 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 88D4A5E12479952D00469190 /* .gitignore */; };
+		88E5FBCA248AAEC6008B8E7A /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88E5FBC9248AAEC6008B8E7A /* WebKit.framework */; };
 		9E1CBA072488CFFB009CE8A7 /* Kingfisher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E1CBA062488CFFB009CE8A7 /* Kingfisher.framework */; };
 		9E1CBA082488D007009CE8A7 /* Kingfisher.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9E1CBA062488CFFB009CE8A7 /* Kingfisher.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
@@ -60,6 +61,7 @@
 		88D4A5DD247983E500469190 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		88D4A5DF247985C200469190 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
 		88D4A5E12479952D00469190 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
+		88E5FBC9248AAEC6008B8E7A /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		9E1CBA062488CFFB009CE8A7 /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -70,6 +72,7 @@
 			files = (
 				88D4A5DB2479733100469190 /* Zip.framework in Frameworks */,
 				9E1CBA072488CFFB009CE8A7 /* Kingfisher.framework in Frameworks */,
+				88E5FBCA248AAEC6008B8E7A /* WebKit.framework in Frameworks */,
 				88D4A5D8247972EE00469190 /* Swifter.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -118,6 +121,7 @@
 		88D4A5C52479409500469190 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				88E5FBC9248AAEC6008B8E7A /* WebKit.framework */,
 				9E1CBA062488CFFB009CE8A7 /* Kingfisher.framework */,
 				88D4A5C62479409500469190 /* Swifter.framework */,
 				88D4A5C72479409500469190 /* Zip.framework */,
@@ -383,7 +387,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = zond80.duppy2;
 				PRODUCT_NAME = Duppy;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -412,7 +416,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = zond80.duppy2;
 				PRODUCT_NAME = Duppy;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/...codeproj/project.xcworkspace/xcuserdata/zond80.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/zond80.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/duppy2/Base.lproj/Main.storyboard b/duppy2/Base.lproj/Main.storyboard
@@ -11,7 +11,7 @@
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="duppy2" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Duppy" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -52,28 +52,42 @@
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Made with ❤️ by ZonD80" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iAA-dJ-NWW" userLabel="CopyrightText">
-                                <rect key="frame" x="108.5" y="862" width="197" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
+                            <stackView opaque="NO" contentMode="scaleToFill" spacing="3" translatesAutoresizingMaskIntoConstraints="NO" id="N6Z-m1-HFY">
+                                <rect key="frame" x="66" y="853" width="282" height="33"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Made with ❤️ by ZonD80" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iAA-dJ-NWW" userLabel="CopyrightText">
+                                        <rect key="frame" x="0.0" y="0.0" width="197" height="33"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HaH-gX-2rQ">
+                                        <rect key="frame" x="200" y="0.0" width="82" height="33"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <state key="normal" title="and others"/>
+                                        <connections>
+                                            <action selector="tapOtherAckButton:" destination="BYZ-38-t0r" eventType="primaryActionTriggered" id="jRY-er-JwO"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                            </stackView>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
                             <constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="gxT-8I-arb" secondAttribute="bottom" id="3QO-Lf-b7g"/>
+                            <constraint firstAttribute="bottom" secondItem="N6Z-m1-HFY" secondAttribute="bottom" constant="10" id="Es4-c2-fUO"/>
                             <constraint firstItem="WVe-g0-7ZF" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" id="VPf-mv-4Pv"/>
                             <constraint firstItem="WVe-g0-7ZF" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="Z4s-QG-sks"/>
-                            <constraint firstItem="iAA-dJ-NWW" firstAttribute="top" secondItem="gxT-8I-arb" secondAttribute="bottom" id="fny-Ot-TUv"/>
+                            <constraint firstItem="N6Z-m1-HFY" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="ZLJ-Hm-dYh"/>
                             <constraint firstItem="gxT-8I-arb" firstAttribute="top" secondItem="WVe-g0-7ZF" secondAttribute="bottom" id="h2f-JD-DxX"/>
                             <constraint firstItem="gxT-8I-arb" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="hCT-Z6-OfM"/>
                             <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="gxT-8I-arb" secondAttribute="trailing" id="obb-Xh-Poy"/>
-                            <constraint firstItem="iAA-dJ-NWW" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="uFq-71-1Eq"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
                     <connections>
                         <outlet property="appsTableView" destination="gxT-8I-arb" id="Y4U-08-HpY"/>
+                        <outlet property="othersAckButton" destination="HaH-gX-2rQ" id="ESK-Do-ZMa"/>
                         <outlet property="statusText" destination="WVe-g0-7ZF" id="xHH-vf-V1b"/>
                     </connections>
                 </viewController>

diff --git a/duppy2/ViewController.swift b/duppy2/ViewController.swift
@@ -13,7 +13,12 @@ import Kingfisher
 
 class ViewController: UIViewController , UITableViewDataSource , UITableViewDelegate {
 
+    @IBOutlet weak var othersAckButton: UIButton!
 
+    @IBAction func tapOtherAckButton(_ sender: Any) {
+        guard let url = URL(string: "https://github.com/ZonD80/duppy/graphs/contributors") else { return }
+        UIApplication.shared.open(url)
+    }
     func log(_ text:String) {
         //print(text);
         NSLog(text);