resolving git issue

Author: xan-m

InfiniLink.xcodeproj/project.pbxproj

@@ -760,6 +760,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -821,6 +822,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

InfiniLink/View Components/Sheets/ArbitraryNotificationView.swift

@@ -51,14 +51,22 @@ struct ArbitraryNotificationSheet: View {
 =======
 				Text("Title: ")
 					.padding(.horizontal)
+<<<<<<< HEAD
 >>>>>>> d1c98d0 (Removed some superfluous padding and labels from the step adjustment sheet for better usability on small screens)
+=======
+				Text("\(NSLocalizedString("title", comment: "")): ")
+					.padding(.leading)
+>>>>>>> d738921 (resolving git issue)
 				TextField("", text: $notificationTitle)
 			}
 			Divider()
 				.padding(.horizontal)
 			TextEditor(text: $notificationBody)
 				.padding(.horizontal)
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> d738921 (resolving git issue)
 			Button(action: {
 				UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
 				if !notificationBody.isEmpty || !notificationTitle.isEmpty {
@@ -77,8 +85,11 @@ struct ArbitraryNotificationSheet: View {
 					.padding(.horizontal, 20)
 					.padding(.bottom)
 			}
+<<<<<<< HEAD
 =======
 >>>>>>> 7869ee0 (Removed large button from send notification sheet and replaced it with a simple "send" button at the top that matches the "close" button. This should help people with smaller screens and/or accessibility tweaks)
+=======
+>>>>>>> d738921 (resolving git issue)
 		}
 	}
 }

InfiniLink/View Components/Sheets/StepsSettingsSheet/StepSettingsDatePicker.swift

@@ -22,6 +22,7 @@ struct StepSettingsSheetDatePicker: View {
 	}
 
 	var body: some View {
+<<<<<<< HEAD
 <<<<<<< HEAD
 		Text(NSLocalizedString("manually_add_step_count", comment: ""))
 			.font(.title2)
@@ -34,6 +35,19 @@ struct StepSettingsSheetDatePicker: View {
 			.padding(.horizontal)
 		TextField("Enter Number of Steps", text: $addDateValue.value)
 >>>>>>> d1c98d0 (Removed some superfluous padding and labels from the step adjustment sheet for better usability on small screens)
+=======
+		DatePicker("Select Date", selection: $selectedDate, displayedComponents: [.date])
+			.padding(.horizontal)
+		TextField("Enter Number of Steps", text: $addDateValue.value)
+=======
+		Text(NSLocalizedString("manually_add_step_count", comment: ""))
+			.font(.title2)
+			.padding()
+		DatePicker(NSLocalizedString("select_date", comment: ""), selection: $selectedDate, displayedComponents: [.date])
+			.padding()
+		TextField(NSLocalizedString("enter_number_of_steps", comment: ""), text: $addDateValue.value)
+>>>>>>> main
+>>>>>>> d738921 (resolving git issue)
 			.textFieldStyle(.roundedBorder)
 			.padding(.horizontal)
 			.keyboardType(.numberPad)

InfiniLink/View Components/Sheets/StepsSettingsSheet/StepSettingsGoalChange.swift

@@ -22,6 +22,7 @@ struct StepSettingsSheetGoalChange: View {
 	}
 
 	var body: some View {
+<<<<<<< HEAD
 <<<<<<< HEAD
 		Text(NSLocalizedString("change_step_count_goal", comment: ""))
 			.font(.title2)
@@ -30,6 +31,15 @@ struct StepSettingsSheetGoalChange: View {
 =======
 		TextField("Enter Step Goal", text: $setStepGoal.value)
 >>>>>>> d1c98d0 (Removed some superfluous padding and labels from the step adjustment sheet for better usability on small screens)
+=======
+		TextField("Enter Step Goal", text: $setStepGoal.value)
+=======
+		Text(NSLocalizedString("change_step_count_goal", comment: ""))
+			.font(.title2)
+			.padding()
+		TextField(NSLocalizedString("enter_step_goal", comment: ""), text: $setStepGoal.value)
+>>>>>>> main
+>>>>>>> d738921 (resolving git issue)
 			.textFieldStyle(.roundedBorder)
 			.padding()
 			.keyboardType(.numberPad)

InfiniLink/View Components/Sheets/StepsSettingsSheet/StepsSettingsSheet.swift

@@ -16,12 +16,20 @@ struct StepSettingsSheet: View {
 		VStack (alignment: .leading) {
 			SheetCloseButton()
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> d738921 (resolving git issue)
 			Text(NSLocalizedString("steps_settings", comment: ""))
 				.font(.largeTitle)
 				.padding()
 				.padding(.bottom, 20)
+<<<<<<< HEAD
 =======
 >>>>>>> d1c98d0 (Removed some superfluous padding and labels from the step adjustment sheet for better usability on small screens)
+=======
+>>>>>>> main
+>>>>>>> d738921 (resolving git issue)
 			Picker("", selection: $pickerState) {
 				Text(NSLocalizedString("step_goal", comment: "")).tag(0)
 				Text(NSLocalizedString("add_steps", comment: "")).tag(1)