Feature/mac support #46

ZvonimirMedak · 2025-01-20T15:13:17Z

Summary

Added macOS support with a new SwiftUI example

Changes

Podspec updated (removed CustomLocation from default podspec, added macOS support)
Added a new SwiftUI example (we will most likely need to add the SPM every time the project is downloaded since currently it has my local path)
Added macOS target to the UIKit example
Added macOS support to the DeviceTool
exposed SentinelTabBarView to be public
refactored Preferences to use PreferenceSection so that the users can't add other items than Toggle ones (We will introduce other ones later on or maybe we can set it to toggle/custom)

Type

Feature: This pull request introduces a new feature.
Bug fix: This pull request fixes a bug.
Refactor: This pull request refactors existing code.
Documentation: This pull request updates documentation.
Other: This pull request makes other changes.

Additional information

This pull request introduces a breaking change.

Description

I've mentioned everything in the changes section

Checklist

I have performed a self-review of my own code.
I have tested my changes, including edge cases.
I have added necessary tests for the changes introduced (if applicable).
I have updated the documentation to reflect my changes (if applicable).

Additional notes

After this gets reviewed, I would like to try to push team members to try out the new version where possible so we can test it out. Also, I would like to improve the current state of the navigation on macOS

nikolamajcen

This is such a great work 👍 I'm glad that I can finally run Sentinel on macOS.

Based on your changes, I've added some comments so please check them out.

nikolamajcen · 2025-01-22T22:07:08Z

Example/MacOSExample/AppDelegate.swift

I would recommend to use buildable folders and re-arrange file structure a bit. I'm okay with you to continue using e.g. Example for iOS and Example for macOS folder naming like it was already used (but they were groups).

Additionally, try to use the same naming definition for targets; e.g. use Example-iOS and Example-macOS.

nikolamajcen · 2025-01-22T22:07:23Z

Example/MacOSExample/AppDelegate.swift

+    func applicationWillTerminate(_ aNotification: Notification) {
+        // Insert code here to tear down your application
+    }


Remove methods that are not used.

nikolamajcen · 2025-01-22T22:07:38Z

Example/MacOSExample/AppDelegate.swift

+    func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+        return true
+    }
+


Remove redundant new line.

nikolamajcen · 2025-01-22T22:10:15Z

Example/MacOSExample/ViewController.swift

+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+    }
+
+    override var representedObject: Any? {
+        didSet {
+        // Update the view, if already loaded.
+        }
+    }


Remove methods and properties which overrides are empty.

nikolamajcen · 2025-01-22T22:11:00Z

Example/Podfile

@@ -10,3 +11,9 @@ target 'Sentinel_Example' do
    inherit! :search_paths
  end
 end
+
+target 'MacOSExample' do


Update target names for both iOS and macOS - as mentioned in the previous comment.

nikolamajcen · 2025-01-22T22:14:36Z

Sentinel/Classes/Core/Internal/DeviceTool.swift

