Merge pull request #119 from nakajijapan/use-pdf-format

Use pdf format
nakajijapan · Jul 28, 2021 · 42c0a5f · 42c0a5f
2 parents fa15b01 + 798fe4f
commit 42c0a5f
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 29 deletions.
diff --git a/PhotoSlider.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PhotoSlider.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
         "package": "PhotoSlider",
         "repositoryURL": "[email protected]:nakajijapan/PhotoSlider.git",
         "state": {
-          "branch": "master",
-          "revision": "80c85fdea102d80f80a051009e9f6aa60364ed18",
+          "branch": "use-pdf-format",
+          "revision": "fa15b0156fef487d74921376b4cb558c0416362d",
           "version": null
         }
       }

diff --git a/PhotoSliderDemo.xcodeproj/project.pbxproj b/PhotoSliderDemo.xcodeproj/project.pbxproj
@@ -594,7 +594,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "[email protected]:nakajijapan/PhotoSlider.git";
 			requirement = {
-				branch = master;
+				branch = "use-pdf-format";
 				kind = branch;
 			};
 		};

diff --git a/PhotoSliderDemo/ViewController.swift b/PhotoSliderDemo/ViewController.swift
@@ -126,6 +126,7 @@ extension ViewController: UICollectionViewDelegate {
         photoSlider.currentPage = indexPath.row
         //photoSlider.visibleCloseButton = false
         //photoSlider.visiblePageControl = false
+        photoSlider.visibleShareButton = true
         photoSlider.captionNumberOfLines = 0
 
         // UIViewControllerTransitioningDelegate

diff --git a/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/Contents.json b/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/Contents.json
@@ -1,23 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "close.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }
diff --git a/...Slider/PhotoSlider.xcassets/PhotoSliderClose.imageset/[email protected] b/...Slider/PhotoSlider.xcassets/PhotoSliderClose.imageset/[email protected]
diff --git a/...toSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/[email protected] b/...toSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/[email protected]
diff --git a/...toSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/[email protected] b/...toSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/[email protected]
diff --git a/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/close.pdf b/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderClose.imageset/close.pdf
diff --git a/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/Contents.json b/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/Contents.json
@@ -1,23 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "PhotoSliderShare.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "[email protected]",
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "ShareButton.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }
diff --git a/...PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/PhotoSliderShare.png b/...PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/PhotoSliderShare.png
diff --git a/...toSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/[email protected] b/...toSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/[email protected]
diff --git a/...toSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/[email protected] b/...toSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/[email protected]
diff --git a/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/ShareButton.pdf b/Sources/PhotoSlider/PhotoSlider.xcassets/PhotoSliderShare.imageset/ShareButton.pdf