Skip to content

192: Add Files to Staging #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
31aditya0193 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

192: Add Files to Staging #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion GitClient/Views/Commit/FileDiffView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ struct FileDiffView: View {
.padding(.bottom, 12)
}
} label: {
FileNameView(toFilePath: expandableFileDiff.model.toFilePath, filePathDisplay: expandableFileDiff.model.filePathDisplay)
FileNameView(
fileDiff: expandableFileDiff.model,
selectButtonImageSystemName: "plus.circle"
)
.padding(.leading, 3)
}
}
Expand Down
54 changes: 15 additions & 39 deletions GitClient/Views/Commit/FileNameView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ import SwiftUI
struct FileNameView: View {
@Environment(\.folder) private var current

var toFilePath: String
var filePathDisplay: String
var fileDiff: FileDiff
var selectButtonImageSystemName: String
var onSelectFileDiff: ((FileDiff) -> Void)?
var fileURL: URL? {
current?.appending(path: toFilePath)
current?.appending(path: fileDiff.toFilePath)
}

var body: some View {
HStack {
if let asset = Language.assetName(filePath: toFilePath) {
if let asset = Language.assetName(filePath: fileDiff.toFilePath) {
Image(asset)
.resizable()
.scaledToFit()
Expand All @@ -28,9 +29,10 @@ struct FileNameView: View {
.frame(width: 18, height: 18)
.fontWeight(.heavy)
}
Text(filePathDisplay)
Text(fileDiff.filePathDisplay)
.fontWeight(.bold)
.font(Font.system(.body, design: .default))
.help(fileDiff.header + "\n" + (fileDiff.extendedHeaderLines + fileDiff.fromFileToFileLines).joined(separator: "\n"))
Button(action: {
NSWorkspace.shared.open(fileURL!)
}) {
Expand All @@ -40,40 +42,14 @@ struct FileNameView: View {
}
.buttonStyle(.plain)
Spacer()
Button(action: {
onSelectFileDiff?(fileDiff)
}) {
Image(systemName: selectButtonImageSystemName)
.foregroundStyle(.secondary)
.help("Stage This File")
}
.buttonStyle(.plain)
}
}
}

#Preview {

FileNameView(
toFilePath: "Sources/MyFeature/File.swift",
filePathDisplay: "Sources/MyFeature/File.swift"
)
FileNameView(
toFilePath: "Sources/MyFeature/File.py",
filePathDisplay: "Sources/MyFeature/File.py"
)
FileNameView(
toFilePath: "Sources/MyFeature/File.rb",
filePathDisplay: "Sources/MyFeature/File.rb"
)
FileNameView(
toFilePath: "Sources/MyFeature/File.rs",
filePathDisplay: "Sources/MyFeature/File.rs"
)

FileNameView(
toFilePath: "Sources/MyFeature/File.js",
filePathDisplay: "Sources/MyFeature/File.js"
)

FileNameView(
toFilePath: "Sources/MyFeature/File.ml",
filePathDisplay: "Sources/MyFeature/File.ml"
)
FileNameView(
toFilePath: "Sources/MyFeature/File.pbj",
filePathDisplay: "Sources/MyFeature/File.pbj"
)
}
10 changes: 7 additions & 3 deletions GitClient/Views/Commit/StageFileDiffHeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ import SwiftUI

struct StageFileDiffHeaderView: View {
var fileDiff: FileDiff
var selectButtonImageSystemName: String
var onSelectFileDiff: ((FileDiff) -> Void)?

var body: some View {
HStack {
FileNameView(toFilePath: fileDiff.toFilePath, filePathDisplay: fileDiff.filePathDisplay)
.help(fileDiff.header + "\n" + (fileDiff.extendedHeaderLines + fileDiff.fromFileToFileLines).joined(separator: "\n"))
Spacer()
FileNameView(
fileDiff: fileDiff,
selectButtonImageSystemName: selectButtonImageSystemName,
onSelectFileDiff: onSelectFileDiff
)
}
.background(Color(NSColor.textBackgroundColor).opacity(0.98))
}
Expand Down
6 changes: 5 additions & 1 deletion GitClient/Views/Commit/StageFileDiffView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ struct StageFileDiffView: View {
}
}
} label: {
StageFileDiffHeaderView(fileDiff: fileDiff)
StageFileDiffHeaderView(
fileDiff: fileDiff,
selectButtonImageSystemName: selectButtonImageSystemName,
onSelectFileDiff: onSelectFileDiff
)
.padding(.leading, 3)
}
}
Expand Down