Merge pull request #2 from wflixu/dev

feat: mvp version

Author: wflixu

.gitignore

@@ -0,0 +1,42 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.netrc
+Build/
+
+# Xcode
+*.xcworkspace
+*.xcuserstate
+*.xccheckout
+
+# Swift Package Manager
+.swiftpm/
+.build/
+
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Build artifacts
+*.o
+*.pyc
+*.so
+
+# User settings
+*.swp
+*.swo
+*~
+
+# Local development files
+local.*
+.env
+
+# Fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output

.periphery.yml

@@ -0,0 +1,4 @@
+project: iCap.xcodeproj
+retain_public: true
+schemes:
+- iCap

README.md

@@ -1,21 +1,52 @@
-[![Swift 5.9](https://img.shields.io/badge/Swift-5.9-ED523F.svg?style=flat)](https://swift.org/)
-[![SwiftUI](https://img.shields.io/badge/SwiftUI-✓-orange)](https://developer.apple.com/xcode/swiftui/)
-[![macOS 14](https://img.shields.io/badge/macOS12-Compatible-green)](https://www.apple.com/macos/monterey/)
 
-![](./iCap/Assets.xcassets/AppIcon.appiconset/AppIcon@1x.png)
+![](iCap/Assets.xcassets/AppIcon.appiconset/icon_128x128.png)
 
+# iCap - macOS Screenshot Tool
 
-# [WIP] iCap 
+[![Swift 5.9](https://img.shields.io/badge/Swift-5.10-ED523F.svg?style=flat)](https://swift.org/) [![SwiftUI](https://img.shields.io/badge/SwiftUI-✓-orange)](https://developer.apple.com/xcode/swiftui/) [![macOS 15](https://img.shields.io/badge/macOS15-Compatible-green)](https://www.apple.com/macos/monterey/)
 
-A macOS App for screenshot  using Latest Swift/SwiftUI and ScreenCapturekit. 
+[中文版](README_CN.md)
 
+A modern macOS screenshot application built with Swift 5.10, SwiftUI and ScreenCaptureKit.
 
 ## Features
 
-- [ ] keyboard shortcut to capture screenshot
-- [ ] screen area selection
-- [ ] save screenshot to local
-- [ ] border shadow effect
+- [x] Screenshot capture
+  - [x] Keyboard shortcut support
+  - [x] Screen area selection
+  - [ ] Window selection
+- [x] Image editing
+  - [ ] Basic annotations
+  - [ ] Crop and resize
+- [x] Saving options
+  - [x] Save to local
+  - [s] Copy to clipboard
+  - [x] Custom save locations
+- [x] UI Enhancements
+  - [ ] Border shadow effects
+  - [ ] Customizable UI themes
+
+## Requirements
+
+- macOS 15 or later
+- Xcode 15+
+- Swift 5.10
+
+## Installation
+
+1. Download the latest release from [Releases](https://github.com/wflixu/iCap/releases)
+2. Clone this repository
+3. Open in Xcode
+4. Build and run
+
+## Contributing
+Contributions are welcome! Please submit a pull request or open an issue for any bugs or feature requests.
+
+## Feedback & Support
+If you encounter any issues or have suggestions, please open an [issue](https://github.com/wflixu/iCap/issues) on GitHub.
+
+## License
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
 
 
 

README_CN.md

@@ -0,0 +1,46 @@
+![](iCap/Assets.xcassets/AppIcon.appiconset/icon_128x128.png)
+
+# iCap - macOS 截图工具
+
+[![Swift 5.9](https://img.shields.io/badge/Swift-5.10-ED523F.svg?style=flat)](https://swift.org/) [![SwiftUI](https://img.shields.io/badge/SwiftUI-✓-orange)](https://developer.apple.com/xcode/swiftui/) [![macOS 15](https://img.shields.io/badge/macOS15-Compatible-green)](https://www.apple.com/macos/monterey/)
+  [English Version](README.md)
+
+
+一款基于 Swift 5.10、SwiftUI 和 ScreenCaptureKit 构建的现代化 macOS 截图应用。
+
+## 功能特性
+
+- [x] 截图功能
+  - [x] 快捷键支持
+  - [x] 屏幕区域选择
+  - [ ] 窗口选择
+- [x] 图片编辑
+  - [ ] 基础标注
+  - [ ] 裁剪和调整大小
+- [x] 保存选项
+  - [x] 保存到本地
+  - [ ] 复制到剪贴板
+  - [x] 自定义保存位置
+- [x] 界面增强
+  - [ ] 边框阴影效果
+  - [ ] 可定制的UI主题
+
+## 系统要求
+
+- macOS 15 或更高版本
+- Xcode 15+
+- Swift 5.10
+
+## 安装指南
+
+1. 从[Releases](https://github.com/yourusername/iCap/releases)下载最新版本
+2. 克隆本仓库
+3. 在Xcode中打开
+4. 构建并运行
+
+## 反馈与支持
+
+如果您遇到任何问题或有建议，请在GitHub上提交 [issue](https://github.com/wflixu/iCap/issues)
+
+
+我们欢迎所有反馈来改进iCap！

iCap.xcodeproj/project.pbxproj

@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "5CF3D9802B63B25B00753013"
+                     BuildableName = "iCap.app"
+                     BlueprintName = "iCap"
+                     ReferencedContainer = "container:iCap.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -35,7 +53,7 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
+      ignoresPersistentStateOnLaunch = "YES"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
@@ -55,6 +73,7 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "YES"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -71,7 +90,25 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       revealArchiveInOrganizer = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "cd /Users/lixu/code/iCap&#10;&#10;agvtool next-version -all&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "5CF3D9802B63B25B00753013"
+                     BuildableName = "iCap.app"
+                     BlueprintName = "iCap"
+                     ReferencedContainer = "container:iCap.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
    </ArchiveAction>
 </Scheme>

iCap.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,56 @@
+//
+//  AppState.swift
+//  iCap
+//
+//  Created by 李旭 on 2025/1/17.
+//
+
+import AppKit
+import Combine
+import KeyboardShortcuts
+
+@MainActor
+class AppState: ObservableObject {
+    @AppLog(category: "AppState")
+    private var logger
+    
+    @Published
+    var isUnicornMode: Bool = false
+    // overlayer is show
+    @Published
+    var isShow: Bool = false
+    
+    init() {
+//        KeyboardShortcuts.onKeyUp(for: .startScreenShot) { [self] in
+//            print("------\(self.self)")
+//            self.takeScreenShot()
+//        }
+    }
+    
+    static var share = AppState()
+    
+    @MainActor
+    func takeScreenShot() {
+        print("takeScreenShot")
+        Task {
+            if (try? await SCContext.getScreenImage()) != nil {
+                self.logger.info("takeScreenShot success")
+            }
+        }
+    }
+
+    func setIsShow(_ isShow: Bool) {
+        self.logger.info("start show overlayer")
+        self.isShow = isShow
+    }
+    
+    func hideOverlayerWin() {
+        print("start hide overlayer")
+        self.isShow = false
+        if let window = NSApplication.shared.windows.first(where: { $0.title == "Item-0" }) {
+            window.close()
+        } else {
+            print("hide overlayer failed - window not found")
+        }
+    }
+}