Merge branch 'release/v0.19.4'

gee1k · Jul 8, 2020 · b8da0e0 · b8da0e0
2 parents b715f24 + a25e7b1
commit b8da0e0
Show file tree

Hide file tree

Showing 49 changed files with 267 additions and 120 deletions.
diff --git a/uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme b/uPic.xcodeproj/xcshareddata/xcschemes/uPic.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1150"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/uPic/Assets.xcassets/downloadOnAppStore.imageset/Contents.json b/uPic/Assets.xcassets/downloadOnAppStore.imageset/Contents.json
@@ -0,0 +1,80 @@
+{
+  "images" : [
+    {
+      "filename" : "Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917-1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917.png",
+      "idiom" : "universal",
+      "locale" : "en",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "locale" : "en",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "locale" : "en",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "Download_on_the_App_Store_Badge_CNSC_RGB_blk_092917.png",
+      "idiom" : "universal",
+      "locale" : "zh-Hans",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "locale" : "zh-Hans",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "locale" : "zh-Hans",
+      "scale" : "3x"
+    },
+    {
+      "filename" : "Download_on_the_App_Store_Badge_CNSC_RGB_blk_092917-1.png",
+      "idiom" : "universal",
+      "locale" : "zh-Hant",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "locale" : "zh-Hant",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "locale" : "zh-Hant",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "localizable" : true
+  }
+}
diff --git a/...adOnAppStore.imageset/Download_on_the_App_Store_Badge_CNSC_RGB_blk_092917-1.png b/...adOnAppStore.imageset/Download_on_the_App_Store_Badge_CNSC_RGB_blk_092917-1.png
diff --git a/...loadOnAppStore.imageset/Download_on_the_App_Store_Badge_CNSC_RGB_blk_092917.png b/...loadOnAppStore.imageset/Download_on_the_App_Store_Badge_CNSC_RGB_blk_092917.png
diff --git a/...nAppStore.imageset/[email protected] b/...nAppStore.imageset/[email protected]
diff --git a/...dOnAppStore.imageset/[email protected] b/...dOnAppStore.imageset/[email protected]
diff --git a/...nAppStore.imageset/[email protected] b/...nAppStore.imageset/[email protected]
diff --git a/...dOnAppStore.imageset/[email protected] b/...dOnAppStore.imageset/[email protected]
diff --git a/...dOnAppStore.imageset/Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917-1.png b/...dOnAppStore.imageset/Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917-1.png
diff --git a/...oadOnAppStore.imageset/Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917.png b/...oadOnAppStore.imageset/Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917.png
diff --git a/...AppStore.imageset/[email protected] b/...AppStore.imageset/[email protected]
diff --git a/...OnAppStore.imageset/[email protected] b/...OnAppStore.imageset/[email protected]
diff --git a/...AppStore.imageset/[email protected] b/...AppStore.imageset/[email protected]
diff --git a/...OnAppStore.imageset/[email protected] b/...OnAppStore.imageset/[email protected]
diff --git a/uPic/Assets.xcassets/single.imageset/Contents.json b/uPic/Assets.xcassets/single.imageset/Contents.json
@@ -1,26 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "single.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}
diff --git a/uPic/Assets.xcassets/single.imageset/single.png b/uPic/Assets.xcassets/single.imageset/single.png
diff --git a/uPic/Assets.xcassets/single.imageset/[email protected] b/uPic/Assets.xcassets/single.imageset/[email protected]
diff --git a/uPic/Assets.xcassets/single.imageset/[email protected] b/uPic/Assets.xcassets/single.imageset/[email protected]
diff --git a/uPic/Assets.xcassets/statusIcon.imageset/Contents.json b/uPic/Assets.xcassets/statusIcon.imageset/Contents.json
@@ -1,26 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "statusIcon.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}
diff --git a/uPic/Assets.xcassets/statusIcon.imageset/statusIcon.png b/uPic/Assets.xcassets/statusIcon.imageset/statusIcon.png
diff --git a/uPic/Assets.xcassets/statusIcon.imageset/[email protected] b/uPic/Assets.xcassets/statusIcon.imageset/[email protected]
diff --git a/uPic/Assets.xcassets/statusIcon.imageset/[email protected] b/uPic/Assets.xcassets/statusIcon.imageset/[email protected]
diff --git a/uPic/Assets.xcassets/uPicForiOS.imageset/Contents.json b/uPic/Assets.xcassets/uPicForiOS.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "uPicForiOS.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/uPic/Assets.xcassets/uPicForiOS.imageset/uPicForiOS.png b/uPic/Assets.xcassets/uPicForiOS.imageset/uPicForiOS.png
diff --git a/uPic/Assets.xcassets/uPicForiOS.imageset/[email protected] b/uPic/Assets.xcassets/uPicForiOS.imageset/[email protected]
diff --git a/uPic/Assets.xcassets/uPicForiOS.imageset/[email protected] b/uPic/Assets.xcassets/uPicForiOS.imageset/[email protected]
diff --git a/uPic/Assets.xcassets/uploadIcon.imageset/Contents.json b/uPic/Assets.xcassets/uploadIcon.imageset/Contents.json
@@ -1,26 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "uploadIcon.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "[email protected]",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "template"
   }
-}
+}
diff --git a/uPic/Assets.xcassets/uploadIcon.imageset/uploadIcon.png b/uPic/Assets.xcassets/uploadIcon.imageset/uploadIcon.png
diff --git a/uPic/Assets.xcassets/uploadIcon.imageset/[email protected] b/uPic/Assets.xcassets/uploadIcon.imageset/[email protected]
diff --git a/uPic/Assets.xcassets/uploadIcon.imageset/[email protected] b/uPic/Assets.xcassets/uploadIcon.imageset/[email protected]