Fix Acknowledgements and animation on git hover

- Animate hover on git hash in About view - Add sort for acknowledgements view - Add a regex parser for CodeEdit (filters out inbuilt packages)

Author: mmshivesh

CodeEdit.xcodeproj/project.pbxproj

@@ -86,7 +86,7 @@
 D7E201BD27EA00E200CB86D0 /* FindNavigatorResultFileItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7E201BC27EA00E200CB86D0 /* FindNavigatorResultFileItem.swift */; };
 D7F72DEB27EA3574000C3064 /* Search in Frameworks */ = {isa = PBXBuildFile; productRef = D7F72DEA27EA3574000C3064 /* Search */; };
 DE6F77872813625500D00A76 /* TabBarDivider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE6F77862813625500D00A76 /* TabBarDivider.swift */; };
-FDF7C12227FAEA860039BA76 /* Package.resolved in Resources */ = {isa = PBXBuildFile; fileRef = FDF7C12127FAEA860039BA76 /* Package.resolved */; };
+FD6A3D3D2817C13B008BCF11 /* Package.resolved in Resources */ = {isa = PBXBuildFile; fileRef = FD6A3D3C2817C13B008BCF11 /* Package.resolved */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -183,8 +183,8 @@
 D7E201B127E8D50000CB86D0 /* FindNavigatorModeSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNavigatorModeSelector.swift; sourceTree = "<group>"; };
 D7E201B327E9989900CB86D0 /* FindNavigatorResultList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNavigatorResultList.swift; sourceTree = "<group>"; };
 D7E201BC27EA00E200CB86D0 /* FindNavigatorResultFileItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNavigatorResultFileItem.swift; sourceTree = "<group>"; };
-FDF7C12127FAEA860039BA76 /* Package.resolved */ = {isa = PBXFileReference; lastKnownFileType = text; path = Package.resolved; sourceTree = SOURCE_ROOT; };
 DE6F77862813625500D00A76 /* TabBarDivider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarDivider.swift; sourceTree = "<group>"; };
+FD6A3D3C2817C13B008BCF11 /* Package.resolved */ = {isa = PBXFileReference; lastKnownFileType = file; path = Package.resolved; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -410,7 +410,7 @@
 043C321927E32295006AE443 /* MainMenu.xib */,
 B673FDAC27E8296A00795864 /* PressActionsModifier.swift */,
 B658FB3127DA9E0F00EA4DBD /* WorkspaceView.swift */,
-FDF7C12127FAEA860039BA76 /* Package.resolved */,
+FD6A3D3C2817C13B008BCF11 /* Package.resolved */,
 28069DA527F5BD320016BC47 /* DefaultThemes */,
 );
 path = CodeEdit;
@@ -599,7 +599,7 @@
 D7211D4727E06BFE008F2ED7 /* Localizable.strings in Resources */,
 28A51001281673530087B0CC /* codeedit-xcode-dark.json in Resources */,
 B658FB3427DA9E1000EA4DBD /* Assets.xcassets in Resources */,
-FDF7C12227FAEA860039BA76 /* Package.resolved in Resources */,
+FD6A3D3D2817C13B008BCF11 /* Package.resolved in Resources */,
 043C321A27E32295006AE443 /* MainMenu.xib in Resources */,
 );
 runOnlyForDeploymentPostprocessing = 0;

CodeEdit/Info.plist

@@ -45,6 +45,6 @@
 </dict>
 </array>
 <key>GitHash</key>
-<string>b65f8ea34ec3259bd783ecb0a4cc49356436e84a</string>
+<string>c8d61e8b1c7bae1a749a2f558d537d0c44d6c22e</string>
 </dict>
 </plist>

CodeEditModules/Modules/About/src/AboutView.swift

@@ -46,6 +46,7 @@ public struct AboutView: View {
  .onHover { _ in
  self.hoveringOnCommitHash.toggle()
  }
+ .animation(.easeInOut, value: self.hoveringOnCommitHash)
  }.foregroundColor(.secondary)
  .font(.system(size: 10, weight: .light))
  Spacer().frame(height: 36)

CodeEditModules/Modules/Acknowledgements/src/AcknowledgementsView.swift

@@ -16,15 +16,19 @@ public struct AcknowledgementsView: View {
  if let bundlePath = Bundle.main.path(forResource: "Package.resolved", ofType: nil) {
  let jsonData = try String(contentsOfFile: bundlePath).data(using: .utf8)
  let parsedJSON = try JSONDecoder().decode(RootObject.self, from: jsonData!)
- for dependency in parsedJSON.object.pins {
- self.acknowledgements.append(
- Dependency(name: dependency.package,
- repositoryLink: dependency.repositoryURL,
- version: dependency.state.version))
+ for dependency in parsedJSON.object.pins.sorted(by: {$0.package < $1.package}) {
+ // Filter out Dependencies containing CodeEdit (case insensitive)
+ if dependency.package.range(of: "[Cc]ode[Ee]dit",
+ options: .regularExpression, range: nil, locale: nil) == nil {
+ self.acknowledgements.append(
+ Dependency(name: dependency.package,
+ repositoryLink: dependency.repositoryURL,
+ version: dependency.state.version ?? ""))
+ }
  }
  }
  } catch {
- print("Unable to open Package.resolved")
+ print(error)
  }
  }
 

CodeEditModules/Modules/Acknowledgements/src/ParsePackagesResolved.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 
-// let parsedJSON = try? JSONDecoder().decode(RootObject.self, from: jsonData)
 struct Dependency: Decodable {
  var name: String
  var repositoryLink: String
@@ -19,7 +18,6 @@ struct Dependency: Decodable {
 
 struct RootObject: Codable {
  let object: Object
- let version: Int
 }
 
 // MARK: - Object
@@ -36,5 +34,6 @@ struct Pin: Codable {
 
 // MARK: - State
 struct State: Codable {
- let revision, version: String
+ let revision: String
+ let version: String?
 }