refactoring

Author: nissy

.env.example

@@ -0,0 +1,35 @@
+# ModSwitchIME Environment Configuration
+# Copy this file to .envrc and customize with your values
+
+# Development Team (from Apple Developer account)
+# Find your team ID via: security find-identity -v -p codesigning
+export DEVELOPMENT_TEAM="YOUR_TEAM_ID"
+
+# Bundle Identifiers
+export PRODUCT_BUNDLE_IDENTIFIER="com.example.ModSwitchIME"
+export TEST_BUNDLE_IDENTIFIER="com.example.ModSwitchIMETests"
+
+# Code Signing
+export CODE_SIGN_IDENTITY="Apple Development"
+export INSTALLER_IDENTITY="Developer ID Installer"
+
+# Project Info
+export PROJECT_NAME="ModSwitchIME"
+export COPYRIGHT_HOLDER="Your Name"
+export COPYRIGHT_YEAR="2024"
+export AUTHOR_NAME="ModSwitchIME Team"
+export GITHUB_URL="https://github.com/YourOrg/ModSwitchIME"
+
+# Build Configuration
+export XCODE_VERSION="15.4"
+export MACOS_DEPLOYMENT_TARGET="15.0"
+
+# Version (usually from git tags)
+export VERSION="1.0.0"
+export BUILD_NUMBER="1"
+
+# Optional: Set specific Xcode version
+# export DEVELOPER_DIR="/Applications/Xcode.app/Contents/Developer"
+
+# Optional: Set custom build directory
+# export BUILD_DIR="./build"

.envrc.example

@@ -38,7 +38,7 @@ jobs:
       run: xcodebuild -version
 
     - name: Show available destinations
-      run: xcodebuild -project iemsw.xcodeproj -scheme iemsw -showdestinations
+      run: xcodebuild -project ModSwitchIME.xcodeproj -scheme ModSwitchIME -showdestinations
 
     - name: Build
       run: make build
@@ -78,8 +78,8 @@ jobs:
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: iemsw-archive
-        path: build/iemsw.xcarchive
+        name: ModSwitchIME-archive
+        path: build/ModSwitchIME.xcarchive
         retention-days: 30
 
   swift-package-manager:
@@ -127,21 +127,21 @@ jobs:
     - name: Validate project structure
       run: |
         echo "Checking required files..."
-        test -f iemsw.xcodeproj/project.pbxproj || (echo "❌ Xcode project file missing" && exit 1)
+        test -f ModSwitchIME.xcodeproj/project.pbxproj || (echo "❌ Xcode project file missing" && exit 1)
         test -f Package.swift || (echo "❌ Package.swift missing" && exit 1)
         test -f Makefile || (echo "❌ Makefile missing" && exit 1)
         test -f .swiftlint.yml || (echo "❌ SwiftLint config missing" && exit 1)
         
         echo "Checking source files..."
-        test -f iemsw/App.swift || (echo "❌ App.swift missing" && exit 1)
-        test -f iemsw/MenuBarApp.swift || (echo "❌ MenuBarApp.swift missing" && exit 1)
-        test -f iemsw/Preferences.swift || (echo "❌ Preferences.swift missing" && exit 1)
-        test -f iemsw/ImeController.swift || (echo "❌ ImeController.swift missing" && exit 1)
-        test -f iemsw/CustomIME.swift || (echo "❌ CustomIME.swift missing" && exit 1)
+        test -f ModSwitchIME/App.swift || (echo "❌ App.swift missing" && exit 1)
+        test -f ModSwitchIME/MenuBarApp.swift || (echo "❌ MenuBarApp.swift missing" && exit 1)
+        test -f ModSwitchIME/Preferences.swift || (echo "❌ Preferences.swift missing" && exit 1)
+        test -f ModSwitchIME/ImeController.swift || (echo "❌ ImeController.swift missing" && exit 1)
+        test -f ModSwitchIME/KeyMonitor.swift || (echo "❌ KeyMonitor.swift missing" && exit 1)
         
         echo "Checking test files..."
-        test -f iemswTests/ImeControllerTests.swift || (echo "❌ ImeControllerTests.swift missing" && exit 1)
-        test -f iemswTests/PreferencesTests.swift || (echo "❌ PreferencesTests.swift missing" && exit 1)
+        test -f ModSwitchIMETests/ImeControllerTests.swift || (echo "❌ ImeControllerTests.swift missing" && exit 1)
+        test -f ModSwitchIMETests/PreferencesLogicTests.swift || (echo "❌ PreferencesLogicTests.swift missing" && exit 1)
         
         echo "✅ All required files found"
     

.github/workflows/ci.yml

@@ -70,8 +70,8 @@ jobs:
     - name: Generate checksums
       run: |
         cd build
-        shasum -a 256 iemsw.dmg > iemsw.dmg.sha256
-        cat iemsw.dmg.sha256
+        shasum -a 256 ModSwitchIME.dmg > ModSwitchIME.dmg.sha256
+        cat ModSwitchIME.dmg.sha256
     
     - name: Generate release notes
       id: release_notes
@@ -97,17 +97,17 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         tag_name: ${{ github.ref }}
-        release_name: iemsw v${{ steps.get_version.outputs.VERSION }}
+        release_name: ModSwitchIME v${{ steps.get_version.outputs.VERSION }}
         body: |
