Merge pull request #6 from mulot/developpement

Developpement
mulot · Nov 27, 2022 · d9ea267 · d9ea267
2 parents 4d12c16 + bb3a9c1
commit d9ea267
Show file tree

Hide file tree

Showing 16 changed files with 556 additions and 75 deletions.
diff --git a/BeatTime.xcodeproj/project.pbxproj b/BeatTime.xcodeproj/project.pbxproj
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/mulot.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/mulot.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/BeatTime.xcodeproj/xcuserdata/mulot.xcuserdatad/xcschemes/xcschememanagement.plist b/BeatTime.xcodeproj/xcuserdata/mulot.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -17,7 +17,7 @@
 		<key>BeatTimeMenuBar.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>10</integer>
 		</dict>
 		<key>BeatTimeTvOS.xcscheme_^#shared#^_</key>
 		<dict>
@@ -49,6 +49,11 @@
 			<key>orderHint</key>
 			<integer>6</integer>
 		</dict>
+		<key>BeatTimeWidgetWatchOSExtension.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>9</integer>
+		</dict>
 		<key>BeatTimeWidgetiOSExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
@@ -62,6 +67,26 @@
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
+		<key>94196330292ED5FE009BC68A</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>947C5629264814E9007E6B4A</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>947C562C264814E9007E6B4A</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>94BEB1B92646D9C500A5D811</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>94CBA0C3265308370032CA8B</key>
 		<dict>
 			<key>primary</key>

diff --git a/BeatTime/BeatTime.swift b/BeatTime/BeatTime.swift
@@ -78,4 +78,18 @@ class BeatTime: NSObject {
         }
         return(Date())
     }
+
+    /// Return the difference between LocalTimeZone and GMT
+    /// - Parameter date: local date
+    /// - Returns: Difference in hours (negative or positive)
+    static func hoursOffsetWithGMT(date: Date = Date()) -> Int
+    {
+        //print(TimeZone.current.identifier)
+        //print(TimeZone.abbreviationDictionary)
+        //let seconds = TimeZone.init(identifier: "JST")!.secondsFromGMT(for: date)
+        let seconds = TimeZone.current.secondsFromGMT(for: date)
+        let hours = seconds / 3600
+        //print("seconds: \(seconds) hours: \(hours)")
+        return(hours)
+    }
 }
