Skip to content

Commit

Permalink
Merge pull request #76 from johnchoi96/develop
Browse files Browse the repository at this point in the history 
Version 1.2
  • Loading branch information
@johnchoi96
johnchoi96 authored Jan 16, 2024
2 parents 6c2468b + 0846198 commit 6cd666d
Show file tree
Hide file tree
Showing 21 changed files with 402 additions and 82 deletions.
64 changes: 52 additions & 12 deletions JCAlerts.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
D2153F3B2B2ECDD900F405C8 /* LandingPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F3A2B2ECDD900F405C8 /* LandingPageView.swift */; };
D2153F632B30A4D300F405C8 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F622B30A4D300F405C8 /* SettingsView.swift */; };
D2153F652B30A4FE00F405C8 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F642B30A4FE00F405C8 /* ContentView.swift */; };
D2153F672B30B2DE00F405C8 /* SettingsViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F662B30B2DE00F405C8 /* SettingsViewCell.swift */; };
D2153F672B30B2DE00F405C8 /* NotificationCategorySettingsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F662B30B2DE00F405C8 /* NotificationCategorySettingsItem.swift */; };
D2153F6C2B30B57E00F405C8 /* NotificationCategoriesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F6B2B30B57E00F405C8 /* NotificationCategoriesView.swift */; };
D2153F6E2B30B58D00F405C8 /* NotificationCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F6D2B30B58D00F405C8 /* NotificationCategoryCell.swift */; };
D2153F6E2B30B58D00F405C8 /* CategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F6D2B30B58D00F405C8 /* CategoryCell.swift */; };
D2153F702B3107C100F405C8 /* UKAlertsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F6F2B3107C100F405C8 /* UKAlertsView.swift */; };
D2153F732B32665B00F405C8 /* UKNotificationDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F722B32665B00F405C8 /* UKNotificationDetailView.swift */; };
D2153F752B32A55F00F405C8 /* FCMTopicDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2153F742B32A55F00F405C8 /* FCMTopicDelegate.swift */; };
Expand All @@ -29,6 +29,9 @@
D24211B02AEB5ABF005BD72C /* NotificationSettingsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D24211AE2AEB5ABE005BD72C /* NotificationSettingsTableViewCell.swift */; };
D24211B12AEB5ABF005BD72C /* NotificationSettingsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D24211AF2AEB5ABE005BD72C /* NotificationSettingsTableViewCell.xib */; };
D24211B42AED548E005BD72C /* FCMTopicService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D24211B32AED548E005BD72C /* FCMTopicService.swift */; };
D24971442B5517D20049EAD4 /* ResourceCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D24971432B5517D20049EAD4 /* ResourceCell.swift */; };
D24971472B5662A80049EAD4 /* FirstTimeWelcomeTip.swift in Sources */ = {isa = PBXBuildFile; fileRef = D24971462B5662A80049EAD4 /* FirstTimeWelcomeTip.swift */; };
D24971492B5668860049EAD4 /* SettingsPageTip.swift in Sources */ = {isa = PBXBuildFile; fileRef = D24971482B5668860049EAD4 /* SettingsPageTip.swift */; };
D26D5F942AE757B000981481 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D26D5F932AE757B000981481 /* SettingsViewController.swift */; };
D26F6C502AD1FADF00AC1D6F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D26F6C4F2AD1FADF00AC1D6F /* AppDelegate.swift */; };
D26F6C522AD1FADF00AC1D6F /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D26F6C512AD1FADF00AC1D6F /* SceneDelegate.swift */; };
Expand Down Expand Up @@ -68,16 +71,17 @@
D2E412E42B26E2A8003EC53F /* IQKeyboardManagerSwift in Frameworks */ = {isa = PBXBuildFile; productRef = D2E412E32B26E2A8003EC53F /* IQKeyboardManagerSwift */; };
D2E412E72B26E3BD003EC53F /* NotificationCommentTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2E412E52B26E3BD003EC53F /* NotificationCommentTableViewCell.swift */; };
D2E412E82B26E3BD003EC53F /* NotificationCommentTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2E412E62B26E3BD003EC53F /* NotificationCommentTableViewCell.xib */; };
D2EA7E9D2B4E664000D4F3F9 /* CloudFirestoreDataTriggerService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EA7E9C2B4E664000D4F3F9 /* CloudFirestoreDataTriggerService.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
D20928452B2E050C00F03C19 /* Card.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Card.swift; sourceTree = "<group>"; };
D2153F3A2B2ECDD900F405C8 /* LandingPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LandingPageView.swift; sourceTree = "<group>"; };
D2153F622B30A4D300F405C8 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
D2153F642B30A4FE00F405C8 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
D2153F662B30B2DE00F405C8 /* SettingsViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewCell.swift; sourceTree = "<group>"; };
D2153F662B30B2DE00F405C8 /* NotificationCategorySettingsItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationCategorySettingsItem.swift; sourceTree = "<group>"; };
D2153F6B2B30B57E00F405C8 /* NotificationCategoriesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationCategoriesView.swift; sourceTree = "<group>"; };
D2153F6D2B30B58D00F405C8 /* NotificationCategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationCategoryCell.swift; sourceTree = "<group>"; };
D2153F6D2B30B58D00F405C8 /* CategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryCell.swift; sourceTree = "<group>"; };
D2153F6F2B3107C100F405C8 /* UKAlertsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UKAlertsView.swift; sourceTree = "<group>"; };
D2153F722B32665B00F405C8 /* UKNotificationDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UKNotificationDetailView.swift; sourceTree = "<group>"; };
D2153F742B32A55F00F405C8 /* FCMTopicDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FCMTopicDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -94,6 +98,9 @@
D24211AE2AEB5ABE005BD72C /* NotificationSettingsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSettingsTableViewCell.swift; sourceTree = "<group>"; };
D24211AF2AEB5ABE005BD72C /* NotificationSettingsTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NotificationSettingsTableViewCell.xib; sourceTree = "<group>"; };
D24211B32AED548E005BD72C /* FCMTopicService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FCMTopicService.swift; sourceTree = "<group>"; };
D24971432B5517D20049EAD4 /* ResourceCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourceCell.swift; sourceTree = "<group>"; };
D24971462B5662A80049EAD4 /* FirstTimeWelcomeTip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstTimeWelcomeTip.swift; sourceTree = "<group>"; };
D24971482B5668860049EAD4 /* SettingsPageTip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPageTip.swift; sourceTree = "<group>"; };
D26D5F932AE757B000981481 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
D26F6C4C2AD1FADF00AC1D6F /* JCAlerts.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JCAlerts.app; sourceTree = BUILT_PRODUCTS_DIR; };
D26F6C4F2AD1FADF00AC1D6F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -122,6 +129,7 @@
D2E412E02B26DF28003EC53F /* NotificationCommentsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationCommentsViewController.swift; sourceTree = "<group>"; };
D2E412E52B26E3BD003EC53F /* NotificationCommentTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationCommentTableViewCell.swift; sourceTree = "<group>"; };
D2E412E62B26E3BD003EC53F /* NotificationCommentTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NotificationCommentTableViewCell.xib; sourceTree = "<group>"; };
D2EA7E9C2B4E664000D4F3F9 /* CloudFirestoreDataTriggerService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudFirestoreDataTriggerService.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -155,6 +163,7 @@
D2153F642B30A4FE00F405C8 /* ContentView.swift */,
D2153F6A2B30B55F00F405C8 /* home */,
D2153F692B30B55500F405C8 /* settings */,
D24971452B5662930049EAD4 /* tips */,
D2153F712B3107C800F405C8 /* uikits */,
);
path = swiftuis;
Expand All @@ -163,9 +172,10 @@
D2153F682B30B32E00F405C8 /* cells */ = {
isa = PBXGroup;
children = (
D2153F662B30B2DE00F405C8 /* SettingsViewCell.swift */,
D2153F6D2B30B58D00F405C8 /* NotificationCategoryCell.swift */,
D2153F662B30B2DE00F405C8 /* NotificationCategorySettingsItem.swift */,
D2153F6D2B30B58D00F405C8 /* CategoryCell.swift */,
D21693AA2B3E63F20020BECF /* AppMetadataCell.swift */,
D24971432B5517D20049EAD4 /* ResourceCell.swift */,
);
path = cells;
sourceTree = "<group>";
Expand Down Expand Up @@ -283,10 +293,36 @@
D24211B32AED548E005BD72C /* FCMTopicService.swift */,
D2984CC92B08436A007B199C /* CloudFirestoreService.swift */,
D2E412DE2B26B7FD003EC53F /* UserSettingService.swift */,
D2EA7E9C2B4E664000D4F3F9 /* CloudFirestoreDataTriggerService.swift */,
);
path = services;
sourceTree = "<group>";
};
D24971452B5662930049EAD4 /* tips */ = {
isa = PBXGroup;
children = (
D249714A2B566A850049EAD4 /* home */,
D249714B2B566A8D0049EAD4 /* settings */,
);
path = tips;
sourceTree = "<group>";
};
D249714A2B566A850049EAD4 /* home */ = {
isa = PBXGroup;
children = (
D24971462B5662A80049EAD4 /* FirstTimeWelcomeTip.swift */,
);
path = home;
sourceTree = "<group>";
};
D249714B2B566A8D0049EAD4 /* settings */ = {
isa = PBXGroup;
children = (
D24971482B5668860049EAD4 /* SettingsPageTip.swift */,
);
path = settings;
sourceTree = "<group>";
};
D26F6C432AD1FADF00AC1D6F = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -472,13 +508,15 @@
D2153F772B32B33600F405C8 /* UIExt.swift in Sources */,
D2984CD12B084A37007B199C /* NotificationPayload.swift in Sources */,
D2984CD42B085321007B199C /* NotificationTableViewCell.swift in Sources */,
D2EA7E9D2B4E664000D4F3F9 /* CloudFirestoreDataTriggerService.swift in Sources */,
D2984CCA2B08436A007B199C /* CloudFirestoreService.swift in Sources */,
D24211B02AEB5ABF005BD72C /* NotificationSettingsTableViewCell.swift in Sources */,
D2153F3B2B2ECDD900F405C8 /* LandingPageView.swift in Sources */,
D2153F702B3107C100F405C8 /* UKAlertsView.swift in Sources */,
D2E412DD2B26B3E9003EC53F /* NotificationComment.swift in Sources */,
D26F6C502AD1FADF00AC1D6F /* AppDelegate.swift in Sources */,
D24211A12AE7589D005BD72C /* StringExt.swift in Sources */,
D24971472B5662A80049EAD4 /* FirstTimeWelcomeTip.swift in Sources */,
D2153F732B32665B00F405C8 /* UKNotificationDetailView.swift in Sources */,
D2E412E12B26DF28003EC53F /* NotificationCommentsViewController.swift in Sources */,
D24211B42AED548E005BD72C /* FCMTopicService.swift in Sources */,
Expand All @@ -489,17 +527,19 @@
D2984CC82B003333007B199C /* FCMTopic.swift in Sources */,
D2984CC22B002E9C007B199C /* PushNotificationDisplayViewController.swift in Sources */,
D2153F632B30A4D300F405C8 /* SettingsView.swift in Sources */,
D24971442B5517D20049EAD4 /* ResourceCell.swift in Sources */,
D26D5F942AE757B000981481 /* SettingsViewController.swift in Sources */,
D2153F6C2B30B57E00F405C8 /* NotificationCategoriesView.swift in Sources */,
D21693AB2B3E63F20020BECF /* AppMetadataCell.swift in Sources */,
D26F6C522AD1FADF00AC1D6F /* SceneDelegate.swift in Sources */,
D242119F2AE75893005BD72C /* Constants.swift in Sources */,
D2153F672B30B2DE00F405C8 /* SettingsViewCell.swift in Sources */,
D2153F672B30B2DE00F405C8 /* NotificationCategorySettingsItem.swift in Sources */,
D2984CD72B0854E9007B199C /* NotificationDetailViewController.swift in Sources */,
D2153F652B30A4FE00F405C8 /* ContentView.swift in Sources */,
D24971492B5668860049EAD4 /* SettingsPageTip.swift in Sources */,
D2E412E72B26E3BD003EC53F /* NotificationCommentTableViewCell.swift in Sources */,
D2153F752B32A55F00F405C8 /* FCMTopicDelegate.swift in Sources */,
D2153F6E2B30B58D00F405C8 /* NotificationCategoryCell.swift in Sources */,
D2153F6E2B30B58D00F405C8 /* CategoryCell.swift in Sources */,
D24211AD2AEB57A4005BD72C /* NotificationSettingsViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -656,7 +696,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = JCAlerts/JCAlerts.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2024011001;
CURRENT_PROJECT_VERSION = 2024011601;
DEVELOPMENT_TEAM = 2JDGUK4DRH;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = JCAlerts/Info.plist;
Expand All @@ -671,7 +711,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = io.github.johnchoi96.JCAlerts;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -689,7 +729,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = JCAlerts/JCAlerts.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2024011001;
CURRENT_PROJECT_VERSION = 2024011601;
DEVELOPMENT_TEAM = 2JDGUK4DRH;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = JCAlerts/Info.plist;
Expand All @@ -704,7 +744,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2;
PRODUCT_BUNDLE_IDENTIFIER = io.github.johnchoi96.JCAlerts;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down
77 changes: 77 additions & 0 deletions JCAlerts.xcodeproj/xcshareddata/xcschemes/JCAlerts - Prod.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D26F6C4B2AD1FADF00AC1D6F"
BuildableName = "JCAlerts.app"
BlueprintName = "JCAlerts"
ReferencedContainer = "container:JCAlerts.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D26F6C4B2AD1FADF00AC1D6F"
BuildableName = "JCAlerts.app"
BlueprintName = "JCAlerts"
ReferencedContainer = "container:JCAlerts.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D26F6C4B2AD1FADF00AC1D6F"
BuildableName = "JCAlerts.app"
BlueprintName = "JCAlerts"
ReferencedContainer = "container:JCAlerts.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
1 change: 1 addition & 0 deletions JCAlerts/controllers/NotificationDetailViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class NotificationDetailViewController: UIViewController {
messageView.text = notificationPayload.message
}
messageView.layer.cornerRadius = 15
messageView.isEditable = false
let fontSize = UserSettingService.instance.getTextViewFontSize()
messageView.font = .systemFont(ofSize: CGFloat(fontSize))
fontSizeStepper.minimumValue = 12
Expand Down
1 change: 1 addition & 0 deletions JCAlerts/controllers/PushNotificationDisplayViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class PushNotificationDisplayViewController: UIViewController {
title = "Notification Detail"
textView.text = "Loading..."
textView.layer.cornerRadius = 15
textView.isEditable = false
let fontSize = UserSettingService.instance.getTextViewFontSize()
textView.font = .systemFont(ofSize: CGFloat(fontSize))
fontSizeStepper.minimumValue = 12
Expand Down
Loading

0 comments on commit 6cd666d

Please sign in to comment.