Skip to content

Commit

Permalink
🎨 new icon
Browse files Browse the repository at this point in the history
  • Loading branch information
gee1k committed Aug 10, 2019
1 parent 4b54f54 commit 5d02dbb
Show file tree
Hide file tree
Showing 45 changed files with 129 additions and 144 deletions.
68 changes: 26 additions & 42 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Binary file added uPic/Assets.xcassets/AppIcon.appiconset/128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added uPic/Assets.xcassets/AppIcon.appiconset/16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added uPic/Assets.xcassets/AppIcon.appiconset/16@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added uPic/Assets.xcassets/AppIcon.appiconset/256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added uPic/Assets.xcassets/AppIcon.appiconset/32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added uPic/Assets.xcassets/AppIcon.appiconset/32@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added uPic/Assets.xcassets/AppIcon.appiconset/512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 44 additions & 44 deletions uPic/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
{
"images": [
"images" : [
{
"size": "16x16",
"idiom": "mac",
"filename": "icon_16x16.png",
"scale": "1x"
"size" : "16x16",
"idiom" : "mac",
"filename" : "16.png",
"scale" : "1x"
},
{
"size": "16x16",
"idiom": "mac",
"filename": "icon_16x16@2x.png",
"scale": "2x"
"size" : "16x16",
"idiom" : "mac",
"filename" : "16@2x.png",
"scale" : "2x"
},
{
"size": "32x32",
"idiom": "mac",
"filename": "icon_32x32.png",
"scale": "1x"
"size" : "32x32",
"idiom" : "mac",
"filename" : "32.png",
"scale" : "1x"
},
{
"size": "32x32",
"idiom": "mac",
"filename": "icon_32x32@2x.png",
"scale": "2x"
"size" : "32x32",
"idiom" : "mac",
"filename" : "32@2x.png",
"scale" : "2x"
},
{
"size": "128x128",
"idiom": "mac",
"filename": "icon_128x128.png",
"scale": "1x"
"size" : "128x128",
"idiom" : "mac",
"filename" : "128.png",
"scale" : "1x"
},
{
"size": "128x128",
"idiom": "mac",
"filename": "icon_128x128@2x.png",
"scale": "2x"
"size" : "128x128",
"idiom" : "mac",
"filename" : "128@2x.png",
"scale" : "2x"
},
{
"size": "256x256",
"idiom": "mac",
"filename": "icon_256x256.png",
"scale": "1x"
"size" : "256x256",
"idiom" : "mac",
"filename" : "256.png",
"scale" : "1x"
},
{
"size": "256x256",
"idiom": "mac",
"filename": "icon_256x256@2x.png",
"scale": "2x"
"size" : "256x256",
"idiom" : "mac",
"filename" : "256@2x.png",
"scale" : "2x"
},
{
"size": "512x512",
"idiom": "mac",
"filename": "icon_512x512.png",
"scale": "1x"
"size" : "512x512",
"idiom" : "mac",
"filename" : "512.png",
"scale" : "1x"
},
{
"size": "512x512",
"idiom": "mac",
"filename": "icon_512x512@2x.png",
"scale": "2x"
"size" : "512x512",
"idiom" : "mac",
"filename" : "512@2x.png",
"scale" : "2x"
}
],
"info": {
"version": 1,
"author": "xcode"
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
22 changes: 11 additions & 11 deletions uPic/Assets.xcassets/about.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"images": [
"images" : [
{
"idiom": "universal",
"filename": "icon_128x128@2x.png",
"scale": "1x"
"idiom" : "universal",
"filename" : "about.png",
"scale" : "1x"
},
{
"idiom": "universal",
"scale": "2x"
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom": "universal",
"scale": "3x"
"idiom" : "universal",
"scale" : "3x"
}
],
"info": {
"version": 1,
"author": "xcode"
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added uPic/Assets.xcassets/about.imageset/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
3 changes: 2 additions & 1 deletion uPic/Assets.xcassets/statusIcon.imageset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "icon_32x32.png",
"filename" : "menubar.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "menubar@2x.png",
"scale" : "3x"
}
],
Expand Down
Binary file not shown.
Binary file added uPic/Assets.xcassets/statusIcon.imageset/menubar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 14 additions & 15 deletions uPic/Assets.xcassets/uploadIcon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
{
"images": [
"images" : [
{
"idiom": "universal",
"filename": "icon_16x16.png",
"scale": "1x"
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom": "universal",
"filename": "icon_32x32.png",
"scale": "2x"
"idiom" : "universal",
"filename" : "wait.png",
"scale" : "2x"
},
{
"idiom": "universal",
"filename": "media-up.png",
"scale": "3x"
"idiom" : "universal",
"filename" : "wait@2x.png",
"scale" : "3x"
}
],
"info": {
"version": 1,
"author": "xcode"
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties": {
"template-rendering-intent": "template"
"properties" : {
"template-rendering-intent" : "template"
}
}
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file added uPic/Assets.xcassets/uploadIcon.imageset/wait.png
6 changes: 2 additions & 4 deletions uPic/Models/BaseUploaderUtil.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation

class BaseUploaderUtil {
static func compressImage(_ data: Data) -> Data {
var factor:Int = ConfigManager.shared.compressFactor
let factor:Int = ConfigManager.shared.compressFactor

if factor >= 100 {
return data
Expand All @@ -24,17 +24,15 @@ class BaseUploaderUtil {
}

static func compressImage(_ url: URL) -> Data? {
var factor:Int = ConfigManager.shared.compressFactor
let factor:Int = ConfigManager.shared.compressFactor

if factor >= 100 {
return nil
}

let data = try? Data(contentsOf: url)
// 压缩图片
debugPrint("origin data -> \(data?.bytes.count)")
let retData = data?.compressImage(Float(factor) / 100)
debugPrint("compress data -> \(retData?.bytes.count)")
return retData
}
}
22 changes: 11 additions & 11 deletions uPic/Supporting Files/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.10.0</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleURLSchemes</key>
<array>
<string>$(PRODUCT_NAME)</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>20190808</string>
<key>LSApplicationCategoryType</key>
Expand All @@ -43,16 +54,5 @@
<true/>
<key>SUFeedURL</key>
<string>https://svend.cc/uPic/appcast.xml</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleURLSchemes</key>
<array>
<string>$(PRODUCT_NAME)</string>
</array>
</dict>
</array>
</dict>
</plist>
33 changes: 18 additions & 15 deletions uPicFinderExtension/Assets.xcassets/upload.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"images" : [
{
"idiom" : "mac",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "mac",
"filename" : "upload.png",
"idiom" : "universal",
"filename" : "light.png",
"appearances" : [
{
"appearance" : "luminosity",
Expand All @@ -16,8 +16,8 @@
"scale" : "1x"
},
{
"idiom" : "mac",
"filename" : "upload-dark.png",
"idiom" : "universal",
"filename" : "dark.png",
"appearances" : [
{
"appearance" : "luminosity",
Expand All @@ -27,35 +27,38 @@
"scale" : "1x"
},
{
"idiom" : "mac",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "mac",
"scale" : "2x",
"idiom" : "universal",
"filename" : "light@2x-1.png",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
]
],
"scale" : "2x"
},
{
"idiom" : "mac",
"scale" : "2x",
"idiom" : "universal",
"filename" : "dark@2x.png",
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
]
],
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Diff not rendered.
Diff not rendered.

0 comments on commit 5d02dbb

Please sign in to comment.