New Refreshed Icons (30) + Fixed Window Detection

jacobbvfx · Apr 2, 2022 · c49e7e5 · c49e7e5
1 parent def03b7
commit c49e7e5
Show file tree

Hide file tree

Showing 49 changed files with 56 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -8,15 +8,23 @@ RPFX will display the current file you're working on, as well as your workspace.
 In addition, it will also show file icons for the following file types:
 - `.swift`
 - `.playground`
+- `.xcodeproj`
+- `.storyboard`
+- `.plist`
+- `.cpp`
+- `.c`
+- `.h`
+- `.md`
 
-If you wish, you can tweak RPFX to use your own Discord application if you want to add custom functionality, such as more file icons.
+And much more! (30 in total)
 
 ## Dependencies
 RPFX uses [his fork](https://github.com/PKBeam/SwordRPC) of [Azoy's SwordRPC](https://github.com/Azoy/SwordRPC).
 
 ## System Requirements
 - macOS Big Sur (11.0) (Apple Silicon, Intel)
 - Xcode and Discord (Stable or PTB) installed (otherwise this program isn't very useful)
+
 ## Usage
 When you first start up RPFX, it will prompt you for permission to control Xcode. We don't actually need to *control* Xcode, 
 but we need that permission to execute AppleScript to get information on Xcode.
@@ -27,4 +35,7 @@ That's it, you're done - RPFX will now automatically monitor Xcode.
 
 If you like, you can set RPFX to automatically open on login.
 
-To disable it kill it from Activity Monitor.
+To disable it you can kill it from Activity Monitor.
+
+## Orginal Author
+Btw, this is a upgraded fork of [RPFX](https://github.com/PKBeam/RPFX) made by [PKBeam](https://github.com/PKBeam)
diff --git a/RPFX/AppDelegate.swift b/RPFX/AppDelegate.swift
@@ -21,9 +21,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     func updateStatus() {
         debugPrint("updating Rich Presence status")
 
-        print(runAPScript(.documentNames))
-        print(runAPScript(.windowNames))
-
         var rp = RichPresence()
         let fn = getActiveFilename()
         let ws = getActiveWorkspace()

diff --git a/RPFX/Applescript.swift b/RPFX/Applescript.swift
@@ -8,6 +8,7 @@
 
 import Foundation
 import Cocoa
+import SwiftUI
 
 enum APScripts: String {
     case windowNames = "return name of windows"
@@ -50,18 +51,21 @@ func runAPScript(_ s: APScripts) -> [String]? {
 }
 
 func getActiveFilename() -> String? {
+
     guard let fileNames = runAPScript(.documentNames) else {
         return nil
     }
 
     guard let windowNames = runAPScript(.windowNames) else {
         return nil
     }
-
     // find the first window title that matches a filename
     for window in windowNames { // iterate in order: the first window name is the one in focus
-        // check the focused window refers to a file
-        if fileNames.contains(window) {
+        // check the focused window refers to a files
+
+        let myString = window.components(separatedBy: .newlines)
+
+        if !fileNames.contains(myString[0]) {
             return window
         }
     }

diff --git a/RPFX/Constants.swift b/RPFX/Constants.swift
@@ -43,8 +43,43 @@ let discordClientId = "959768440518881281"
 
 // image keys of supported file types
 let discordRPImageKeys = [
+    "c",
+    "cc",
+    "cp",
+    "cpp",
+    "cxx",
+    "developerprofile",
+    "entitlements",
+    "geojson",
+    "glsl",
+    "gpx",
+    "h",
+    "hpp",
+    "m",
+    "make",
+    "md",
+    "mm",
+    "mobileprovision",
+    "mom",
+    "nib",
+    "octest",
+    "playground",
+    "plist",
+    "r",
+    "rb",
+    "rbw",
+    "s",
+    "storyboard",
+    "strings",
     "swift",
-    "playground"
+    "xcappdata",
+    "xcarchive",
+    "xcdatamodel",
+    "xcdatamodeld",
+    "xcodeproj",
+    "xcsnapshots",
+    "xcworkspace",
+    "xib"
 ]
 
 // fallback image for unsupported file types

diff --git a/images/c.png b/images/c.png
diff --git a/images/cc.png b/images/cc.png
diff --git a/images/cp.png b/images/cp.png
diff --git a/images/cpp.png b/images/cpp.png
diff --git a/images/cxx.png b/images/cxx.png
diff --git a/images/developerprofile.png b/images/developerprofile.png
diff --git a/images/entitlements.png b/images/entitlements.png
diff --git a/images/file.png b/images/file.png
diff --git a/images/geojson.png b/images/geojson.png
diff --git a/images/glsl.png b/images/glsl.png
diff --git a/images/gpx.png b/images/gpx.png
diff --git a/images/h.png b/images/h.png
diff --git a/images/hpp.png b/images/hpp.png
diff --git a/images/m.png b/images/m.png
diff --git a/images/make.png b/images/make.png
diff --git a/images/md.png b/images/md.png
diff --git a/images/mm.png b/images/mm.png
diff --git a/images/mobileprovision.png b/images/mobileprovision.png
diff --git a/images/mom.png b/images/mom.png
diff --git a/images/nib.png b/images/nib.png
diff --git a/images/octest.png b/images/octest.png
diff --git a/images/old/Markdown_logo.png b/images/old/Markdown_logo.png
diff --git a/images/old/file.png b/images/old/file.png
diff --git a/images/old/markdown.png b/images/old/markdown.png
diff --git a/images/old/playground.png b/images/old/playground.png
diff --git a/images/old/storyboard.png b/images/old/storyboard.png
diff --git a/images/old/swift.png b/images/old/swift.png
diff --git a/images/old/xcodeproj.png b/images/old/xcodeproj.png
diff --git a/images/playground.png b/images/playground.png
diff --git a/images/plist.png b/images/plist.png
diff --git a/images/r.png b/images/r.png
diff --git a/images/rb.png b/images/rb.png
diff --git a/images/rbw.png b/images/rbw.png
diff --git a/images/s.png b/images/s.png
diff --git a/images/storyboard.png b/images/storyboard.png
diff --git a/images/strings.png b/images/strings.png
diff --git a/images/swift.png b/images/swift.png
diff --git a/images/xcappdata.png b/images/xcappdata.png
diff --git a/images/xcarchive.png b/images/xcarchive.png
diff --git a/images/xcdatamodel.png b/images/xcdatamodel.png
diff --git a/images/xcdatamodeld.png b/images/xcdatamodeld.png
diff --git a/images/xcodeproj.png b/images/xcodeproj.png
diff --git a/images/xcsnapshots.png b/images/xcsnapshots.png
diff --git a/images/xcworkspace.png b/images/xcworkspace.png
diff --git a/images/xib.png b/images/xib.png