+            .init(title: "Model", value: getModelIdentifier() ?? ""),
+            .init(title: "Name", value: ProcessInfo.processInfo.hostName),
+            .init(title: "System version", value: systemVersion),
+            .init(title: "UUID", value: hardwareDeviceUUID ?? "???")
+        ])
+        #else
+        CustomInfoTool.Section(title: "Device", items: [
+            .init(title: "Model", value: UIDevice.current.model),
+            .init(title: "Name", value: UIDevice.current.name),
+            .init(title: "System version", value: systemVersion),
+            .init(title: "UUID", value: UIDevice.current.identifierForVendor?.uuidString ?? "???"),
+            .init(title: "Battery state", value: batteryState),
+            .init(title: "Proximity state", value: UIDevice.current.proximityState ? "Close" : "Far")


Replace .init methods with real class names.

Also, additionally, if the objects of the array are the same, you could instead return the array from a method instead creating the whole object inside the if-else branches. Even better approach here would be a factory method or abstract factory (due to other methods), but I believe this can be added and improved in other PRs.

nikolamajcen · 2025-01-22T22:20:20Z

Sentinel/Classes/Core/Trigger.swift


    /// The trigger type which is triggered on the specified notification name.
    public static func notification(forName name: Notification.Name) -> Trigger {
        NotificationTrigger(notificationName: name)
    }
+    #if !os(macOS)


Would it be better to use #if os(iOS)? Because with this, e.g. tvOS or watchOS in the future would support this. I know we will not add the possibility for that, but it is easier to work with constrained things than the opposite.

Also, add a note to the comment (or discussion), on which platforms are those methods available.

nikolamajcen · 2025-01-22T22:21:58Z

Sentinel/Classes/TextEditing/TextEditingToolView.swift

@@ -19,7 +19,9 @@ struct TextEditingToolView: View {

            Button(action: {
                viewModel.didPressSave(viewModel.value)
-                presentationMode.wrappedValue.dismiss()
+                #if !os(macOS)


Can we use os(iOS) here as well?

nikolamajcen · 2025-01-22T22:22:11Z

Sentinel/Classes/UserDefaults/UserDefaultsToolView.swift

                    })
                }))
                .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)

            Button(action: {
                viewModel.didPressDelete()
-                presentationMode.wrappedValue.dismiss()
+                #if !os(macOS)


Same here as well.

nikolamajcen · 2025-01-22T22:25:04Z

SwiftUIExample/SwiftUIExample/ContentView.swift

Regarding the SwiftUI example, I think this is a bit redundant in the current form. We have a new project that we need to maintain, while the implementation is different only for view part (app delegate counterpart is same).

I would rather propose to add the SwiftUI code in the existing example in one of the provided forms:

Create two screens (for iOS and macOS targets) - one with UIKit and another with SwiftUI examples (with summoning Sentinel)

Create a new target that will work on both iOS and macOS

nikolamajcen · 2025-01-22T22:31:10Z

Also, one additional note; I've seen you've done a lot of work, but you've mixed that into bigger PRs, e.g. podspec update, macOS support, preferences update. On the other PR there are multiple topics as well.

Try to separate them in future PR for easier review process and separation of concerns. The work you did is great, but this can make things easier to understand and will produce quicker review times.

ZvonimirMedak added 20 commits January 13, 2025 12:13

remove custom location from defualt podspec

84fedce

remove custom location tool from example app

b62b071

add check for platform

afd7a9e

make buildable on iOS

125dcdd

add showing on macos

5c8180e

fix font

e38a52f

add device info

8d51f8e

move navigation view

8c19f74

update to use scrollView

35acfdf

Merge branch 'feature/swiftui-support' into feature/mac-support

205a6e7

update navigation

43b2a93

update macos handling

7dda112

fix macos frame not extending

dc4cf42

make SentinelTabBarView public

ec28b22

update preferences handling and documentation

b48dc19

update toggle view

90de849

pod update

0208867

add SwiftUI example

148727d

add macos pod example

d1c4cc2

update the uuid fetching

2f37f8b

ZvonimirMedak added documentation Improvements or additions to documentation enhancement New feature or request labels Jan 20, 2025

ZvonimirMedak added this to the 2.0.0 milestone Jan 20, 2025

ZvonimirMedak requested a review from nikolamajcen January 20, 2025 15:13

ZvonimirMedak self-assigned this Jan 20, 2025

update current package

b167fd9

nikolamajcen requested changes Jan 22, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/mac support #46

Feature/mac support #46

ZvonimirMedak commented Jan 20, 2025

nikolamajcen left a comment

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen Jan 22, 2025

nikolamajcen commented Jan 22, 2025

Feature/mac support #46

Are you sure you want to change the base?

Feature/mac support #46

Conversation

ZvonimirMedak commented Jan 20, 2025

Summary

Changes

Type

Additional information

Description

Checklist

Additional notes

nikolamajcen left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nikolamajcen commented Jan 22, 2025