diff --git a/BeatTimeWidgetWatchOS/Assets.xcassets/AccentColor.colorset/Contents.json b/BeatTimeWidgetWatchOS/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/BeatTimeWidgetWatchOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/BeatTimeWidgetWatchOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/BeatTimeWidgetWatchOS/Assets.xcassets/Contents.json b/BeatTimeWidgetWatchOS/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/BeatTimeWidgetWatchOS/Assets.xcassets/WidgetBackground.colorset/Contents.json b/BeatTimeWidgetWatchOS/Assets.xcassets/WidgetBackground.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/BeatTimeWidgetWatchOS/Info.plist b/BeatTimeWidgetWatchOS/Info.plist
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.widgetkit-extension</string>
+	</dict>
+</dict>
+</plist>
diff --git a/MacOS/AppDelegate.swift b/MacOS/AppDelegate.swift
@@ -21,6 +21,7 @@ class AppDelegate: NSObject, NSWindowDelegate, NSApplicationDelegate {
     var circleView: RingProgressView!
     var isCentiBeats: Bool = false
     var statusItem: NSStatusItem?
+    var lineWidth: CGFloat = 25
 
     @IBAction func changeCentiBeats(_ sender: AnyObject) {
         if (beat != nil) {
@@ -45,6 +46,7 @@ class AppDelegate: NSObject, NSWindowDelegate, NSApplicationDelegate {
         circle.arcFrag = 1000
         circle.lineColor = NSColor.gray.cgColor
         circle.isShadow = true
+        circle.lineWidth = lineWidth
         if (circleView != nil) {
             view.replaceSubview(circleView, with: circle)
             circleView = circle
@@ -57,6 +59,7 @@ class AppDelegate: NSObject, NSWindowDelegate, NSApplicationDelegate {
         let circleBeat = RingProgressView(frame: NSRect(x: window.contentLayoutRect.width/2 - (circleDiameter/2), y: window.contentLayoutRect.height/2 - (circleDiameter/2), width: circleDiameter, height: circleDiameter))
         if (beat != nil) {
             circleBeat.arcFrag = Double(beat.beats()) ?? 0
+            circleBeat.lineWidth = lineWidth
             //circleBeat.arcFrag = 999 // TEST FULL CIRCLE
         }
         if (circleBeatView != nil) {

diff --git a/TvOS/BeatTimeTvOSApp.swift b/TvOS/BeatTimeTvOSApp.swift
@@ -33,8 +33,15 @@ struct ContentView: View {
                 .font(.title.bold())
                 .gradientForeground(colors: [.startGradient, .midGradient, .mid2Gradient, .endGradient])
                 */
-            BeatTimeView(lineWidth: 40)
-
+            if #available(tvOS 16.0, *) {
+                BeatTimeView(lineWidth: 40)
+                    .onTapGesture {
+                        print("Tap")
+                    }
+            }
+            else {
+                BeatTimeView(lineWidth: 40)
+            }
         }
     }
 }

diff --git a/View/BeatTImeView.swift b/View/BeatTImeView.swift
@@ -32,7 +32,7 @@ struct BeatTimeView: View {
                 }
                 if (Double(beats) != nil) {
                     RingProgressView(arcFrag: Double(beats)!, lineWidth: lineWidth)
-                        .gradientForeground(colors: [.startGradient, .midGradient, .mid2Gradient, .endGradient], startPoint: startGradient, endPoint: endGradient)
+                        .gradientLinear(colors: [.startGradient, .midGradient, .mid2Gradient, .endGradient], startPoint: startGradient, endPoint: endGradient)
                         .onAppear() {
                             withAnimation(.default.speed(0.30)) {
                                 //print("animation on Appear")
@@ -60,7 +60,7 @@ struct BeatTimeView: View {
                     #endif*/
                 }
                 TextFitView(text: "@" + beats, size: displayLenght)
-                    .gradientForeground(colors: [.startGradient, .midGradient, .mid2Gradient, .endGradient])
+                    .gradientLinear(colors: [.startGradient, .midGradient, .mid2Gradient, .endGradient])
                 /*Text("@" + beats)
                 .font(.largeTitle.bold())
                 .font(.system(size: fontSize, weight: .bold))*/
@@ -86,8 +86,8 @@ struct BeatTimeView: View {
 
     func gradientPosition(date: Date = Date(), frame: CGRect, lenght: CGFloat, followSun: Bool = true) -> (UnitPoint, UnitPoint)
     {
-        let nbHour = hoursOffsetWithGMT()
-        let angle = (2 * Double.pi) / 24 * Double(nbHour)
+        let nbHour = BeatTime.hoursOffsetWithGMT()
+        let angle = -(2 * Double.pi) / 24 * Double(nbHour)
         let r = lenght / 2
         let startCircle = UnitPoint(x: 0.5, y: (1 - (lenght / frame.height)) / 2)
         let endCircle = UnitPoint(x: 0.5, y: 1 - ((1 - (lenght / frame.height)) / 2))
@@ -105,18 +105,6 @@ struct BeatTimeView: View {
             return (startCircle, endCircle)
         }
     }
-
-
-    func hoursOffsetWithGMT(date: Date = Date()) -> Int
-    {
-        //print(TimeZone.current.identifier)
-        //print(TimeZone.abbreviationDictionary)
-        //let seconds = TimeZone.init(identifier: "JST")!.secondsFromGMT(for: date)
-        let seconds = TimeZone.current.secondsFromGMT(for: date)
-        let hours = seconds / 3600
-        //print("seconds: \(seconds) hours: \(-hours)")
-        return(-hours)
-    }
 }
 
 struct BeatTime_Previews: PreviewProvider {

diff --git a/View/Colors.swift b/View/Colors.swift
@@ -10,8 +10,8 @@ import SwiftUI
 extension Color {
     static let timeLine = Color.orange
     static let circleLine = Color(red: 230/255, green: 230/255, blue: 230/255)
-    static let startGradient =  Color(red: 0, green: 30/255, blue: 50/255)
+    static let startGradient =  Color(red: 0, green: 30/255, blue: 50/255) // midnight
     static let midGradient = Color.purple
-    static let mid2Gradient = Color(red: 247/255, green: 186/255, blue: 0)
-    static let endGradient = Color(red: 1, green: 1, blue: 0)
+    static let mid2Gradient = Color(red: 247/255, green: 186/255, blue: 0) // neaar orange
+    static let endGradient = Color(red: 1, green: 1, blue: 0) // yellow
 }
diff --git a/View/UIViewDraw.swift b/View/UIViewDraw.swift
@@ -9,12 +9,17 @@
 import SwiftUI
 
 extension View {
-    public func gradientForeground(colors: [Color], startPoint: UnitPoint = .top, endPoint: UnitPoint = .bottom) -> some View {
-        self.overlay(LinearGradient(gradient: .init(colors: colors),
-                                    startPoint: startPoint,
-                                    endPoint: endPoint))
+    public func gradientLinear(colors: [Color], startPoint: UnitPoint = .top, endPoint: UnitPoint = .bottom) -> some View {
+            self.overlay(LinearGradient(gradient: .init(colors: colors),
+                                        startPoint: startPoint,
+                                        endPoint: endPoint))
             .mask(self)
     }
+    public func gradientRadius(colors: [Color], center: UnitPoint = .center, startRadius: CGFloat = 0, endRadius: CGFloat = 1) -> some View {
+        self.overlay(RadialGradient(gradient: .init(colors: colors),
+                                    center: center, startRadius: startRadius, endRadius: endRadius))
+        .mask(self)
+    }
 }
 
 struct RingProgressView: Shape {

diff --git a/WatchOS WatchKit Extension/BeatTimeApp.swift b/WatchOS WatchKit Extension/BeatTimeApp.swift
@@ -174,18 +174,20 @@ struct ContentView: View {
                  */
                 ProgressView(value: Double(beats)!/1000)
                     .progressViewStyle(CircularProgressViewStyle(tint: fgColors[Int(index.rounded())]))
-                    //.scaledToFit()
+                //.gradientLinear(colors: [.startGradient, .midGradient, .mid2Gradient, .endGradient])
+                //.scaledToFit()
                     .frame(width: frame.width, height: frame.height, alignment: .center)
                     .scaleEffect(3.2, anchor: .center)
                     .onAppear() {
                         withAnimation(.default.speed(0.25)) {
                             self.beats = BeatTime().beats()
-                            print("animation on Appear")
+                            //print("animation on Appear")
                         }
                     }
                 Text("@" + beats)
                     .font(.title.bold())
                     .foregroundColor(fgColors[Int(index.rounded())])
+                //.gradientLinear(colors: [.startGradient, .midGradient, .mid2Gradient, .endGradient])
                 //Text("Index : \(index)")
             }
             .focusable()