cleaned up some // and unused variables.

macadmins · Aug 31, 2021 · 4dd83db · 4dd83db
1 parent 179fd77
commit 4dd83db
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/Nudge.xcodeproj/project.pbxproj b/Nudge.xcodeproj/project.pbxproj
@@ -10,6 +10,10 @@
 		035C2AEC25D8ABC400429458 /* com.github.macadmins.Nudge.json in Resources */ = {isa = PBXBuildFile; fileRef = 035C2AEB25D8ABC400429458 /* com.github.macadmins.Nudge.json */; };
 		0B0CCEDA25CE1C7C00A93D43 /* OSVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B0CCED925CE1C7C00A93D43 /* OSVersion.swift */; };
 		0BC9972C25CE2DFC0019FC8F /* OSVersionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC9972B25CE2DFC0019FC8F /* OSVersionTests.swift */; };
+		41AD2B0026DE65B1004C52B1 /* primaryQuitButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AD2AFF26DE65B1004C52B1 /* primaryQuitButton.swift */; };
+		41AD2B0226DE6947004C52B1 /* AdditionalInfoButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AD2B0126DE6947004C52B1 /* AdditionalInfoButton.swift */; };
+		41AD2B0426DE6A6B004C52B1 /* CompanyLogo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AD2B0326DE6A6B004C52B1 /* CompanyLogo.swift */; };
+		41AD2B0626DEDB61004C52B1 /* InformationButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41AD2B0526DEDB61004C52B1 /* InformationButton.swift */; };
 		5836861425DACFE90004514C /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5836861325DACFE90004514C /* Logger.swift */; };
 		5836861C25DAD01C0004514C /* SoftwareUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5836861B25DAD01C0004514C /* SoftwareUpdate.swift */; };
 		5870FF6225CFE5EC0036D203 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5870FF6425CFE5EC0036D203 /* Localizable.strings */; };
@@ -57,6 +61,10 @@
 		068D23D025DC27EA00FE05A5 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		0B0CCED925CE1C7C00A93D43 /* OSVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSVersion.swift; sourceTree = "<group>"; };
 		0BC9972B25CE2DFC0019FC8F /* OSVersionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSVersionTests.swift; sourceTree = "<group>"; };
+		41AD2AFF26DE65B1004C52B1 /* primaryQuitButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = primaryQuitButton.swift; sourceTree = "<group>"; };
+		41AD2B0126DE6947004C52B1 /* AdditionalInfoButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalInfoButton.swift; sourceTree = "<group>"; };
+		41AD2B0326DE6A6B004C52B1 /* CompanyLogo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompanyLogo.swift; sourceTree = "<group>"; };
+		41AD2B0526DEDB61004C52B1 /* InformationButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InformationButton.swift; sourceTree = "<group>"; };
 		5836861325DACFE90004514C /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
 		5836861B25DAD01C0004514C /* SoftwareUpdate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoftwareUpdate.swift; sourceTree = "<group>"; };
 		5870FF6325CFE5EC0036D203 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -126,6 +134,17 @@
 			path = "Example Assets";
 			sourceTree = "<group>";
 		};
+		41AD2AFE26DE657D004C52B1 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				41AD2AFF26DE65B1004C52B1 /* primaryQuitButton.swift */,
+				41AD2B0126DE6947004C52B1 /* AdditionalInfoButton.swift */,
+				41AD2B0326DE6A6B004C52B1 /* CompanyLogo.swift */,
+				41AD2B0526DEDB61004C52B1 /* InformationButton.swift */,
+			);
+			path = Common;
+			sourceTree = "<group>";
+		};
 		639B6B3925DF1FEB00E38EC1 /* Preferences */ = {
 			isa = PBXGroup;
 			children = (
@@ -151,6 +170,7 @@
 		639B6B5425DF374600E38EC1 /* UI */ = {
 			isa = PBXGroup;
 			children = (
+				41AD2AFE26DE657D004C52B1 /* Common */,
 				63D7D0E225C9E9A400236281 /* Main.swift */,
 				63D7D0E425C9E9A400236281 /* ContentView.swift */,
 				636B9C0126CACCAB0007BE3B /* DeferView.swift */,
@@ -384,17 +404,21 @@
 				0B0CCEDA25CE1C7C00A93D43 /* OSVersion.swift in Sources */,
 				639E198A25CD9E21008F618B /* Utils.swift in Sources */,
 				636C4B7625D4306A0004A791 /* UILogic.swift in Sources */,
+				41AD2B0026DE65B1004C52B1 /* primaryQuitButton.swift in Sources */,
 				636C4B4A25D1BECE0004A791 /* DefaultPreferencesNudge.swift in Sources */,
 				639B6B5825DF377B00E38EC1 /* DeviceInfo.swift in Sources */,
 				63D7D0E525C9E9A400236281 /* ContentView.swift in Sources */,
 				5836861425DACFE90004514C /* Logger.swift in Sources */,
+				41AD2B0426DE6A6B004C52B1 /* CompanyLogo.swift in Sources */,
+				41AD2B0626DEDB61004C52B1 /* InformationButton.swift in Sources */,
 				5836861C25DAD01C0004514C /* SoftwareUpdate.swift in Sources */,
 				63D7D12725C9F1EE00236281 /* StandardMode.swift in Sources */,
 				639B6B6E25DF3C3F00E38EC1 /* SimpleMode.swift in Sources */,
 				639E198225CD885D008F618B /* PreferencesStructure.swift in Sources */,
 				639B6B3B25DF200C00E38EC1 /* Preferences.swift in Sources */,
 				63D7D0E325C9E9A400236281 /* Main.swift in Sources */,
 				639B6B6025DF37F000E38EC1 /* ScreenShotZoom.swift in Sources */,
+				41AD2B0226DE6947004C52B1 /* AdditionalInfoButton.swift in Sources */,
 				636B9C0226CACCAB0007BE3B /* DeferView.swift in Sources */,
 				639B6BA225DF41DB00E38EC1 /* LeftSide.swift in Sources */,
 				639B6BA725DF432D00E38EC1 /* RightSide.swift in Sources */,

diff --git a/Nudge/UI/SimpleMode/SimpleMode.swift b/Nudge/UI/SimpleMode/SimpleMode.swift
@@ -14,17 +14,7 @@ struct SimpleMode: View {
     // Get the color scheme so we can dynamically change properties
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.openURL) var openURL
-
-    // State variables
-    @State var hasClickedCustomDeferralButton = false
-    @State var hasClickedSecondaryQuitButton = false
-    @State var nudgeEventDate = Date()
-    @State var nudgeCustomEventDate = Date()
-
-    // Modal view for screenshot and deferral info
-    @State var showDeviceInfo = false
-    @State var showDeferView = false
-
+
     let bottomPadding  : CGFloat = 10
     let contentWidthPadding     : CGFloat = 25
 

diff --git a/Nudge/UI/StandardMode/LeftSide.swift b/Nudge/UI/StandardMode/LeftSide.swift
@@ -22,8 +22,6 @@ struct StandardModeLeftSide: View {
 
     // Nudge UI
     var body: some View {
-        //let darkMode = colorScheme == .dark
-        //let companyLogoPath = Utils().getCompanyLogoPath(darkMode: darkMode)
         // Left side of Nudge
         VStack {
             VStack(alignment: .center, spacing: 20) {