Skip to content

Commit 23b9311

Browse files
committed
Move File Manager to Archive
1 parent 92dc237 commit 23b9311

6 files changed

Lines changed: 15 additions & 6 deletions

File tree

Flipper/Packages/Peripheral/Sources/RPC/Model/Storage.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public enum Element: Equatable {
1818
}
1919
}
2020
}
21-
21+
2222
public struct File: Equatable {
2323
public let name: String
2424
public let size: Int

Flipper/iOS/UI/Archive/ArchiveView.swift

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ struct ArchiveView: View {
2626
case importing(URL)
2727
case category(ArchiveItem.Kind)
2828
case categoryDeleted
29+
case fileManager
2930
}
3031

3132
var canPullToRefresh: Bool {
@@ -70,6 +71,18 @@ struct ArchiveView: View {
7071
)
7172
.padding(14)
7273

74+
NavigationLink(value: Destination.fileManager) {
75+
Card {
76+
HStack {
77+
Text("File Manager")
78+
}
79+
.frame(maxWidth: .infinity)
80+
.padding(14)
81+
}
82+
.padding(.horizontal, 14)
83+
.padding(.bottom, 14)
84+
}
85+
7386
if !favoriteItems.isEmpty {
7487
FavoritesSection(items: favoriteItems)
7588
.padding(.horizontal, 14)
@@ -134,6 +147,7 @@ struct ArchiveView: View {
134147
case .importing(let url): ImportView(url: url)
135148
case .category(let kind): CategoryView(kind: kind)
136149
case .categoryDeleted: CategoryDeletedView()
150+
case .fileManager: FileManagerView()
137151
}
138152
}
139153
}

Flipper/iOS/UI/Options/FileManager/FileManagerEditor.swift renamed to Flipper/iOS/UI/FileManager/FileManagerEditor.swift

File renamed without changes.

Flipper/iOS/UI/Options/FileManager/FileManagerListing.swift renamed to Flipper/iOS/UI/FileManager/FileManagerListing.swift

File renamed without changes.
File renamed without changes.

Flipper/iOS/UI/Options/OptionsView.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ struct OptionsView: View {
2525
case stressTest
2626
case speedTest
2727
case logs
28-
case fileManager
2928
case reportBug
3029
case infrared
3130
}
@@ -55,9 +54,6 @@ struct OptionsView: View {
5554
}
5655

5756
Section(header: Text("Remote")) {
58-
NavigationLink(value: Destination.fileManager) {
59-
Text("File Manager")
60-
}
6157
Button("Reboot Flipper") {
6258
device.reboot()
6359
}
@@ -155,7 +151,6 @@ struct OptionsView: View {
155151
case .stressTest: StressTestView()
156152
case .speedTest: SpeedTestView()
157153
case .logs: LogsView()
158-
case .fileManager: FileManagerView()
159154
case .reportBug: ReportBugView()
160155
case .infrared: InfraredDebugLayout()
161156
}

0 commit comments

Comments
 (0)