diff --git a/Apple/.DS_Store b/Apple/.DS_Store
new file mode 100644
index 0000000..b41887a
Binary files /dev/null and b/Apple/.DS_Store differ
diff --git a/Apple/App/App-macOS.entitlements b/Apple/App/App-macOS.entitlements
index d9849a8..a0ec729 100644
--- a/Apple/App/App-macOS.entitlements
+++ b/Apple/App/App-macOS.entitlements
@@ -5,6 +5,7 @@
com.apple.security.application-groups
$(APP_GROUP_IDENTIFIER)
+ group.ThomasStubblefield.Unifriend.onesignal
diff --git a/Apple/App/Assets.xcassets/sampleNetworkIcon.imageset/Contents.json b/Apple/App/Assets.xcassets/sampleNetworkIcon.imageset/Contents.json
new file mode 100644
index 0000000..828f857
--- /dev/null
+++ b/Apple/App/Assets.xcassets/sampleNetworkIcon.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "filename" : "sampleNetworkIcon.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/Apple/App/Assets.xcassets/sampleNetworkIcon.imageset/sampleNetworkIcon.png b/Apple/App/Assets.xcassets/sampleNetworkIcon.imageset/sampleNetworkIcon.png
new file mode 100644
index 0000000..f5caa26
Binary files /dev/null and b/Apple/App/Assets.xcassets/sampleNetworkIcon.imageset/sampleNetworkIcon.png differ
diff --git a/Apple/App/BurrowApp.swift b/Apple/App/BurrowApp.swift
index b145dea..00542b8 100644
--- a/Apple/App/BurrowApp.swift
+++ b/Apple/App/BurrowApp.swift
@@ -1,9 +1,28 @@
+//
+// burrow_barApp.swift
+// burrow-bar
+//
+// Created by Thomas Stubblefield on 4/19/23.
+//
+
import SwiftUI
+import FluidMenuBarExtra
@main
-struct BurrowApp: App {
+struct burrowBarApp: App {
+ @NSApplicationDelegateAdaptor private var appDelegate: AppDelegate
+
var body: some Scene {
- WindowGroup {
+ Settings {
+ Text("Burrow")
+ }
+ }
+}
+class AppDelegate: NSObject, NSApplicationDelegate {
+ private var menuBarExtra: FluidMenuBarExtra?
+
+ func applicationDidFinishLaunching(_ notification: Notification) {
+ self.menuBarExtra = FluidMenuBarExtra(title: "Burrow", systemImage: "network.badge.shield.half.filled") {
ContentView()
}
}
diff --git a/Apple/App/ContentView.swift b/Apple/App/ContentView.swift
index f54deab..916aac7 100644
--- a/Apple/App/ContentView.swift
+++ b/Apple/App/ContentView.swift
@@ -2,13 +2,44 @@ import SwiftUI
struct ContentView: View {
var body: some View {
- VStack {
- Image(systemName: "globe")
- .imageScale(.large)
- .foregroundColor(.accentColor)
- Text("Hello, world!")
+ VStack(alignment: .leading) {
+
+ HStack {
+
+
+ Text("Networks")
+ .font(.title3)
+ Spacer()
+ Image(systemName: "badge.plus.radiowaves.forward")
+ .symbolRenderingMode(.palette)
+ .foregroundStyle(.blue, .black)
+ .imageScale(.large) }
+ Divider()
+ VStack(alignment: .leading) {
+ Text("Your Burrows")
+ .padding(.top, 2)
+ .font(.subheadline)
+ .fontWeight(.bold)
+ HStack {
+ Image("sampleNetworkIcon")
+ .resizable()
+ .frame(width: 32, height: 32)
+ .cornerRadius(100)
+ VStack(alignment: .leading) {
+
+ Text("Penguin Pair Burrow")
+ .fontWeight(.medium)
+
+
+ Text(" Recently Validated Certificate")
+ .font(.caption2)
+ .foregroundColor(.blue)
+ }
+ }
+ }
+
}
- .padding()
+ .padding()
}
}
diff --git a/Apple/Burrow.xcodeproj/project.pbxproj b/Apple/Burrow.xcodeproj/project.pbxproj
index fa4009a..6d763d1 100644
--- a/Apple/Burrow.xcodeproj/project.pbxproj
+++ b/Apple/Burrow.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 43E50D6D29FA050600BD2280 /* FluidMenuBarExtra in Frameworks */ = {isa = PBXBuildFile; productRef = 43E50D6C29FA050600BD2280 /* FluidMenuBarExtra */; };
D020F65829E4A697002790F6 /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D020F65729E4A697002790F6 /* PacketTunnelProvider.swift */; };
D020F65D29E4A697002790F6 /* BurrowNetworkExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D020F65329E4A697002790F6 /* BurrowNetworkExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
D05B9F7629E39EEC008CB1F9 /* BurrowApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05B9F7529E39EEC008CB1F9 /* BurrowApp.swift */; };
@@ -71,6 +72,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 43E50D6D29FA050600BD2280 /* FluidMenuBarExtra in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -168,6 +170,9 @@
D020F65C29E4A697002790F6 /* PBXTargetDependency */,
);
name = Burrow;
+ packageProductDependencies = (
+ 43E50D6C29FA050600BD2280 /* FluidMenuBarExtra */,
+ );
productName = Burrow;
productReference = D05B9F7229E39EEC008CB1F9 /* Burrow.app */;
productType = "com.apple.product-type.application";
@@ -199,6 +204,9 @@
Base,
);
mainGroup = D05B9F6929E39EEC008CB1F9;
+ packageReferences = (
+ 43E50D6B29FA050600BD2280 /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */,
+ );
productRefGroup = D05B9F7329E39EEC008CB1F9 /* Products */;
projectDirPath = "";
projectRoot = "";
@@ -260,6 +268,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D020F66229E4A6E5002790F6 /* NetworkExtension.xcconfig */;
buildSettings = {
+ DEVELOPMENT_TEAM = 2H4LMN3ZLG;
};
name = Debug;
};
@@ -267,6 +276,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D020F66229E4A6E5002790F6 /* NetworkExtension.xcconfig */;
buildSettings = {
+ DEVELOPMENT_TEAM = 2H4LMN3ZLG;
};
name = Release;
};
@@ -288,6 +298,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D020F64929E4A34B002790F6 /* Burrow.xcconfig */;
buildSettings = {
+ DEVELOPMENT_TEAM = 2H4LMN3ZLG;
+ MACOSX_DEPLOYMENT_TARGET = 13.0;
};
name = Debug;
};
@@ -295,6 +307,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D020F64929E4A34B002790F6 /* Burrow.xcconfig */;
buildSettings = {
+ DEVELOPMENT_TEAM = 2H4LMN3ZLG;
+ MACOSX_DEPLOYMENT_TARGET = 13.0;
};
name = Release;
};
@@ -329,6 +343,25 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+ 43E50D6B29FA050600BD2280 /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */ = {
+ isa = XCRemoteSwiftPackageReference;
+ repositoryURL = "https://github.com/lfroms/fluid-menu-bar-extra.git";
+ requirement = {
+ branch = main;
+ kind = branch;
+ };
+ };
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+ 43E50D6C29FA050600BD2280 /* FluidMenuBarExtra */ = {
+ isa = XCSwiftPackageProductDependency;
+ package = 43E50D6B29FA050600BD2280 /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */;
+ productName = FluidMenuBarExtra;
+ };
+/* End XCSwiftPackageProductDependency section */
};
rootObject = D05B9F6A29E39EEC008CB1F9 /* Project object */;
}
diff --git a/Apple/Burrow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apple/Burrow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 0000000..569a50e
--- /dev/null
+++ b/Apple/Burrow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,14 @@
+{
+ "pins" : [
+ {
+ "identity" : "fluid-menu-bar-extra",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/lfroms/fluid-menu-bar-extra.git",
+ "state" : {
+ "branch" : "main",
+ "revision" : "b8d41bc1c2609c3943c47d00fb539de38f90b817"
+ }
+ }
+ ],
+ "version" : 2
+}