-          ## iemsw v${{ steps.get_version.outputs.VERSION }}
+          ## ModSwitchIME v${{ steps.get_version.outputs.VERSION }}
           
           A macOS menu bar helper that switches between English input and native IME by pressing left/right ⌘ keys individually.
           
           ### Installation
           
-          1. Download `iemsw.dmg` from the assets below
-          2. Open the DMG file and drag iemsw.app to your Applications folder
-          3. Launch iemsw and grant accessibility permissions when prompted
+          1. Download `ModSwitchIME.dmg` from the assets below
+          2. Open the DMG file and drag ModSwitchIME.app to your Applications folder
+          3. Launch ModSwitchIME and grant accessibility permissions when prompted
           4. The app will appear in your menu bar
           
           ### Features
@@ -129,7 +129,7 @@ jobs:
           
           ### Verification
           
-          SHA256 checksum: See `iemsw.dmg.sha256` file in assets.
+          SHA256 checksum: See `ModSwitchIME.dmg.sha256` file in assets.
         draft: false
         prerelease: false
 
@@ -139,8 +139,8 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./build/iemsw.dmg
-        asset_name: iemsw.dmg
+        asset_path: ./build/ModSwitchIME.dmg
+        asset_name: ModSwitchIME.dmg
         asset_content_type: application/octet-stream
 
     - name: Upload checksum
@@ -149,8 +149,8 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./build/iemsw.dmg.sha256
-        asset_name: iemsw.dmg.sha256
+        asset_path: ./build/ModSwitchIME.dmg.sha256
+        asset_name: ModSwitchIME.dmg.sha256
         asset_content_type: text/plain
 
     - name: Cleanup keychain
@@ -172,29 +172,29 @@ jobs:
       id: get_info
       run: |
         VERSION=${GITHUB_REF#refs/tags/v}
-        DOWNLOAD_URL="https://github.com/${{ github.repository }}/releases/download/v${VERSION}/iemsw.dmg"
+        DOWNLOAD_URL="https://github.com/${{ github.repository }}/releases/download/v${VERSION}/ModSwitchIME.dmg"
         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
         echo "DOWNLOAD_URL=$DOWNLOAD_URL" >> $GITHUB_OUTPUT
     
     - name: Download and get SHA256
       run: |
-        curl -L "${{ steps.get_info.outputs.DOWNLOAD_URL }}" -o iemsw.dmg
-        SHA256=$(shasum -a 256 iemsw.dmg | cut -d' ' -f1)
+        curl -L "${{ steps.get_info.outputs.DOWNLOAD_URL }}" -o ModSwitchIME.dmg
+        SHA256=$(shasum -a 256 ModSwitchIME.dmg | cut -d' ' -f1)
         echo "SHA256=$SHA256" >> $GITHUB_ENV
     
     - name: Create Homebrew Cask PR
       uses: peter-evans/create-pull-request@v5
       with:
         token: ${{ secrets.HOMEBREW_GITHUB_TOKEN }}
         push-to-fork: ${{ github.repository_owner }}/homebrew-cask
-        branch: update-iemsw-${{ steps.get_info.outputs.VERSION }}
-        title: 'iemsw: update to ${{ steps.get_info.outputs.VERSION }}'
+        branch: update-modswitchime-${{ steps.get_info.outputs.VERSION }}
+        title: 'ModSwitchIME: update to ${{ steps.get_info.outputs.VERSION }}'
         body: |
-          Update iemsw to version ${{ steps.get_info.outputs.VERSION }}
+          Update ModSwitchIME to version ${{ steps.get_info.outputs.VERSION }}
           
           - Version: ${{ steps.get_info.outputs.VERSION }}
           - Download URL: ${{ steps.get_info.outputs.DOWNLOAD_URL }}
           - SHA256: ${{ env.SHA256 }}
           
           Generated automatically by GitHub Actions.
-        commit-message: 'iemsw: update to ${{ steps.get_info.outputs.VERSION }}'
+        commit-message: 'ModSwitchIME: update to ${{ steps.get_info.outputs.VERSION }}'

.github/workflows/release.yml

@@ -111,6 +111,10 @@ dist/
 .env.*.local
 .envrc
 
+# Generated files
+ModSwitchIME/Info.plist
+ExportOptions.plist
+
 # IDE files
 .vscode/
 .idea/
@@ -244,4 +248,7 @@ create_*.sh
 
 # Xcode workspace state
 *.xcuserstate
-UserInterfaceState.xcuserstate
+UserInterfaceState.xcuserstate
+
+# claude
+.claude/

.gitignore

@@ -1,19 +1,18 @@
-# SwiftLint Configuration for iemsw
+# SwiftLint Configuration for ModSwitchIME
 
 # Included and excluded paths
 included:
-  - iemsw
-  - iemswTests
-  - iemswUITests
+  - ModSwitchIME
+  - ModSwitchIMETests
 
 excluded:
   - build
   - DerivedData
   - .build
   - Package.swift
-  - iemsw.xcodeproj
-  - iemsw/Assets.xcassets
-  - iemsw/Preview Content
+  - ModSwitchIME.xcodeproj
+  - ModSwitchIME/Assets.xcassets
+  - ModSwitchIME/Preview Content
 
 # Rules configuration
 disabled_rules:

.swiftlint.yml

@@ -21,4 +21,4 @@
 	<key>thinning</key>
 	<string>&lt;none&gt;</string>
 </dict>
-</plist>
+</plist>