Merge pull request #477 from DeveloperAcademy-POSTECH/Gucci/fix/476_a…

…djust_stadium_location fix: [#476] adjust stadium location
DeveloperAcademy-POSTECH · Nov 21, 2024 · d6ea09d · d6ea09d
2 parents 383e6d1 + 65073e5
commit d6ea09d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 27 deletions.
diff --git a/SoccerBeat/SoccerBeat/Sources/Features/HomeView/MainView.swift b/SoccerBeat/SoccerBeat/Sources/Features/HomeView/MainView.swift
@@ -199,31 +199,33 @@ struct MainView: View {
                             }
                             Spacer()
                             VStack(alignment: .trailing) {
-                                VStack(alignment: .leading) {
-                                    Text(currentLocation)
-                                        .font(.mainDateLocation)
-                                        .foregroundStyle(.mainDateTime)
-                                        .opacity(0.8)
-                                        .task {
-                                            if !workouts.isEmpty {
-                                                currentLocation = await workouts[0].location
-                                            }
+                                Text(currentLocation)
+                                    .font(.mainDateLocation)
+                                    .multilineTextAlignment(.trailing)
+                                    .foregroundStyle(.mainDateTime)
+                                    .opacity(0.8)
+                                    .task {
+                                        if !workouts.isEmpty {
+                                            currentLocation = await workouts[0].location
                                         }
+                                    }
+
+                                Group {
+                                    Text("경기 시간")
+                                        .lineLimit(1)
+                                        .minimumScaleFactor(0.5)
+                                        .padding(.top, 4)
                                     Group {
-                                        Text("경기 시간")
-                                            .lineLimit(1)
-                                            .minimumScaleFactor(0.5)
-                                        Group {
-                                            if !workouts.isEmpty {
-                                                Text(workouts[0].time)
-                                            } else {
-                                                Text("--:--")
-                                            }
+                                        if !workouts.isEmpty {
+                                            Text(workouts[0].time)
+                                        } else {
+                                            Text("--:--")
                                         }
                                     }
-                                    .font(.mainTime)
-                                    .foregroundStyle(.mainMatchTime)
                                 }
+                                .font(.mainTime)
+                                .foregroundStyle(.mainMatchTime)
+
                                 Spacer()
                                 if !workouts.isEmpty && !workouts[0].error {
                                     HStack {

diff --git a/SoccerBeat/SoccerBeat/Sources/Features/MatchRecords/MatchRecapView.swift b/SoccerBeat/SoccerBeat/Sources/Features/MatchRecords/MatchRecapView.swift
@@ -271,15 +271,19 @@ extension MatchListItemView {
     @ViewBuilder
     var timeAndLocation: some View {
         Group {
-            Text(workoutData.yearMonthDay.description + " - " + currentLocation)
-                .task {
-                    currentLocation = await workoutData.location
-                }
             HStack(spacing: 0) {
+                Text(workoutData.yearMonthDay.description)
                 Text("경기 시간 ")
+                    .padding(.leading)
                 Text(workoutData.time)
             }
-
+
+            Text(currentLocation)
+                .frame(alignment: .trailing)
+                .multilineTextAlignment(.trailing)
+                .task {
+                    currentLocation = await workoutData.location
+                }
         }
         .opacity(0.6)
         .font(.matchDateLocationText)
@@ -328,8 +332,7 @@ extension MatchListItemView {
 
 #Preview {
     @StateObject var workoutManager = DIContianer.makeWorkoutManager()
-    return
-    MatchRecapView(workouts: .constant(WorkoutData.exampleWorkouts))
+    return MatchRecapView(workouts: .constant(WorkoutData.exampleWorkouts))
         .environmentObject(ProfileModel(workoutManager: workoutManager))
         .environmentObject(workoutManager)
 }