diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ee62eb..0cfa44f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,12 +19,12 @@ permissions: contents: read env: - DEVELOPER_DIR: /Applications/Xcode_15.0.app + DEVELOPER_DIR: /Applications/Xcode_15.2.app jobs: build: name: Build for ${{ matrix.project }} - runs-on: macos-13 + runs-on: macos-14 strategy: fail-fast: false matrix: @@ -32,7 +32,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build for ${{ matrix.project }} run: make build-debug-${{ matrix.project }} diff --git a/.gitignore b/.gitignore index f03551b..e5e094f 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,7 @@ iOSInjectionProject/ # Mint .mint/ + +# xcodebuild.nvim +.nvim/xcodebuild/*.log +.nvim/xcodebuild/report.json diff --git a/.nvim/xcodebuild/settings.json b/.nvim/xcodebuild/settings.json new file mode 100644 index 0000000..318aa69 --- /dev/null +++ b/.nvim/xcodebuild/settings.json @@ -0,0 +1 @@ +{"projectCommand": "-workspace '/Users/uhooi/ghq/github.com/uhooi/Loki/Loki.xcworkspace'", "deviceName": "iPhone 15 Pro Max", "productName": "Develop", "projectFile": "/Users/uhooi/ghq/github.com/uhooi/Loki/Loki.xcworkspace", "config": "Debug", "appPath": "/Users/uhooi/Library/Developer/Xcode/DerivedData/Loki-dchlwzwhdangfcbztrbvmxadmexs/Build/Products/Debug-iphonesimulator/Develop.app", "platform": "iOS Simulator", "destination": "C1DF7E9D-20A3-4544-BC85-EF6F49184399", "bundleId": "com.theuhooi.Loki-Develop", "scheme": "Develop", "os": "17.2", "lastBuildTime": 12} diff --git a/App/Develop.xcodeproj/project.pbxproj b/App/Develop.xcodeproj/project.pbxproj index 0778955..4528642 100644 --- a/App/Develop.xcodeproj/project.pbxproj +++ b/App/Develop.xcodeproj/project.pbxproj @@ -323,6 +323,7 @@ DEVELOPMENT_ASSET_PATHS = "\"Loki/Develop/Resources/Preview Content\""; DEVELOPMENT_TEAM = 47E56DYP3N; ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_CFBundleDisplayName = "Dev-Loki"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; @@ -336,7 +337,7 @@ "@executable_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.7.0; + MARKETING_VERSION = 1.8.0; PRODUCT_BUNDLE_IDENTIFIER = "com.theuhooi.Loki-Develop"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; @@ -374,7 +375,7 @@ "@executable_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.7.0; + MARKETING_VERSION = 1.8.0; PRODUCT_BUNDLE_IDENTIFIER = "com.theuhooi.Loki-Develop"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; diff --git a/App/Develop.xcodeproj/xcshareddata/xcschemes/Develop.xcscheme b/App/Develop.xcodeproj/xcshareddata/xcschemes/Develop.xcscheme new file mode 100644 index 0000000..ec6948f --- /dev/null +++ b/App/Develop.xcodeproj/xcshareddata/xcschemes/Develop.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/App/Production.xcodeproj/project.pbxproj b/App/Production.xcodeproj/project.pbxproj index d80a9b3..d6d0e31 100644 --- a/App/Production.xcodeproj/project.pbxproj +++ b/App/Production.xcodeproj/project.pbxproj @@ -317,7 +317,7 @@ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.7.0; + MARKETING_VERSION = 1.8.0; PRODUCT_BUNDLE_IDENTIFIER = com.theuhooi.Loki; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; @@ -361,7 +361,7 @@ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.7.0; + MARKETING_VERSION = 1.8.0; PRODUCT_BUNDLE_IDENTIFIER = com.theuhooi.Loki; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuInput_Japanese.png index 285898d..c5a5a1d 100644 Binary files a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuInput_Japanese.png and b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuInput_Japanese.png differ diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuList_Japanese.png index 6849624..a01b0d8 100644 Binary files a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuList_Japanese.png and b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuList_Japanese.png differ diff --git a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png index ea2b941..f1c532c 100644 Binary files a/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png and b/Docs/Screenshots/iPadPro2ndGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png differ diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuInput_Japanese.png index a769a39..277b23c 100644 Binary files a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuInput_Japanese.png and b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuInput_Japanese.png differ diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuList_Japanese.png index 5a55be9..815cdbd 100644 Binary files a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuList_Japanese.png and b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuList_Japanese.png differ diff --git a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png index c84fd66..16b8edb 100644 Binary files a/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png and b/Docs/Screenshots/iPadPro6thGen/iPadOS16_4/Light/SakatsuSettings_Japanese.png differ diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuInput_Japanese.png index 834a5f0..d013903 100644 Binary files a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuInput_Japanese.png and b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuInput_Japanese.png differ diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuList_Japanese.png index c3e15d5..de9eccc 100644 Binary files a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuList_Japanese.png and b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuList_Japanese.png differ diff --git a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png index e28d2f7..ecbb3a6 100644 Binary files a/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png and b/Docs/Screenshots/iPhone11ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuInput_English.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuInput_English.png index 2f48030..57ee124 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuInput_English.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuInput_English.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuInput_Japanese.png index e9886dd..e7235bf 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuInput_Japanese.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuInput_Japanese.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuList_English.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuList_English.png index 10929a0..fca9d63 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuList_English.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuList_English.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuList_Japanese.png index 6af385e..3428832 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuList_Japanese.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuList_Japanese.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuSettings_English.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuSettings_English.png index 17710f7..8777611 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuSettings_English.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuSettings_English.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuSettings_Japanese.png index bfd9002..edea9e0 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuSettings_Japanese.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Dark/SakatsuSettings_Japanese.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuInput_English.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuInput_English.png index a6d96e3..0b23353 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuInput_English.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuInput_English.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuInput_Japanese.png index 440adf5..6e359e9 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuInput_Japanese.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuInput_Japanese.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuList_English.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuList_English.png index 56bfdbc..4262452 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuList_English.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuList_English.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuList_Japanese.png index 44d902b..175d691 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuList_Japanese.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuList_Japanese.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuSettings_English.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuSettings_English.png index 6484912..a15cbbd 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuSettings_English.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuSettings_English.png differ diff --git a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png index 7d767cc..bf20024 100644 Binary files a/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png and b/Docs/Screenshots/iPhone14ProMax/iOS16_4/Light/SakatsuSettings_Japanese.png differ diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuInput_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuInput_Japanese.png index b1d223d..fdb3632 100644 Binary files a/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuInput_Japanese.png and b/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuInput_Japanese.png differ diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuList_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuList_Japanese.png index b681f98..58f7c79 100644 Binary files a/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuList_Japanese.png and b/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuList_Japanese.png differ diff --git a/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuSettings_Japanese.png b/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuSettings_Japanese.png index 7f3b9e4..5863252 100644 Binary files a/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuSettings_Japanese.png and b/Docs/Screenshots/iPhone8Plus/iOS16_4/Light/SakatsuSettings_Japanese.png differ diff --git a/LokiPackage/Sources/Features/Sakatsu/SakatsuList/SakatsuListScreen.swift b/LokiPackage/Sources/Features/Sakatsu/SakatsuList/SakatsuListScreen.swift index 40687c3..eda6bd9 100644 --- a/LokiPackage/Sources/Features/Sakatsu/SakatsuList/SakatsuListScreen.swift +++ b/LokiPackage/Sources/Features/Sakatsu/SakatsuList/SakatsuListScreen.swift @@ -21,11 +21,14 @@ package struct SakatsuListScreen: View { } ) .navigationTitle(String(localized: "Sakatsu list", bundle: .module)) - .searchable(text: .init(get: { - viewModel.uiState.searchText - }, set: { newValue in - viewModel.send(.onSearchTextChange(searchText: newValue)) - })) + .searchable( + text: .init(get: { + viewModel.uiState.searchText + }, set: { newValue in + viewModel.send(.onSearchTextChange(searchText: newValue)) + }), + placement: .navigationBarDrawer(displayMode: .always) + ) .sakatsuListScreenToolbar( editMode: $editMode, colorScheme: colorScheme, diff --git a/LokiPackage/Sources/Features/Settings/Resources/Localizable.xcstrings b/LokiPackage/Sources/Features/Settings/Resources/Localizable.xcstrings index 87774e6..152d4ba 100644 --- a/LokiPackage/Sources/Features/Settings/Resources/Localizable.xcstrings +++ b/LokiPackage/Sources/Features/Settings/Resources/Localizable.xcstrings @@ -1,12 +1,12 @@ { "sourceLanguage" : "ja", "strings" : { - "© 2023 THE Uhooi" : { + "© 2024 THE Uhooi" : { "localizations" : { "en" : { "stringUnit" : { "state" : "translated", - "value" : "© 2023 THE Uhooi" + "value" : "© 2024 THE Uhooi" } } } @@ -173,4 +173,4 @@ } }, "version" : "1.0" -} \ No newline at end of file +} diff --git a/LokiPackage/Sources/Features/Settings/Settings/SettingsView.swift b/LokiPackage/Sources/Features/Settings/Settings/SettingsView.swift index 4cb1513..4781723 100644 --- a/LokiPackage/Sources/Features/Settings/Settings/SettingsView.swift +++ b/LokiPackage/Sources/Features/Settings/Settings/SettingsView.swift @@ -62,7 +62,7 @@ private extension SettingsView { value: "\(Bundle.main.version) (\(Bundle.main.build))" ) } footer: { - Text("© 2023 THE Uhooi", bundle: .module) + Text("© 2024 THE Uhooi", bundle: .module) } } diff --git a/Makefile b/Makefile index 79ad4f2..1928b36 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,7 @@ develop_log_name := $(product_name)_$(develop_project_name)_Build.log TEST_SDK := iphonesimulator TEST_CONFIGURATION := Debug TEST_PLATFORM := iOS Simulator -TEST_DEVICE ?= iPhone 14 Pro Max -TEST_OS ?= 17.0 -TEST_DESTINATION := 'platform=$(TEST_PLATFORM),name=$(TEST_DEVICE),OS=$(TEST_OS)' +TEST_DESTINATION := 'generic/platform=$(TEST_PLATFORM)' # Commands MINT := mint diff --git a/README.md b/README.md index 5ac3eef..6ad786f 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Loki（ロキ）は、サ活の記録に特化したアプリです。 ### 必要条件 - macOS 13.5+ -- Xcode 15.0 (Swift 5.9) +- Xcode 15.2 (Swift 5.9.2) - Make - Mint