Adjustments for Apple changes in dynamic wallpapers.

README.md

@@ -18,6 +18,8 @@ swift build --configuration release
 sudo cp .build/x86_64-apple-macosx10.10/release/wallpapper /usr/local/bin
 ```
 
+If you are using swift in version 4.1, please edit `Package.swift` file and put there your version of swift (in first line).
+
 Now in the console you can run `wallpapper -h` and you should got a response similar to the following one.
 
 ```bash
@@ -39,13 +41,17 @@ If you have done above commands now you can build dynamic wallpaper. It's really
   {
     "fileName": "1.png",
     "isPrimary": true,
+    "isForLight": true,
+    "isForDark": false,
     "themeMode": 1,
     "altitude": 27.95,
     "azimuth": 279.66
   },
   {
     "fileName": "2.png",
     "isPrimary": false,
+    "isForLight": false,
+    "isForDark": false,
     "themeMode": 1,
     "altitude": -31.05,
     "azimuth": 4.16
@@ -54,6 +60,8 @@ If you have done above commands now you can build dynamic wallpaper. It's really
   {
     "fileName": "16.png",
     "isPrimary": false,
+    "isForLight": false,
+    "isForDark": true,
     "themeMode": 1,
     "altitude": -28.63,
     "azimuth": 340.41
@@ -65,7 +73,8 @@ Properties:
 
 - `fileName` - name of picture file name.
 - `isPrimary` - information about image which is primary image (it will be visible after creating `heic` file). Only one of the file can be primary.
-- `themeMode` - information about mode which will display picture. 0 - picture will be displayed in both modes (light/dark). 1 - picture will be displayed only in light mode.
+- `isForLight` - if `true` picture will be displayed when user chose "Light (static)" wallpaper
+- `isForDark` - if `true` picture will be displayed when user chose "Dark (static)" wallpaper
 - `altitude` - is the angle between the Sun and the observer's local horizon.
 - `azimuth` - that is the angle of the Sun around the horizon.
 

Sources/wallpapper/Generator.swift

@@ -81,9 +81,16 @@ class Generator {
             let sequenceItem = SequenceItem()
             sequenceItem.a = item.altitude
             sequenceItem.z = item.azimuth
-            sequenceItem.o = item.themeMode == .both ? 0 : 1
             sequenceItem.i = index
 
+            if item.isForLight {
+                sequenceInfo.ap.l = index
+            }
+
+            if item.isForDark {
+                sequenceInfo.ap.d = index
+            }
+
             sequenceInfo.si.append(sequenceItem)
         }
 

Sources/wallpapper/Model/PictureInfo.swift

@@ -11,14 +11,16 @@ import Foundation
 class PictureInfo: Decodable {
     var fileName: String
     var isPrimary = false
-    var themeMode: ThemeMode = .both
+    var isForLight = false
+    var isForDark = false
     var altitude = 0.0
     var azimuth = 0.0
 
-    init(fileName: String, isPrimary: Bool, themeMode: ThemeMode, altitude: Double, azimuth: Double) {
+    init(fileName: String, isPrimary: Bool, isForLight: Bool, isForDark: Bool, altitude: Double, azimuth: Double) {
         self.fileName = fileName
         self.isPrimary = isPrimary
-        self.themeMode = themeMode
+        self.isForLight = isForLight
+        self.isForDark = isForDark
         self.altitude = altitude
         self.azimuth = azimuth
     }

Sources/wallpapper/PropertyList/Apperance.swift

@@ -0,0 +1,13 @@
+//
+//  Apperance.swift
+//  wallpapper
+//
+//  Created by Marcin Czachurski on 31/07/2018.
+//
+
+import Foundation
+
+class Apperance: Codable {
+    var d: Int = 0
+    var l: Int = 0
+}

Sources/wallpapper/PropertyList/SequenceInfo.swift

@@ -10,4 +10,5 @@ import Foundation
 
 class SequenceInfo : Codable {
     var si: [SequenceItem] = []
+    var ap = Apperance()
 }

Sources/wallpapper/PropertyList/SequenceItem.swift

@@ -12,5 +12,4 @@ class SequenceItem : Codable {
     var a: Double = 0.0
     var z: Double = 0.0
     var i: Int = 0
-    var o: Int = 0
 }