[2.1.1] 도서관 잔여좌석 및 실험실 위치 수정 (#220)

* [수정] v2에서 사용하는 컬러 일부 그대로 추가 * [수정] 앱 버전 및 실험실 위치 수정
ku-ring · Aug 21, 2024 · 91cf4e4 · 91cf4e4
1 parent 7094dd9
commit 91cf4e4
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 52 deletions.
diff --git a/package-kuring/Sources/UIKit/CampusUI/CampusApp.swift b/package-kuring/Sources/UIKit/CampusUI/CampusApp.swift
@@ -14,6 +14,8 @@ public struct CampusApp: View {
         secondary: Color.Kuring.caption1,
         background: Color.Kuring.bg,
         secondaryBackground: Color.Kuring.gray100,
+        gray100: Color.Kuring.gray100,
+        bg: Color.Kuring.bg,
         link: Color.Kuring.primary,
         body: .system(size: 16),
         title: .system(size: 20),

diff --git a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift
@@ -21,7 +21,7 @@ public struct SettingList: View {
                 } label: {
                     itemView("icon_bell", "공지 구독하기")
                 }
-
+                
                 HStack {
                     leadingItemView("icon_bell", "기타 알림 받기", "주요 공지사항, 앱 내 주요 사항")
 
@@ -39,28 +39,59 @@ public struct SettingList: View {
             }
             .listRowSeparator(.hidden)
             .listRowBackground(Color.Kuring.bg)
-
-          Section {
-              Button {
-                  store.send(.delegate(.showFeedback))
-              } label: {
-                  itemView("icon_feedback", "피드백 보내기")
-              }
-
-              Divider()
-                  .listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0))
-          } header: {
-              headerView("피드백")
-          }
-          .listRowSeparator(.hidden)
-          .listRowBackground(Color.Kuring.bg)
+
+            Section {
+                Button {
+                    store.send(.delegate(.showFeedback))
+                } label: {
+                    itemView("icon_feedback", "피드백 보내기")
+                }
+
+                Divider()
+                    .listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0))
+            } header: {
+                headerView("피드백")
+            }
+            .listRowSeparator(.hidden)
+            .listRowBackground(Color.Kuring.bg)
+
+            Section {
+                ZStack {
+                    NavigationLink(
+                        state: SettingsAppFeature.Path.State.appIconSelector(
+                            AppIconSelectorFeature.State()
+                        )
+                    ) {
+                        EmptyView()
+                    }
+                    .opacity(0)
+
+                    HStack(spacing: 0) {
+                        Text("앱 아이콘 바꾸기")
+                        Spacer()
+                        Text(store.state.currentAppIcon?.korValue ?? KuringIcon.kuring_app.korValue)
+                    }
+                    .font(.system(size: 16, weight: .medium))
+                    .kerning(0.15)
+                    .foregroundStyle(Color.Kuring.body)
+                }
+                .padding(.vertical, 9)
+
+                Divider()
+                    .listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0))
+            } header: {
+                headerView("쿠링 실험실")
+            }
+            .listRowSeparator(.hidden)
+            .listRowBackground(Color.Kuring.bg)
+
 
             Section {
                 HStack(spacing: 0) {
                     leadingItemView("icon_rocket", "앱 버전")
                     Spacer()
 
-                    Text("2.0.5")
+                    Text("2.1.1")
                         .font(.system(size: 16, weight: .medium))
                         .kerning(0.15)
                         .foregroundStyle(Color.Kuring.body)
@@ -71,19 +102,19 @@ public struct SettingList: View {
                 } label: {
                     itemView("icon_star", "새로운 내용")
                 }
-
+                
                 Button {
                     store.send(.delegate(.showTeam))
                 } label: {
                     itemView("icon_team", "쿠링 팀")
                 }
-
+                
                 Button {
                     store.send(.delegate(.showPrivacyPolicy))
                 } label: {
                     itemView("icon_guard", "개인정보 처리방침")
                 }
-
+                
                 Button {
                     store.send(.delegate(.showTermsOfService))
                 } label: {
@@ -101,43 +132,13 @@ public struct SettingList: View {
             } header: {
                 headerView("정보")
             } footer: {
-                Text("Designed by 김예은, 이소영.\nDeveloped by 박성수, 이건우, 최효원.\nManaged by 김병진, 조병관, 채수빈")
+                Text("Designed by 김예은, 이소영.\nDeveloped by 박성수, 이건우, 최효원.\nManaged by 채수빈")
                     .font(.footnote)
                     .foregroundStyle(Color.Kuring.caption1)
             }
             .listRowSeparator(.hidden)
             .listRowBackground(Color.Kuring.bg)
 
-            Section {
-                ZStack {
-                    NavigationLink(
-                        state: SettingsAppFeature.Path.State.appIconSelector(
-                            AppIconSelectorFeature.State()
-                        )
-                    ) {
-                        EmptyView()
-                    }
-                    .opacity(0)
-
-                    HStack(spacing: 0) {
-                        Text("앱 아이콘 바꾸기")
-                        Spacer()
-                        Text(store.state.currentAppIcon?.korValue ?? KuringIcon.kuring_app.korValue)
-                    }
-                    .font(.system(size: 16, weight: .medium))
-                    .kerning(0.15)
-                    .foregroundStyle(Color.Kuring.body)
-                }
-                .padding(.vertical, 9)
-
-                Divider()
-                    .listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0))
-            } header: {
-                headerView("쿠링 실험실")
-            }
-            .listRowSeparator(.hidden)
-            .listRowBackground(Color.Kuring.bg)
-
             Section {
                 Button {
                     store.send(.delegate(.showInstagram))
@@ -159,7 +160,7 @@ public struct SettingList: View {
         .navigationTitle("더보기")
         .navigationBarTitleDisplayMode(.inline)
     }
-
+    
     public init(store: StoreOf<SettingListFeature>) {
         self.store = store
     }