Removed some superfluous padding and labels from the step adjustment sheet for better usability on small screens

Author: xan-m

InfiniLink/View Components/Sheets/ArbitraryNotificationView.swift

@@ -45,8 +45,13 @@ struct ArbitraryNotificationSheet: View {
 			Divider()
 				.padding(.horizontal)
 			HStack {
+<<<<<<< HEAD
 				Text("\(NSLocalizedString("title", comment: "")): ")
 					.padding(.leading)
+=======
+				Text("Title: ")
+					.padding(.horizontal)
+>>>>>>> d1c98d0 (Removed some superfluous padding and labels from the step adjustment sheet for better usability on small screens)
 				TextField("", text: $notificationTitle)
 			}
 			Divider()

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

@@ -22,14 +22,20 @@ struct StepSettingsSheetDatePicker: View {
 	}
 
 	var body: some View {
+<<<<<<< HEAD
 		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)
+=======
+		DatePicker("Select Date", selection: $selectedDate, displayedComponents: [.date])
+			.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)
 			.textFieldStyle(.roundedBorder)
-			.padding()
+			.padding(.horizontal)
 			.keyboardType(.numberPad)
 		Button {
 			StepCountPersistenceManager().setStepCount(steps: Int(addDateValue.value)!, arbitrary: true, date: selectedDate)

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

@@ -22,10 +22,14 @@ struct StepSettingsSheetGoalChange: View {
 	}
 
 	var body: some View {
+<<<<<<< HEAD
 		Text(NSLocalizedString("change_step_count_goal", comment: ""))
 			.font(.title2)
 			.padding()
 		TextField(NSLocalizedString("enter_step_goal", comment: ""), text: $setStepGoal.value)
+=======
+		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)
 			.textFieldStyle(.roundedBorder)
 			.padding()
 			.keyboardType(.numberPad)

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

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