git.iko.soy/parseable-macos
on master help sign in
Fix column header drag-and-drop reordering (#41)
392b297iko
ParseableViewer.xcodeproj/project.pbxproj+1−1
compare with master
unifiedsplit
@@ -341,7 +341,7 @@
341 );
341 );
342 runOnlyForDeploymentPostprocessing = 0;
342 runOnlyForDeploymentPostprocessing = 0;
343 shellPath = /bin/sh;
343 shellPath = /bin/sh;
344− shellScript = "COMMIT_TIMESTAMP=$(TZ=UTC git log -1 --format='%cd' --date=format-local:'%Y%m%d.%H%M%S' 2>/dev/null)\nif [ -n \"$COMMIT_TIMESTAMP\" ]; then\n /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion ${COMMIT_TIMESTAMP}\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString ${COMMIT_TIMESTAMP}\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi\n";
344+ shellScript = "COMMIT_TIMESTAMP=$(TZ=UTC git log -1 --format='%cd' --date=format-local:'%Y.%m.%d.%H%M' 2>/dev/null)\nif [ -n \"$COMMIT_TIMESTAMP\" ]; then\n /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion ${COMMIT_TIMESTAMP}\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString ${COMMIT_TIMESTAMP}\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi\n";
345 };
345 };
346/* End PBXShellScriptBuildPhase section */
346/* End PBXShellScriptBuildPhase section */
347
347
ParseableViewer/Views/LogTableView.swift+14−14
@@ -358,27 +358,27 @@ struct LogHeaderView: View {
358 HStack(spacing: 0) {
358 HStack(spacing: 0) {
359 ForEach(columns, id: \.self) { column in
359 ForEach(columns, id: \.self) { column in
360 HStack(spacing: 0) {
360 HStack(spacing: 0) {
361− Button {
361+ HStack(spacing: 2) {
362+ Text(column)
363+ .font(.caption.weight(.semibold))
364+ .lineLimit(1)
365+ if sortColumn == column {
366+ Image(systemName: sortAscending ? "chevron.up" : "chevron.down")
367+ .font(.caption2)
368+ }
369+ }
370+ .padding(.horizontal, 6)
371+ .padding(.vertical, 4)
372+ .contentShape(Rectangle())
373+ .onTapGesture {
362 if sortColumn == column {
374 if sortColumn == column {
363 sortAscending.toggle()
375 sortAscending.toggle()
364 } else {
376 } else {
365 sortColumn = column
377 sortColumn = column
366 sortAscending = true
378 sortAscending = true
367 }
379 }
368− } label: {
369− HStack(spacing: 2) {
370− Text(column)
371− .font(.caption.weight(.semibold))
372− .lineLimit(1)
373− if sortColumn == column {
374− Image(systemName: sortAscending ? "chevron.up" : "chevron.down")
375− .font(.caption2)
376− }
377− }
378 }
380 }
379− .buttonStyle(.plain)
381+ .accessibilityAddTraits(.isButton)
380− .padding(.horizontal, 6)
381− .padding(.vertical, 4)
382 .accessibilityLabel(sortColumn == column
382 .accessibilityLabel(sortColumn == column
383 ? "Sort by \(column), \(sortAscending ? "ascending" : "descending")"
383 ? "Sort by \(column), \(sortAscending ? "ascending" : "descending")"
384 : "Sort by \(column)")
384 : "Sort by \(column)")