diff --git a/.github/actions/create-tag-and-github-release/action.yml b/.github/actions/create-tag-and-github-release/action.yml deleted file mode 100644 index 21b7d34f6b..0000000000 --- a/.github/actions/create-tag-and-github-release/action.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Tag Repository and Create GitHub Release -description: Tags the repository and creates a GitHub release -inputs: - prerelease: - description: "Whether the release is a prerelease" - required: false - type: boolean - default: true - github-token: - description: "GitHub token" - required: true - type: string -outputs: - promoted-tag: - description: "Pre-release tag (x.y.z-N) that has been promoted to a release tag (x.y.z)" - value: ${{ steps.compute-tag.outputs.promoted-tag }} - tag: - description: "Tag that has been added (x.y.z-N for internal, x.y.z for public and hotfixes)" - value: ${{ steps.compute-tag.outputs.tag }} - tag-created: - description: "Whether the tag has been created" - value: ${{ steps.tag-repo.conclusion == 'success' }} -runs: - using: "composite" - steps: - - id: setup-git - shell: bash - run: | - git config --global user.name "Dax the Duck" - git config --global user.email "dax@duckduckgo.com" - - - id: compute-tag - shell: bash - run: | - version="$(cut -d ' ' -f 3 < Configuration/Version.xcconfig)" - build_number="$(cut -d ' ' -f 3 < Configuration/BuildNumber.xcconfig)" - if [[ "${{ inputs.prerelease }}" == "true" ]]; then - tag="${version}-${build_number}" - else - tag="${version}" - promoted_tag="${version}-${build_number}" - echo "promoted-tag=${promoted_tag}" >> $GITHUB_OUTPUT - fi - echo "tag=${tag}" >> $GITHUB_OUTPUT - - - id: tag-repo - shell: bash - run: | - git tag ${{ steps.compute-tag.outputs.tag }} - git push origin ${{ steps.compute-tag.outputs.tag }} - - - id: create-github-release - shell: bash - env: - GITHUB_TOKEN: ${{ inputs.github-token }} - run: | - latest_release="$(gh api /repos/${{ github.repository }}/releases/latest --jq '.tag_name')" - if [[ "${{ inputs.prerelease }}" == "true" ]]; then - gh release create ${{ steps.compute-tag.outputs.tag }} --generate-notes --prerelease --notes-start-tag ${latest_release} - else - gh release create ${{ steps.compute-tag.outputs.tag }} --generate-notes --latest --notes-start-tag ${latest_release} - fi diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig index a8461981c3..49d55eef8d 100644 --- a/Configuration/BuildNumber.xcconfig +++ b/Configuration/BuildNumber.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 267 +CURRENT_PROJECT_VERSION = 268 diff --git a/DuckDuckGo/HomePage/View/HomePageView.swift b/DuckDuckGo/HomePage/View/HomePageView.swift index d48bda0b20..9abdc56ca9 100644 --- a/DuckDuckGo/HomePage/View/HomePageView.swift +++ b/DuckDuckGo/HomePage/View/HomePageView.swift @@ -82,9 +82,16 @@ extension HomePage.Views { .animation(.easeInOut, value: settingsVisibilityModel.isSettingsVisible) if !settingsVisibilityModel.isSettingsVisible { - SettingsButtonView(isSettingsVisible: $settingsVisibilityModel.isSettingsVisible) - .padding([.bottom, .trailing], 14) - .fixedColorScheme(for: settingsModel.customBackground) + VStack { + Spacer() + HStack { + Spacer(minLength: Self.targetWidth + (geometry.size.width - Self.targetWidth)/2) + SettingsButtonView(isSettingsVisible: $settingsVisibilityModel.isSettingsVisible) + .padding([.bottom, .trailing], 14) + } + } + .frame(width: geometry.size.width, height: geometry.size.height) + .fixedColorScheme(for: settingsModel.customBackground) } } .background( diff --git a/DuckDuckGo/TabPreview/TabPreviewWindowController.swift b/DuckDuckGo/TabPreview/TabPreviewWindowController.swift index c292546db8..b6df9be63d 100644 --- a/DuckDuckGo/TabPreview/TabPreviewWindowController.swift +++ b/DuckDuckGo/TabPreview/TabPreviewWindowController.swift @@ -132,6 +132,7 @@ final class TabPreviewWindowController: NSWindowController { if delay { // Set up a new timer to hide the preview after 0.05 seconds // It makes the transition from one preview to another more fluent + hideTimer?.invalidate() hideTimer = Timer.scheduledTimer(withTimeInterval: 0.05, repeats: false) { _ in removePreview(allowQuickRedisplay: allowQuickRedisplay) }