Skip to content

Commit

Permalink
Merge pull request #44 from arjunkomath/main
Browse files Browse the repository at this point in the history 
Push notification support
  • Loading branch information
@arjunkomath
arjunkomath authored Dec 26, 2023
2 parents ce25a3a + 3a9e1e7 commit 5045c43
Show file tree
Hide file tree
Showing 14 changed files with 551 additions and 21 deletions.
3 changes: 3 additions & 0 deletions ci_scripts/ci_post_clone.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

echo "$GOOGLE_SERVICE_INFO_BASE64" | base64 --decode > "$SRCROOT/netdata/GoogleService-Info.plist"
70 changes: 68 additions & 2 deletions netdata.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
5514048B25C6AF860081E4A4 /* ServerAlarms.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5508041524D05ABF002FFAA5 /* ServerAlarms.swift */; };
551420A924C3D6D200A22E9A /* Meter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 551420A824C3D6D200A22E9A /* Meter.swift */; };
55193D2A24E14D9500FE1D55 /* ReadableGuidePadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55193D2924E14D9500FE1D55 /* ReadableGuidePadding.swift */; };
5525DA1A2B395C1100F56457 /* AuthAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5525DA192B395C1100F56457 /* AuthAPI.swift */; };
5525DA1D2B395C4100F56457 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 5525DA1C2B395C4100F56457 /* Alamofire */; };
5525DA1F2B398B8E00F56457 /* UserData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5525DA1E2B398B8E00F56457 /* UserData.swift */; };
552862E524CD018B008E2B0E /* ErrorMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552862E424CD018B008E2B0E /* ErrorMessage.swift */; };
552C2C2624D6B9BB00D3DFBE /* CustomChartDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552C2C2524D6B9BB00D3DFBE /* CustomChartDetailView.swift */; };
552E19D324CDB71500CDB97F /* EditServerForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552E19D224CDB71500CDB97F /* EditServerForm.swift */; };
Expand Down Expand Up @@ -65,6 +68,11 @@
55D3077224D197A600CF076B /* AlarmsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55D3077124D197A600CF076B /* AlarmsListView.swift */; };
55D3077424D19D1E00CF076B /* AlarmListRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55D3077324D19D1E00CF076B /* AlarmListRow.swift */; };
55D82951290E2032009569BD /* AlertToast in Frameworks */ = {isa = PBXBuildFile; productRef = 55D82950290E2032009569BD /* AlertToast */; };
55E2FCCD2B370A7400AB15A2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 55E2FCCC2B370A7400AB15A2 /* GoogleService-Info.plist */; };
55E2FCD02B370ACD00AB15A2 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 55E2FCCF2B370ACD00AB15A2 /* FirebaseAuth */; };
55E2FCD22B370ACD00AB15A2 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 55E2FCD12B370ACD00AB15A2 /* FirebaseFirestore */; };
55E2FCD42B370ACD00AB15A2 /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 55E2FCD32B370ACD00AB15A2 /* FirebaseMessaging */; };
55E2FCD62B370D4B00AB15A2 /* UserService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E2FCD52B370D4B00AB15A2 /* UserService.swift */; };
55E91EBD24D99D6900218F57 /* WelcomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E91EBC24D99D6900218F57 /* WelcomeScreen.swift */; };
55EE682A24CD962100546B1A /* UserSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55EE682924CD962100546B1A /* UserSettings.swift */; };
55F1B1F12B35951200A97F3B /* SupportOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F1B1F02B35951200A97F3B /* SupportOptions.swift */; };
Expand Down Expand Up @@ -116,6 +124,8 @@
5514042425C68F510081E4A4 /* AlarmWidgetExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AlarmWidgetExtension.entitlements; sourceTree = "<group>"; };
551420A824C3D6D200A22E9A /* Meter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Meter.swift; sourceTree = "<group>"; };
55193D2924E14D9500FE1D55 /* ReadableGuidePadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadableGuidePadding.swift; sourceTree = "<group>"; };
5525DA192B395C1100F56457 /* AuthAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthAPI.swift; sourceTree = "<group>"; };
5525DA1E2B398B8E00F56457 /* UserData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserData.swift; sourceTree = "<group>"; };
552862E424CD018B008E2B0E /* ErrorMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorMessage.swift; sourceTree = "<group>"; };
552B4E7724CD16C0008B9DA6 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
552B4E7924CD16C0008B9DA6 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -159,6 +169,8 @@
55D3076E24D18F9600CF076B /* UserDefaults+Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+Color.swift"; sourceTree = "<group>"; };
55D3077124D197A600CF076B /* AlarmsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmsListView.swift; sourceTree = "<group>"; };
55D3077324D19D1E00CF076B /* AlarmListRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmListRow.swift; sourceTree = "<group>"; };
55E2FCCC2B370A7400AB15A2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
55E2FCD52B370D4B00AB15A2 /* UserService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserService.swift; sourceTree = "<group>"; };
55E91EBC24D99D6900218F57 /* WelcomeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeScreen.swift; sourceTree = "<group>"; };
55EE682924CD962100546B1A /* UserSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSettings.swift; sourceTree = "<group>"; };
55F1B1F02B35951200A97F3B /* SupportOptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportOptions.swift; sourceTree = "<group>"; };
Expand All @@ -182,6 +194,10 @@
buildActionMask = 2147483647;
files = (
55D82951290E2032009569BD /* AlertToast in Frameworks */,
55E2FCD22B370ACD00AB15A2 /* FirebaseFirestore in Frameworks */,
55E2FCD42B370ACD00AB15A2 /* FirebaseMessaging in Frameworks */,
5525DA1D2B395C4100F56457 /* Alamofire in Frameworks */,
55E2FCD02B370ACD00AB15A2 /* FirebaseAuth in Frameworks */,
55D1C53824B969AC0087F8A2 /* CloudKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -241,6 +257,7 @@
isa = PBXGroup;
children = (
55BFBA2424CC474A004461D3 /* NetdataClient.swift */,
5525DA192B395C1100F56457 /* AuthAPI.swift */,
);
path = Network;
sourceTree = "<group>";
Expand Down Expand Up @@ -282,6 +299,7 @@
children = (
558CABAE24B999F7002D115B /* ServerService.swift */,
55EE682924CD962100546B1A /* UserSettings.swift */,
55E2FCD52B370D4B00AB15A2 /* UserService.swift */,
);
path = Data;
sourceTree = "<group>";
Expand Down Expand Up @@ -328,6 +346,7 @@
55D1C50024B95E6D0087F8A2 /* netdata */ = {
isa = PBXGroup;
children = (
55E2FCCC2B370A7400AB15A2 /* GoogleService-Info.plist */,
5508041024D049B8002FFAA5 /* Core */,
55D1C53524B969A50087F8A2 /* netdata.entitlements */,
55D1C53224B9635D0087F8A2 /* Models */,
Expand Down Expand Up @@ -368,6 +387,7 @@
55BA431124C3395400599345 /* ServerData.swift */,
5508041524D05ABF002FFAA5 /* ServerAlarms.swift */,
559300E424D550A6006C6DB4 /* ServerCharts.swift */,
5525DA1E2B398B8E00F56457 /* UserData.swift */,
);
path = Models;
sourceTree = "<group>";
Expand Down Expand Up @@ -466,6 +486,10 @@
name = netdata;
packageProductDependencies = (
55D82950290E2032009569BD /* AlertToast */,
55E2FCCF2B370ACD00AB15A2 /* FirebaseAuth */,
55E2FCD12B370ACD00AB15A2 /* FirebaseFirestore */,
55E2FCD32B370ACD00AB15A2 /* FirebaseMessaging */,
5525DA1C2B395C4100F56457 /* Alamofire */,
);
productName = netdata;
productReference = 55D1C4FE24B95E6D0087F8A2 /* netdata.app */;
Expand Down Expand Up @@ -500,6 +524,8 @@
mainGroup = 55D1C4F524B95E6D0087F8A2;
packageReferences = (
55D8294F290E2032009569BD /* XCRemoteSwiftPackageReference "AlertToast" */,
55E2FCCE2B370ACD00AB15A2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
5525DA1B2B395C4100F56457 /* XCRemoteSwiftPackageReference "Alamofire" */,
);
productRefGroup = 55D1C4FF24B95E6D0087F8A2 /* Products */;
projectDirPath = "";
Expand All @@ -526,6 +552,7 @@
files = (
55D1C50924B95E6F0087F8A2 /* Preview Assets.xcassets in Resources */,
55D1C50624B95E6F0087F8A2 /* Assets.xcassets in Resources */,
55E2FCCD2B370A7400AB15A2 /* GoogleService-Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -558,13 +585,15 @@
55F1B1F12B35951200A97F3B /* SupportOptions.swift in Sources */,
5508041624D05ABF002FFAA5 /* ServerAlarms.swift in Sources */,
55096620267463F70091B8D3 /* UIColor+Random.swift in Sources */,
5525DA1F2B398B8E00F56457 /* UserData.swift in Sources */,
55FC8F6B24BAD8F100CA8751 /* ServerDetailView.swift in Sources */,
55BFBA2924CC5875004461D3 /* ServerListViewModel.swift in Sources */,
55D3077424D19D1E00CF076B /* AlarmListRow.swift in Sources */,
553DF8B12733DEA00067047A /* InfoMessage.swift in Sources */,
5548A9BC273147FD003ACBBD /* ChartView.swift in Sources */,
55A3A0EF2B368DC200E4DB07 /* ServerDetailItem.swift in Sources */,
558CABAC24B99931002D115B /* CloudModel.swift in Sources */,
55E2FCD62B370D4B00AB15A2 /* UserService.swift in Sources */,
55D3076F24D18F9600CF076B /* UserDefaults+Color.swift in Sources */,
558CABAF24B999F7002D115B /* ServerService.swift in Sources */,
55BFBA2524CC474A004461D3 /* NetdataClient.swift in Sources */,
Expand All @@ -578,6 +607,7 @@
55C638F924CBE6B800395B23 /* PercentageUsageData.swift in Sources */,
55BA431024C332C900599345 /* ServerInfo.swift in Sources */,
55A3A0ED2B367FEC00E4DB07 /* RedactedView.swift in Sources */,
5525DA1A2B395C1100F56457 /* AuthAPI.swift in Sources */,
555401A324D850D100B1B727 /* CustomTextStyle.swift in Sources */,
55C638FD24CBFBA400395B23 /* DataGrid.swift in Sources */,
559300E924D587C0006C6DB4 /* ChartListRow.swift in Sources */,
Expand Down Expand Up @@ -627,7 +657,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.11.9;
MARKETING_VERSION = 2;
PRODUCT_BUNDLE_IDENTIFIER = com.techulus.netdata.AlarmWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -655,7 +685,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.11.9;
MARKETING_VERSION = 2;
PRODUCT_BUNDLE_IDENTIFIER = com.techulus.netdata.AlarmWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -878,6 +908,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
5525DA1B2B395C4100F56457 /* XCRemoteSwiftPackageReference "Alamofire" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Alamofire/Alamofire.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 5.8.1;
};
};
55D8294F290E2032009569BD /* XCRemoteSwiftPackageReference "AlertToast" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/elai950/AlertToast.git";
Expand All @@ -886,14 +924,42 @@
minimumVersion = 1.0.0;
};
};
55E2FCCE2B370ACD00AB15A2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 10.19.1;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
5525DA1C2B395C4100F56457 /* Alamofire */ = {
isa = XCSwiftPackageProductDependency;
package = 5525DA1B2B395C4100F56457 /* XCRemoteSwiftPackageReference "Alamofire" */;
productName = Alamofire;
};
55D82950290E2032009569BD /* AlertToast */ = {
isa = XCSwiftPackageProductDependency;
package = 55D8294F290E2032009569BD /* XCRemoteSwiftPackageReference "AlertToast" */;
productName = AlertToast;
};
55E2FCCF2B370ACD00AB15A2 /* FirebaseAuth */ = {
isa = XCSwiftPackageProductDependency;
package = 55E2FCCE2B370ACD00AB15A2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAuth;
};
55E2FCD12B370ACD00AB15A2 /* FirebaseFirestore */ = {
isa = XCSwiftPackageProductDependency;
package = 55E2FCCE2B370ACD00AB15A2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFirestore;
};
55E2FCD32B370ACD00AB15A2 /* FirebaseMessaging */ = {
isa = XCSwiftPackageProductDependency;
package = 55E2FCCE2B370ACD00AB15A2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseMessaging;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 55D1C4F624B95E6D0087F8A2 /* Project object */;
Expand Down
126 changes: 126 additions & 0 deletions netdata.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
{
"pins" : [
{
"identity" : "abseil-cpp-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/abseil-cpp-binary.git",
"state" : {
"revision" : "bfc0b6f81adc06ce5121eb23f628473638d67c5c",
"version" : "1.2022062300.0"
}
},
{
"identity" : "alamofire",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Alamofire/Alamofire.git",
"state" : {
"revision" : "3dc6a42c7727c49bf26508e29b0a0b35f9c7e1ad",
"version" : "5.8.1"
}
},
{
"identity" : "alerttoast",
"kind" : "remoteSourceControl",
Expand All @@ -8,6 +26,114 @@
"revision" : "a4f4267f6454259ba4ed8f9dadb87334a789c26c",
"version" : "1.3.7"
}
},
{
"identity" : "app-check",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/app-check.git",
"state" : {
"revision" : "5746b2d35c91c50581590ed97abe4c06b5037274",
"version" : "10.18.0"
}
},
{
"identity" : "firebase-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk",
"state" : {
"revision" : "c60c958e707c50a9cf8bcb7cfd7d51c566d726c5",
"version" : "10.19.1"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "6b332152355c372ace9966d8ee76ed191f97025e",
"version" : "10.17.0"
}
},
{
"identity" : "googledatatransport",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "a732a4b47f59e4f725a2ea10f0c77e93a7131117",
"version" : "9.3.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "bc27fad73504f3d4af235de451f02ee22586ebd3",
"version" : "7.12.1"
}
},
{
"identity" : "grpc-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/grpc-binary.git",
"state" : {
"revision" : "a673bc2937fbe886dd1f99c401b01b6d977a9c98",
"version" : "1.49.1"
}
},
{
"identity" : "gtm-session-fetcher",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "115f75e43851774934d695449a4836123c3246e1",
"version" : "3.2.0"
}
},
{
"identity" : "interop-ios-for-google-sdks",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/interop-ios-for-google-sdks.git",
"state" : {
"revision" : "2d12673670417654f08f5f90fdd62926dc3a2648",
"version" : "100.0.0"
}
},
{
"identity" : "leveldb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "9d108e9112aa1d65ce508facf804674546116d9c",
"version" : "1.22.3"
}
},
{
"identity" : "nanopb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/nanopb.git",
"state" : {
"revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
"version" : "2.30909.0"
}
},
{
"identity" : "promises",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
"version" : "2.3.1"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8",
"version" : "1.25.2"
}
}
],
"version" : 2
Expand Down
25 changes: 23 additions & 2 deletions netdata.xcodeproj/xcuserdata/arjunkomath.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>AlarmWidgetExtension.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
<key>Playground (Playground) 1.xcscheme</key>
<dict>
Expand All @@ -30,6 +30,27 @@
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>Promises (Playground) 1.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>Promises (Playground) 2.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>Promises (Playground).xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>StatsExtension.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
Expand All @@ -38,7 +59,7 @@
<key>netdata.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
Expand Down
Loading

0 comments on commit 5045c43

Please sign in to comment.