From 45eb52ca324f50cc36bdcab2c49552367798c611 Mon Sep 17 00:00:00 2001 From: xioxin Date: Tue, 31 May 2022 10:56:56 +0800 Subject: [PATCH 1/4] Fix: Unable to recall keyboard --- .github/workflows/deploy.yml | 78 +--- EhPanda.xcodeproj/project.pbxproj | 10 +- .../xcshareddata/swiftpm/Package.resolved | 422 +++++++++--------- EhPanda/App/Info.plist | 32 +- .../Search/Support/QuickSearchStore.swift | 10 - .../View/Search/Support/QuickSearchView.swift | 15 +- .../View/Setting/DataFlow/LoginStore.swift | 13 - EhPanda/View/Setting/Support/LoginView.swift | 9 +- 8 files changed, 275 insertions(+), 314 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4d0dab87..d3fdca9c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -5,25 +5,25 @@ on: - main types: [closed] env: - DEVELOPER_DIR: /Applications/Xcode_13.2.1.app - APP_VERSION: '2.4.0' + DEVELOPER_DIR: /Applications/Xcode_13.4.app + APP_VERSION: '2.4.1' SCHEME_NAME: 'EhPanda' ALTSTORE_JSON_PATH: './AltStore.json' BUILDS_PATH: '/tmp/action-builds' + PAYLOAD_PATH: '/tmp/action-builds/Payload' ASC_KEY_PATH: '/Users/runner/private_keys' FILTER_SWIFT_PATH: './actions-tool/ReleaseNotesFilter.swift' FILTER_PATH: './actions-tool/ReleaseNotesFilter' ARCHIVE_PATH: '/tmp/action-builds/EhPanda.xcarchive' IPA_OUTPUT_PATH: '/tmp/action-builds/EhPanda.ipa' - DEV_P12_PATH: '/tmp/action-builds/dev.p12' - DIS_P12_PATH: '/tmp/action-builds/dis.p12' APP_DEV_PROVISION_PATH: '/tmp/action-builds/app_dev.mobileprovision' APP_DIS_PROVISION_PATH: '/tmp/action-builds/app_dis.mobileprovision' SHARE_EXTENSION_DEV_PROVISION_PATH: '/tmp/action-builds/share_extension_dev.mobileprovision' SHARE_EXTENSION_DIS_PROVISION_PATH: '/tmp/action-builds/share_extension_dis.mobileprovision' + jobs: Deploy: - runs-on: macos-11 + runs-on: macos-12 if: github.event.pull_request.merged == true steps: - name: Checkout @@ -39,42 +39,6 @@ jobs: - name: Run tests run: xcodebuild clean test -scheme ${{ env.SCHEME_NAME }} -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' - - name: Decode certificates & provisioning profiles - run: | - mkdir $BUILDS_PATH - mkdir $ASC_KEY_PATH - echo -n ${{ secrets.DEV_P12 }} | base64 -d -o $DEV_P12_PATH - echo -n ${{ secrets.DIS_P12 }} | base64 -d -o $DIS_P12_PATH - echo -n ${{ secrets.APP_DEV_PROVISION }} | base64 -d -o $APP_DEV_PROVISION_PATH - echo -n ${{ secrets.APP_DIS_PROVISION }} | base64 -d -o $APP_DIS_PROVISION_PATH - echo -n ${{ secrets.SHARE_EXTENSION_DEV_PROVISION }} | base64 -d -o $SHARE_EXTENSION_DEV_PROVISION_PATH - echo -n ${{ secrets.SHARE_EXTENSION_DIS_PROVISION }} | base64 -d -o $SHARE_EXTENSION_DIS_PROVISION_PATH - echo -n ${{ secrets.ASC_KEY_P8 }} | base64 -d -o $ASC_KEY_PATH/AuthKey_${{ secrets.ASC_KEY_ID }}.p8 - - name: Install certificates - run: | - KEY_CHAIN=action-builds.keychain-db - P12_PASSWORD=${{ secrets.P12_PASSWORD }} - security create-keychain -p $P12_PASSWORD $KEY_CHAIN - security default-keychain -s $KEY_CHAIN - security unlock-keychain -p $P12_PASSWORD $KEY_CHAIN - security set-keychain-settings -t 3600 -u $KEY_CHAIN - security import $DEV_P12_PATH -k $KEY_CHAIN -P $P12_PASSWORD -T /usr/bin/codesign - security import $DIS_P12_PATH -k $KEY_CHAIN -P $P12_PASSWORD -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple: -s -k $P12_PASSWORD ~/Library/Keychains/$KEY_CHAIN - security list-keychains - security find-identity -p codesigning ~/Library/Keychains/$KEY_CHAIN - - name: Install provisioning profiles - run: | - mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles - app_dev_uuid=`grep UUID -A1 -a $APP_DEV_PROVISION_PATH | grep -io "[-A-F0-9]\{36\}"` - app_dis_uuid=`grep UUID -A1 -a $APP_DIS_PROVISION_PATH | grep -io "[-A-F0-9]\{36\}"` - share_extension_dev_uuid=`grep UUID -A1 -a $SHARE_EXTENSION_DEV_PROVISION_PATH | grep -io "[-A-F0-9]\{36\}"` - share_extension_dis_uuid=`grep UUID -A1 -a $SHARE_EXTENSION_DIS_PROVISION_PATH | grep -io "[-A-F0-9]\{36\}"` - cp $APP_DEV_PROVISION_PATH ~/Library/MobileDevice/Provisioning\ Profiles/$app_dev_uuid.mobileprovision - cp $APP_DIS_PROVISION_PATH ~/Library/MobileDevice/Provisioning\ Profiles/$app_dis_uuid.mobileprovision - cp $SHARE_EXTENSION_DEV_PROVISION_PATH ~/Library/MobileDevice/Provisioning\ Profiles/$share_extension_dev_uuid.mobileprovision - cp $SHARE_EXTENSION_DIS_PROVISION_PATH ~/Library/MobileDevice/Provisioning\ Profiles/$share_extension_dis_uuid.mobileprovision - ls ~/Library/MobileDevice/Provisioning\ Profiles - name: Bump version id: bump-version uses: yanamura/ios-bump-version@v1 @@ -82,10 +46,14 @@ jobs: version: ${{ env.APP_VERSION }} - name: Xcode archive run: xcodebuild archive -destination 'generic/platform=iOS' - -scheme ${{ env.SCHEME_NAME }} -archivePath ${{ env.ARCHIVE_PATH }} + -scheme ${{ env.SCHEME_NAME }} -archivePath ${{ env.ARCHIVE_PATH }} CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO CODE_SIGN_IDENTITY= CODE_SIGN_ENTITLEMENTS= GCC_OPTIMIZATION_LEVEL=s SWIFT_OPTIMIZATION_LEVEL=-O - name: Export .ipa file - run: xcodebuild -exportArchive -archivePath ${{ env.ARCHIVE_PATH }} - -exportPath ${{ env.BUILDS_PATH }} -exportOptionsPlist ./actions-tool/ExportOptions.plist + run: | + mkdir -p ${{env.PAYLOAD_PATH}} + mv ${{env.ARCHIVE_PATH}}/Products/Applications/${{env.SCHEME_NAME}}.app ${{env.PAYLOAD_PATH}}/${{env.SCHEME_NAME}}.app + pushd ${{env.BUILDS_PATH}} + zip -r ${{env.IPA_OUTPUT_PATH}} ./Payload + popd - name: Retrieve data id: retrieve-data run: | @@ -108,13 +76,13 @@ jobs: with: fail_on_unmatched_files: true files: ${{ env.IPA_OUTPUT_PATH }} - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} body: ${{ github.event.pull_request.body }} name: ${{ github.event.pull_request.title }} tag_name: 'v${{ steps.bump-version.outputs.version }}_b${{ steps.bump-version.outputs.build-number }}' - - name: Upload to ASC - run: xcrun altool --upload-app -t ios -f ${{ env.IPA_OUTPUT_PATH }} - --apiKey ${{ secrets.ASC_KEY_ID }} --apiIssuer ${{ secrets.ASC_ISSUER_ID }} + # - name: Upload to ASC + # run: xcrun altool --upload-app -t ios -f ${{ env.IPA_OUTPUT_PATH }} + # --apiKey ${{ secrets.ASC_KEY_ID }} --apiIssuer ${{ secrets.ASC_ISSUER_ID }} - name: Commit bump version run: | git add . @@ -132,11 +100,11 @@ jobs: git add . git commit -m "Update AltStore.json" git push origin HEAD - - name: Post release notes - run: | - curl https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage \ - -d parse_mode=markdown -d chat_id=${{ secrets.TELEGRAM_CHANNEL_ID }} \ - -d text='*v${{ steps.bump-version.outputs.version }}_b${{ steps.bump-version.outputs.build-number }} Release Notes:*%0A${{ github.event.pull_request.body }}' + # - name: Post release notes + # run: | + # curl https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage \ + # -d parse_mode=markdown -d chat_id=${{ secrets.TELEGRAM_CHANNEL_ID }} \ + # -d text='*v${{ steps.bump-version.outputs.version }}_b${{ steps.bump-version.outputs.build-number }} Release Notes:*%0A${{ github.event.pull_request.body }}' - curl ${{ secrets.DISCORD_WEBHOOK }} \ - -F 'payload_json={"content": "**v${{ steps.bump-version.outputs.version }}_b${{ steps.bump-version.outputs.build-number }} Release Notes:**\n${{ steps.retrieve-data.outputs.notes }}"}' + # curl ${{ secrets.DISCORD_WEBHOOK }} \ + # -F 'payload_json={"content": "**v${{ steps.bump-version.outputs.version }}_b${{ steps.bump-version.outputs.build-number }} Release Notes:**\n${{ steps.retrieve-data.outputs.notes }}"}' \ No newline at end of file diff --git a/EhPanda.xcodeproj/project.pbxproj b/EhPanda.xcodeproj/project.pbxproj index 4ead427c..4110eb55 100644 --- a/EhPanda.xcodeproj/project.pbxproj +++ b/EhPanda.xcodeproj/project.pbxproj @@ -2059,7 +2059,7 @@ CODE_SIGN_ENTITLEMENTS = EhPanda/EhPanda.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 136; + CURRENT_PROJECT_VERSION = 137; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 9SKQ7QTZ74; ENABLE_PREVIEWS = YES; @@ -2069,6 +2069,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 2.4.1; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = app.ehpanda; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2088,7 +2089,7 @@ CODE_SIGN_ENTITLEMENTS = EhPanda/EhPanda.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 136; + CURRENT_PROJECT_VERSION = 137; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 9SKQ7QTZ74; ENABLE_PREVIEWS = YES; @@ -2098,6 +2099,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 2.4.1; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = app.ehpanda; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2206,8 +2208,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Co2333/Colorful.git"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; + kind = exactVersion; + version = 1.0.1; }; }; AB17573E27678B3400FD64E2 /* XCRemoteSwiftPackageReference "UIImageColors" */ = { diff --git a/EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index c896d2fd..9e0508b0 100644 --- a/EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,214 +1,212 @@ { - "object": { - "pins": [ - { - "package": "AlertKit", - "repositoryURL": "https://github.com/EhPanda-Team/AlertKit.git", - "state": { - "branch": "custom", - "revision": "39b01c53ffadf3dab9871dd4c960cd81af5246b6", - "version": null - } - }, - { - "package": "Colorful", - "repositoryURL": "https://github.com/Co2333/Colorful.git", - "state": { - "branch": null, - "revision": "0bcf960c856d9f7cde10a0b464208585736c5e47", - "version": "1.1.0" - } - }, - { - "package": "combine-schedulers", - "repositoryURL": "https://github.com/pointfreeco/combine-schedulers", - "state": { - "branch": null, - "revision": "4cf088c29a20f52be0f2ca54992b492c54e0076b", - "version": "0.5.3" - } - }, - { - "package": "DeprecatedAPI", - "repositoryURL": "https://github.com/EhPanda-Team/DeprecatedAPI.git", - "state": { - "branch": "main", - "revision": "021e29675457a9b4b7859a46afbb5d0e37574e84", - "version": null - } - }, - { - "package": "FilePicker", - "repositoryURL": "https://github.com/markrenaud/FilePicker.git", - "state": { - "branch": null, - "revision": "720f8cb5ca0c0efc982ed381afc84ba3e8b3214e", - "version": "1.0.1" - } - }, - { - "package": "Kanna", - "repositoryURL": "https://github.com/tid-kijyun/Kanna.git", - "state": { - "branch": null, - "revision": "f9e4922223dd0d3dfbf02ca70812cf5531fc0593", - "version": "5.2.7" - } - }, - { - "package": "Kingfisher", - "repositoryURL": "https://github.com/onevcat/Kingfisher.git", - "state": { - "branch": null, - "revision": "32e4acdf6971f58f5ad552389cf2d7d016334eaf", - "version": "7.2.0" - } - }, - { - "package": "R.swift.Library", - "repositoryURL": "https://github.com/mac-cain13/R.swift.Library.git", - "state": { - "branch": null, - "revision": "8998cfe77f4fce79ee6dfab0c88a7d551659d8fb", - "version": "5.4.0" - } - }, - { - "package": "SFSafeSymbols", - "repositoryURL": "https://github.com/SFSafeSymbols/SFSafeSymbols.git", - "state": { - "branch": "stable", - "revision": "de65e5545623c32c86da259cb0987c381bc6a9e2", - "version": null - } - }, - { - "package": "swift-case-paths", - "repositoryURL": "https://github.com/pointfreeco/swift-case-paths", - "state": { - "branch": null, - "revision": "241301b67d8551c26d8f09bd2c0e52cc49f18007", - "version": "0.8.0" - } - }, - { - "package": "swift-collections", - "repositoryURL": "https://github.com/apple/swift-collections", - "state": { - "branch": null, - "revision": "48254824bb4248676bf7ce56014ff57b142b77eb", - "version": "1.0.2" - } - }, - { - "package": "swift-composable-architecture", - "repositoryURL": "https://github.com/pointfreeco/swift-composable-architecture.git", - "state": { - "branch": null, - "revision": "2828dc44f6e3f81d84bcaba72c1ab1c0121d66f6", - "version": "0.34.0" - } - }, - { - "package": "swift-custom-dump", - "repositoryURL": "https://github.com/pointfreeco/swift-custom-dump", - "state": { - "branch": null, - "revision": "51698ece74ecf31959d3fa81733f0a5363ef1b4e", - "version": "0.3.0" - } - }, - { - "package": "swift-identified-collections", - "repositoryURL": "https://github.com/pointfreeco/swift-identified-collections", - "state": { - "branch": null, - "revision": "680bf440178a78a627b1c2c64c0855f6523ad5b9", - "version": "0.3.2" - } - }, - { - "package": "SwiftCommonMark", - "repositoryURL": "https://github.com/gonzalezreal/SwiftCommonMark.git", - "state": { - "branch": null, - "revision": "ed252beaddecce28ea6363f800c773d6169011b8", - "version": "1.0.0" - } - }, - { - "package": "swiftui-navigation", - "repositoryURL": "https://github.com/pointfreeco/swiftui-navigation.git", - "state": { - "branch": null, - "revision": "2694c03284a368168b3e0b8d7ab52626802d2246", - "version": "0.1.0" - } - }, - { - "package": "SwiftUIPager", - "repositoryURL": "https://github.com/fermoya/SwiftUIPager.git", - "state": { - "branch": null, - "revision": "6e4170ef7cafd04b3d8ab8dc5b0469036b2bcd6a", - "version": "2.4.0" - } - }, - { - "package": "SwiftyBeaver", - "repositoryURL": "https://github.com/EhPanda-Team/SwiftyBeaver.git", - "state": { - "branch": "custom", - "revision": "2e8a65567ca877a7fdf6a63ab53b2c49a927af87", - "version": null - } - }, - { - "package": "SwiftyOpenCC", - "repositoryURL": "https://github.com/ddddxxx/SwiftyOpenCC.git", - "state": { - "branch": null, - "revision": "1d8105a0f7199c90af722bff62728050c858e777", - "version": "2.0.0-beta" - } - }, - { - "package": "TTProgressHUD", - "repositoryURL": "https://github.com/EhPanda-Team/TTProgressHUD.git", - "state": { - "branch": "custom", - "revision": "349b595c4f0ff86e8d3c8d65be206a02642fd525", - "version": null - } - }, - { - "package": "UIImageColors", - "repositoryURL": "https://github.com/jathu/UIImageColors.git", - "state": { - "branch": null, - "revision": "e49e6c32ea556e9fa0109dc79686bea4a10d41a2", - "version": "2.2.0" - } - }, - { - "package": "WaterfallGrid", - "repositoryURL": "https://github.com/paololeonardi/WaterfallGrid.git", - "state": { - "branch": null, - "revision": "944aa82832ed5a9eaaf50862cdd53e3c10ab55eb", - "version": "1.0.1" - } - }, - { - "package": "xctest-dynamic-overlay", - "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay", - "state": { - "branch": null, - "revision": "50a70a9d3583fe228ce672e8923010c8df2deddd", - "version": "0.2.1" - } - } - ] - }, - "version": 1 + "pins" : [ + { + "identity" : "alertkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/EhPanda-Team/AlertKit.git", + "state" : { + "branch" : "custom", + "revision" : "39b01c53ffadf3dab9871dd4c960cd81af5246b6" + } + }, + { + "identity" : "colorful", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Co2333/Colorful.git", + "state" : { + "revision" : "eb5a350aec759bd413615273cb6d64553aead4d5", + "version" : "1.0.1" + } + }, + { + "identity" : "combine-schedulers", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/combine-schedulers", + "state" : { + "revision" : "4cf088c29a20f52be0f2ca54992b492c54e0076b", + "version" : "0.5.3" + } + }, + { + "identity" : "deprecatedapi", + "kind" : "remoteSourceControl", + "location" : "https://github.com/EhPanda-Team/DeprecatedAPI.git", + "state" : { + "branch" : "main", + "revision" : "021e29675457a9b4b7859a46afbb5d0e37574e84" + } + }, + { + "identity" : "filepicker", + "kind" : "remoteSourceControl", + "location" : "https://github.com/markrenaud/FilePicker.git", + "state" : { + "revision" : "720f8cb5ca0c0efc982ed381afc84ba3e8b3214e", + "version" : "1.0.1" + } + }, + { + "identity" : "kanna", + "kind" : "remoteSourceControl", + "location" : "https://github.com/tid-kijyun/Kanna.git", + "state" : { + "revision" : "f9e4922223dd0d3dfbf02ca70812cf5531fc0593", + "version" : "5.2.7" + } + }, + { + "identity" : "kingfisher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/onevcat/Kingfisher.git", + "state" : { + "revision" : "32e4acdf6971f58f5ad552389cf2d7d016334eaf", + "version" : "7.2.0" + } + }, + { + "identity" : "r.swift.library", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mac-cain13/R.swift.Library.git", + "state" : { + "revision" : "8998cfe77f4fce79ee6dfab0c88a7d551659d8fb", + "version" : "5.4.0" + } + }, + { + "identity" : "sfsafesymbols", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SFSafeSymbols/SFSafeSymbols.git", + "state" : { + "branch" : "stable", + "revision" : "de65e5545623c32c86da259cb0987c381bc6a9e2" + } + }, + { + "identity" : "swift-case-paths", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-case-paths", + "state" : { + "revision" : "241301b67d8551c26d8f09bd2c0e52cc49f18007", + "version" : "0.8.0" + } + }, + { + "identity" : "swift-collections", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-collections", + "state" : { + "revision" : "48254824bb4248676bf7ce56014ff57b142b77eb", + "version" : "1.0.2" + } + }, + { + "identity" : "swift-composable-architecture", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-composable-architecture.git", + "state" : { + "revision" : "2828dc44f6e3f81d84bcaba72c1ab1c0121d66f6", + "version" : "0.34.0" + } + }, + { + "identity" : "swift-custom-dump", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-custom-dump", + "state" : { + "revision" : "51698ece74ecf31959d3fa81733f0a5363ef1b4e", + "version" : "0.3.0" + } + }, + { + "identity" : "swift-identified-collections", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-identified-collections", + "state" : { + "revision" : "680bf440178a78a627b1c2c64c0855f6523ad5b9", + "version" : "0.3.2" + } + }, + { + "identity" : "swiftcommonmark", + "kind" : "remoteSourceControl", + "location" : "https://github.com/gonzalezreal/SwiftCommonMark.git", + "state" : { + "revision" : "ed252beaddecce28ea6363f800c773d6169011b8", + "version" : "1.0.0" + } + }, + { + "identity" : "swiftui-navigation", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swiftui-navigation.git", + "state" : { + "revision" : "2694c03284a368168b3e0b8d7ab52626802d2246", + "version" : "0.1.0" + } + }, + { + "identity" : "swiftuipager", + "kind" : "remoteSourceControl", + "location" : "https://github.com/fermoya/SwiftUIPager.git", + "state" : { + "revision" : "6e4170ef7cafd04b3d8ab8dc5b0469036b2bcd6a", + "version" : "2.4.0" + } + }, + { + "identity" : "swiftybeaver", + "kind" : "remoteSourceControl", + "location" : "https://github.com/EhPanda-Team/SwiftyBeaver.git", + "state" : { + "branch" : "custom", + "revision" : "2e8a65567ca877a7fdf6a63ab53b2c49a927af87" + } + }, + { + "identity" : "swiftyopencc", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ddddxxx/SwiftyOpenCC.git", + "state" : { + "revision" : "1d8105a0f7199c90af722bff62728050c858e777", + "version" : "2.0.0-beta" + } + }, + { + "identity" : "ttprogresshud", + "kind" : "remoteSourceControl", + "location" : "https://github.com/EhPanda-Team/TTProgressHUD.git", + "state" : { + "branch" : "custom", + "revision" : "349b595c4f0ff86e8d3c8d65be206a02642fd525" + } + }, + { + "identity" : "uiimagecolors", + "kind" : "remoteSourceControl", + "location" : "https://github.com/jathu/UIImageColors.git", + "state" : { + "revision" : "e49e6c32ea556e9fa0109dc79686bea4a10d41a2", + "version" : "2.2.0" + } + }, + { + "identity" : "waterfallgrid", + "kind" : "remoteSourceControl", + "location" : "https://github.com/paololeonardi/WaterfallGrid.git", + "state" : { + "revision" : "944aa82832ed5a9eaaf50862cdd53e3c10ab55eb", + "version" : "1.0.1" + } + }, + { + "identity" : "xctest-dynamic-overlay", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", + "state" : { + "revision" : "50a70a9d3583fe228ce672e8923010c8df2deddd", + "version" : "0.2.1" + } + } + ], + "version" : 2 } diff --git a/EhPanda/App/Info.plist b/EhPanda/App/Info.plist index e35b503b..55cdddef 100644 --- a/EhPanda/App/Info.plist +++ b/EhPanda/App/Info.plist @@ -19,25 +19,25 @@ AppIcon_Default - AppIcon_Ukiyoe + AppIcon_Developer CFBundleIconFiles - AppIcon_Ukiyoe + AppIcon_Developer - AppIcon_Developer + AppIcon_StandWithUkraine2022 CFBundleIconFiles - AppIcon_Developer + AppIcon_StandWithUkraine2022 - AppIcon_StandWithUkraine2022 + AppIcon_Ukiyoe CFBundleIconFiles - AppIcon_StandWithUkraine2022 + AppIcon_Ukiyoe @@ -61,14 +61,6 @@ AppIcon_Default_iPad_Pro - AppIcon_Ukiyoe - - CFBundleIconFiles - - AppIcon_Ukiyoe_iPad - AppIcon_Ukiyoe_iPad_Pro - - AppIcon_Developer CFBundleIconFiles @@ -85,6 +77,14 @@ AppIcon_StandWithUkraine2022_iPad_Pro + AppIcon_Ukiyoe + + CFBundleIconFiles + + AppIcon_Ukiyoe_iPad + AppIcon_Ukiyoe_iPad_Pro + + CFBundlePrimaryIcon @@ -103,7 +103,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 2.4.0 + $(MARKETING_VERSION) CFBundleURLTypes @@ -118,7 +118,7 @@ CFBundleVersion - 136 + $(CURRENT_PROJECT_VERSION) ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/EhPanda/View/Search/Support/QuickSearchStore.swift b/EhPanda/View/Search/Support/QuickSearchStore.swift index 47d3a9fb..33de4c30 100644 --- a/EhPanda/View/Search/Support/QuickSearchStore.swift +++ b/EhPanda/View/Search/Support/QuickSearchStore.swift @@ -43,7 +43,6 @@ enum QuickSearchAction: BindableAction { case syncQuickSearchWords case toggleListEditing - case onTextFieldSubmitted case setEditingWord(QuickSearchWord) case appendWord @@ -86,15 +85,6 @@ let quickSearchReducer = Reducer some ToolbarContent { CustomToolbarItem { Button { @@ -119,7 +128,7 @@ struct QuickSearchView: View { title: R.string.localizable.quickSearchViewTitleNewWord(), word: viewStore.binding(\.$editingWord), focusedField: $focusedField, - submitAction: { viewStore.send(.onTextFieldSubmitted) }, + submitAction: onTextFieldSubmitted, confirmAction: { viewStore.send(.appendWord) viewStore.send(.setNavigation(nil)) @@ -131,7 +140,7 @@ struct QuickSearchView: View { title: R.string.localizable.quickSearchViewTitleEditWord(), word: viewStore.binding(\.$editingWord), focusedField: $focusedField, - submitAction: { viewStore.send(.onTextFieldSubmitted) }, + submitAction: onTextFieldSubmitted, confirmAction: { viewStore.send(.editWord) viewStore.send(.setNavigation(nil)) @@ -166,7 +175,7 @@ extension QuickSearchView { Form { Section(R.string.localizable.quickSearchViewTitleName()) { TextField(R.string.localizable.quickSearchViewPlaceholderOptional(), text: $word.name) - .focused(focusedField, equals: .name) + .submitLabel(.next).focused(focusedField, equals: .name) } Section(R.string.localizable.quickSearchViewTitleContent()) { TextEditor(text: $word.content) diff --git a/EhPanda/View/Setting/DataFlow/LoginStore.swift b/EhPanda/View/Setting/DataFlow/LoginStore.swift index 57ea2585..b2bd062e 100644 --- a/EhPanda/View/Setting/DataFlow/LoginStore.swift +++ b/EhPanda/View/Setting/DataFlow/LoginStore.swift @@ -38,7 +38,6 @@ struct LoginState: Equatable { enum LoginAction: BindableAction, Equatable { case binding(BindingAction) case setNavigation(LoginState.Route?) - case onTextFieldSubmitted case teardown case login @@ -59,18 +58,6 @@ let loginReducer = Reducer { state, a state.route = route return .none - case .onTextFieldSubmitted: - switch state.focusedField { - case .username: - state.focusedField = .password - case .password: - state.focusedField = nil - return .init(value: .login) - default: - break - } - return .none - case .teardown: return .cancel(id: LoginState.CancelID()) diff --git a/EhPanda/View/Setting/Support/LoginView.swift b/EhPanda/View/Setting/Support/LoginView.swift index 191627d8..f759d039 100644 --- a/EhPanda/View/Setting/Support/LoginView.swift +++ b/EhPanda/View/Setting/Support/LoginView.swift @@ -62,7 +62,14 @@ struct LoginView: View { } .autoBlur(radius: blurRadius) } - .onSubmit { viewStore.send(.onTextFieldSubmitted) } + .onSubmit { + switch focusedField { + case .username: + focusedField = .password + default: + focusedField = nil + } + } .animation(.default, value: viewStore.loginState) .toolbar(content: toolbar) .navigationTitle(R.string.localizable.loginViewTitleLogin()) From 09268faa139b17834d911ff2dd093daa60d68e94 Mon Sep 17 00:00:00 2001 From: xioxin Date: Tue, 31 May 2022 11:27:40 +0800 Subject: [PATCH 2/4] Fix: Upgrade xcode version in Workflow --- .github/workflows/deploy.yml | 14 +++++++------- .github/workflows/test.yml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d3fdca9c..48496908 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -100,11 +100,11 @@ jobs: git add . git commit -m "Update AltStore.json" git push origin HEAD - # - name: Post release notes - # run: | - # curl https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage \ - # -d parse_mode=markdown -d chat_id=${{ secrets.TELEGRAM_CHANNEL_ID }} \ - # -d text='*v${{ steps.bump-version.outputs.version }}_b${{ steps.bump-version.outputs.build-number }} Release Notes:*%0A${{ github.event.pull_request.body }}' + - name: Post release notes + run: | + curl https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage \ + -d parse_mode=markdown -d chat_id=${{ secrets.TELEGRAM_CHANNEL_ID }} \ + -d text='*v${{ steps.bump-version.outputs.version }}_b${{ steps.bump-version.outputs.build-number }} Release Notes:*%0A${{ github.event.pull_request.body }}' - # curl ${{ secrets.DISCORD_WEBHOOK }} \ - # -F 'payload_json={"content": "**v${{ steps.bump-version.outputs.version }}_b${{ steps.bump-version.outputs.build-number }} Release Notes:**\n${{ steps.retrieve-data.outputs.notes }}"}' \ No newline at end of file + curl ${{ secrets.DISCORD_WEBHOOK }} \ + -F 'payload_json={"content": "**v${{ steps.bump-version.outputs.version }}_b${{ steps.bump-version.outputs.build-number }} Release Notes:**\n${{ steps.retrieve-data.outputs.notes }}"}' \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4f0eced1..63b7d296 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,10 +2,10 @@ name: Test on: [push] env: SCHEME_NAME: 'EhPanda' - DEVELOPER_DIR: /Applications/Xcode_13.2.1.app + DEVELOPER_DIR: /Applications/Xcode_13.4.app jobs: Test: - runs-on: macos-11 + runs-on: macos-12 steps: - name: Checkout uses: actions/checkout@v2 From 44cf6a0173a1bdb71aaa7e4e8ab9a89076a5fb5e Mon Sep 17 00:00:00 2001 From: xioxin Date: Tue, 31 May 2022 14:22:45 +0800 Subject: [PATCH 3/4] Reset Info.plist project.pbxproj --- EhPanda.xcodeproj/project.pbxproj | 10 ++++------ EhPanda/App/Info.plist | 32 +++++++++++++++---------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/EhPanda.xcodeproj/project.pbxproj b/EhPanda.xcodeproj/project.pbxproj index 4110eb55..4ead427c 100644 --- a/EhPanda.xcodeproj/project.pbxproj +++ b/EhPanda.xcodeproj/project.pbxproj @@ -2059,7 +2059,7 @@ CODE_SIGN_ENTITLEMENTS = EhPanda/EhPanda.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 137; + CURRENT_PROJECT_VERSION = 136; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 9SKQ7QTZ74; ENABLE_PREVIEWS = YES; @@ -2069,7 +2069,6 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4.1; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = app.ehpanda; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2089,7 +2088,7 @@ CODE_SIGN_ENTITLEMENTS = EhPanda/EhPanda.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 137; + CURRENT_PROJECT_VERSION = 136; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 9SKQ7QTZ74; ENABLE_PREVIEWS = YES; @@ -2099,7 +2098,6 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.4.1; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = app.ehpanda; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2208,8 +2206,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Co2333/Colorful.git"; requirement = { - kind = exactVersion; - version = 1.0.1; + kind = upToNextMajorVersion; + minimumVersion = 1.0.0; }; }; AB17573E27678B3400FD64E2 /* XCRemoteSwiftPackageReference "UIImageColors" */ = { diff --git a/EhPanda/App/Info.plist b/EhPanda/App/Info.plist index 55cdddef..e35b503b 100644 --- a/EhPanda/App/Info.plist +++ b/EhPanda/App/Info.plist @@ -19,25 +19,25 @@ AppIcon_Default - AppIcon_Developer + AppIcon_Ukiyoe CFBundleIconFiles - AppIcon_Developer + AppIcon_Ukiyoe - AppIcon_StandWithUkraine2022 + AppIcon_Developer CFBundleIconFiles - AppIcon_StandWithUkraine2022 + AppIcon_Developer - AppIcon_Ukiyoe + AppIcon_StandWithUkraine2022 CFBundleIconFiles - AppIcon_Ukiyoe + AppIcon_StandWithUkraine2022 @@ -61,6 +61,14 @@ AppIcon_Default_iPad_Pro + AppIcon_Ukiyoe + + CFBundleIconFiles + + AppIcon_Ukiyoe_iPad + AppIcon_Ukiyoe_iPad_Pro + + AppIcon_Developer CFBundleIconFiles @@ -77,14 +85,6 @@ AppIcon_StandWithUkraine2022_iPad_Pro - AppIcon_Ukiyoe - - CFBundleIconFiles - - AppIcon_Ukiyoe_iPad - AppIcon_Ukiyoe_iPad_Pro - - CFBundlePrimaryIcon @@ -103,7 +103,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - $(MARKETING_VERSION) + 2.4.0 CFBundleURLTypes @@ -118,7 +118,7 @@ CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 136 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS From f90a4acf859ee5347a97acfc6848fd1f48ba31d1 Mon Sep 17 00:00:00 2001 From: xioxin Date: Tue, 31 May 2022 14:28:07 +0800 Subject: [PATCH 4/4] fix: Lock Colorful version to 1.0.1 --- EhPanda.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EhPanda.xcodeproj/project.pbxproj b/EhPanda.xcodeproj/project.pbxproj index 4ead427c..635d3476 100644 --- a/EhPanda.xcodeproj/project.pbxproj +++ b/EhPanda.xcodeproj/project.pbxproj @@ -2206,8 +2206,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Co2333/Colorful.git"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.0.0; + kind = exactVersion; + version = 1.0.1; }; }; AB17573E27678B3400FD64E2 /* XCRemoteSwiftPackageReference "UIImageColors" */ = {