Skip to content

Commit 46ce327

Browse files
authored
Merge pull request #74 from TaskarCenterAtUW/feature-questsList-icon-change
Feature Quests list icon change
2 parents 154376e + 71194b8 commit 46ce327

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

GoInfoGame/GoInfoGame/UI/MapViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class MapViewController: UIHostingController<MapView> {
1515

1616
// Do any additional setup after loading the view.
1717

18-
let questListButton = UIBarButtonItem(barButtonSystemItem: .search, target: self, action: #selector(questListButtonTapped))
18+
let questListButton = UIBarButtonItem(image: UIImage(systemName: "list.bullet"), style: .plain, target: self, action: #selector(questListButtonTapped))
1919

2020
let widthDemoButton = UIBarButtonItem(barButtonSystemItem: .camera, target: self, action: #selector(widthDemoButtonTapped))
2121
navigationItem.rightBarButtonItems = [questListButton, widthDemoButton]

GoInfoGame/GoInfoGame/UI/QuestsList/QuestsListUIView.swift

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,42 @@
88
import SwiftUI
99

1010
struct QuestsListUIView : View {
11-
let items: [ DisplayUnit] = QuestsRepository.shared.displayQuests
11+
let items: [DisplayUnit] = QuestsRepository.shared.displayQuests
1212
@State var selectedQuest: DisplayUnit?
13+
1314
var body: some View {
14-
List{
15-
ForEach(items) { item in
16-
Text(item.title)
17-
.onTapGesture {
18-
selectedQuest = item
19-
}
15+
List {
16+
Section(header: Text("Quests Explorer")) {
17+
ForEach(items) { item in
18+
Text(item.title)
19+
.onTapGesture {
20+
selectedQuest = item
21+
}
22+
}
2023
}
21-
} .sheet(item: $selectedQuest) { selectedQuest in
22-
24+
}
25+
.sheet(item: $selectedQuest) { selectedQuest in
2326
if #available(iOS 16.0, *) {
2427
selectedQuest.parent?.form.presentationDetents(getSheetSize(sheetSize: selectedQuest.sheetSize ?? .MEDIUM))
2528
} else {
2629
// Nothing here
2730
}
28-
2931
}
3032
}
3133
}
32-
@available(iOS 16.0, *)
33-
func getSheetSize(sheetSize: SheetSize) -> Set<PresentationDetent> {
34-
if sheetSize == .SMALL {
35-
return [.height(250)]
36-
} else if sheetSize == .LARGE {
37-
return [.height(600)]
38-
} else if sheetSize == .XLARGE {
39-
return [.height(800)]
40-
}else {
41-
return [.medium, .large]
42-
}
34+
35+
@available(iOS 16.0, *)
36+
func getSheetSize(sheetSize: SheetSize) -> Set<PresentationDetent> {
37+
if sheetSize == .SMALL {
38+
return [.height(250)]
39+
} else if sheetSize == .LARGE {
40+
return [.height(600)]
41+
} else if sheetSize == .XLARGE {
42+
return [.height(800)]
43+
} else {
44+
return [.medium, .large]
4345
}
46+
}
4447
//}
4548

4649
#Preview {

0 commit comments

Comments
 (0)