Skip to content

Commit

Permalink
Merge branch 'main' into PM-14800/impl-cxp-import-flow
Browse files Browse the repository at this point in the history
  • Loading branch information
fedemkr committed Dec 20, 2024
2 parents 9c871ec + 92d101f commit 6a53202
Show file tree
Hide file tree
Showing 343 changed files with 703 additions and 405 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
echo "version_number=$(echo $content | jq -r .version_number)" >> $GITHUB_OUTPUT
- name: Upload version info artifact
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
name: version-info
path: version-info/version_info.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
echo '```' >> $GITHUB_STEP_SUMMARY
- name: Upload version info artifact
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
name: version-info
path: version_info.json
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
- name: Upload version info artifact
if: ${{ inputs.upload_version_info }}
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
name: version-info
path: version-info/version_info.json
Expand All @@ -157,7 +157,7 @@ jobs:

- name: Cache Mint packages
id: mint-cache
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: .mint
key: ${{ runner.os }}-mint-${{ hashFiles('**/Mintfile') }}
Expand Down Expand Up @@ -327,7 +327,7 @@ jobs:
- name: Configure Ruby
if: env._BUILD_MODE == 'Device'
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
with:
bundler-cache: true

Expand Down Expand Up @@ -385,7 +385,7 @@ jobs:
esac
- name: Upload artifacts to GitHub
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
name: Bitwarden iOS ${{ steps.version_info.outputs.version_name }} (${{ steps.version_info.outputs.version_number }}) ${{ env._BUILD_VARIANT }} ${{ env._XCODE_VERSION || env.DEFAULT_XCODE_VERSION }} ${{ env._BUILD_MODE }} ${{ env._COMPILER_FLAGS }}
path: export
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
private-key: ${{ secrets.BW_GHAPP_KEY }}

- name: Download translations
uses: crowdin/github-action@2d540f18b0a416b1fbf2ee5be35841bd380fc1da # v2.3.0
uses: crowdin/github-action@8dfaf9c206381653e3767e3cb5ea5f08b45f02bf # v2.5.0
env:
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
secrets: "crowdin-api-token"

- name: Upload sources
uses: crowdin/github-action@2d540f18b0a416b1fbf2ee5be35841bd380fc1da # v2.3.0
uses: crowdin/github-action@8dfaf9c206381653e3767e3cb5ea5f08b45f02bf # v2.5.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

steps:
- name: Check out repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}

- name: Scan with Checkmarx
uses: checkmarx/ast-github-action@03a90e7253dadd7e2fff55f5dfbce647b39040a1 # 2.0.37
uses: checkmarx/ast-github-action@629a9fac14369bf2898d583b22bf8c40a5caf8e9 # 2.0.40
env:
INCREMENTAL: "${{ contains(github.event_name, 'pull_request') && '--sast-incremental' || '' }}"
with:
Expand All @@ -46,7 +46,7 @@ jobs:
--output-path . ${{ env.INCREMENTAL }}
- name: Upload Checkmarx results to GitHub
uses: github/codeql-action/upload-sarif@9278e421667d5d90a2839487a482448c4ec7df4d # v3.27.2
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
with:
sarif_file: cx_result.sarif

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,20 @@ jobs:
xcode-version: ${{ env.XCODE_VERSION || env.DEFAULT_XCODE_VERSION }}

- name: Configure Ruby
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
with:
bundler-cache: true

- name: Cache Mint packages
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: .mint
key: ${{ runner.os }}-mint-${{ hashFiles('**/Mintfile') }}
restore-keys: |
${{ runner.os }}-mint-
- name: Cache SPM packages
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: build/DerivedData/SourcePackages
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ struct SelfHostedView: View {
text: store.binding(
get: \.serverUrl,
send: SelfHostedAction.serverUrlChanged
),
placeholder: "ex. https://bitwarden.company.com"
)
)
.accessibilityIdentifier("ServerUrlEntry")
.autocorrectionDisabled()
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions BitwardenShared/UI/Auth/Login/LoginView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct LoginView: View {
} label: {
HStack(spacing: 8) {
Image(decorative: Asset.Images.mobile16)
.imageStyle(.accessoryIcon(scaleWithFont: true))
.imageStyle(.accessoryIcon16(scaleWithFont: true))
Text(Localizations.logInWithDevice)
}
}
Expand All @@ -105,7 +105,7 @@ struct LoginView: View {
} label: {
HStack(spacing: 8) {
Image(decorative: Asset.Images.provider16)
.imageStyle(.accessoryIcon(scaleWithFont: true))
.imageStyle(.accessoryIcon16(scaleWithFont: true))
Text(Localizations.logInSso)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ struct ProfileSwitcherRow: View {
.accessibilityLabel(Localizations.account)
case .addAccount:
Asset.Images.plus16.swiftUIImage
.imageStyle(.accessoryIcon(color: Asset.Colors.iconSecondary.swiftUIColor))
.imageStyle(.accessoryIcon16(color: Asset.Colors.iconSecondary.swiftUIColor))
.padding(4)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,16 @@ extension ImageStyle {
/// An `ImageStyle` for applying common properties to a circular accessory icon.
///
/// - Size: 16x16pt
/// - Color: `Asset.Colors.iconSecondary`
/// - Color: `Asset.Colors.iconPrimary`
///
static let accessoryIcon16 = accessoryIcon16()

/// An `ImageStyle` for applying common properties to a circular accessory icon.
///
/// - Size: 24x24pt
/// - Color: `Asset.Colors.iconPrimary`
///
static let accessoryIcon = accessoryIcon()
static let accessoryIcon24 = accessoryIcon24()

/// An `ImageStyle` for applying common properties for icons within a row.
///
Expand All @@ -55,16 +62,32 @@ extension ImageStyle {
/// - Color: Defaults to `Asset.Colors.iconSecondary`
///
/// - Parameters:
/// - color: The foreground color of the image. Defaults to `Asset.Colors.iconSecondary`.
/// - color: The foreground color of the image. Defaults to `Asset.Colors.iconPrimary`.
/// - scaleWithFont: Whether the image should scale with font size changes.
///
static func accessoryIcon(
color: Color = Asset.Colors.iconSecondary.swiftUIColor,
static func accessoryIcon16(
color: Color = Asset.Colors.iconPrimary.swiftUIColor,
scaleWithFont: Bool = false
) -> ImageStyle {
ImageStyle(color: color, scaleWithFont: scaleWithFont, width: 16, height: 16)
}

/// An `ImageStyle` for applying common properties to a circular accessory icon.
///
/// - Size: 24x24pt
/// - Color: Defaults to `Asset.Colors.iconSecondary`
///
/// - Parameters:
/// - color: The foreground color of the image. Defaults to `Asset.Colors.iconPrimary`.
/// - scaleWithFont: Whether the image should scale with font size changes.
///
static func accessoryIcon24(
color: Color = Asset.Colors.iconPrimary.swiftUIColor,
scaleWithFont: Bool = false
) -> ImageStyle {
ImageStyle(color: color, scaleWithFont: scaleWithFont, width: 24, height: 24)
}

/// An `ImageStyle` for applying common properties for icons within a row.
///
/// - Size: 22x22pt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ import SwiftUI
struct AccessoryButtonStyle: ButtonStyle {
func makeBody(configuration: Configuration) -> some View {
configuration.label
.frame(width: 14, height: 14)
.padding(10)
.foregroundColor(Asset.Colors.iconSecondary.swiftUIColor)
.background(Asset.Colors.Legacy.fillTertiary.swiftUIColor)
.clipShape(Circle())
.frame(width: 24, height: 24)
.foregroundColor(Asset.Colors.iconPrimary.swiftUIColor)
.opacity(configuration.isPressed ? 0.5 : 1)
.contentShape(Rectangle())
}
}

Expand All @@ -31,14 +29,14 @@ extension ButtonStyle where Self == AccessoryButtonStyle {
#if DEBUG
#Preview("Enabled") {
Button {} label: {
Asset.Images.copy16.swiftUIImage
Asset.Images.copy24.swiftUIImage
}
.buttonStyle(.accessory)
}

#Preview("Disabled") {
Button {} label: {
Asset.Images.copy16.swiftUIImage
Asset.Images.copy24.swiftUIImage
}
.buttonStyle(.accessory)
.disabled(true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ struct SecondaryButtonStyle: ButtonStyle {
Capsule()
.strokeBorder(borderColor, lineWidth: 1.5)
}
.contentShape(Capsule())
.clipShape(Capsule())
.opacity(configuration.isPressed ? 0.5 : 1)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "copy16.pdf",
"filename" : "camera24.pdf",
"idiom" : "universal"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "eye16.pdf",
"filename" : "cog24.pdf",
"idiom" : "universal"
}
],
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "eye-slash16.pdf",
"filename" : "eye-slash24.pdf",
"idiom" : "universal"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "cog.pdf",
"filename" : "eye24.pdf",
"idiom" : "universal"
}
],
Expand Down
Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "check-circle.pdf",
"filename" : "minus-circle24.pdf",
"idiom" : "universal"
}
],
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -1059,5 +1059,8 @@
"CopyPrivateKey" = "Copy private key";
"CopyFingerprint" = "Copy fingerprint";
"SSHKeys" = "SSH keys";
"NothingAvailableToAutofill" = "Nothing available to autofill";
"FailedToGenerateVerificationCode" = "Failed to generate verification code";
"FailedToAutofillItem" = "Failed to autofill item %1$@";
"ExportingFailed" = "Exporting failed";
"YouMayNeedToEnableDevicePasscodeOrBiometrics" = "You may need to enable device passcode or biometrics.";
Original file line number Diff line number Diff line change
Expand Up @@ -1059,5 +1059,8 @@
"CopyPrivateKey" = "نسخ المفتاح الخاص";
"CopyFingerprint" = "نسخ بصمة الإصبع";
"SSHKeys" = "مفتاح SSH";
"NothingAvailableToAutofill" = "Nothing available to autofill";
"FailedToGenerateVerificationCode" = "Failed to generate verification code";
"FailedToAutofillItem" = "Failed to autofill item %1$@";
"ExportingFailed" = "Exporting failed";
"YouMayNeedToEnableDevicePasscodeOrBiometrics" = "You may need to enable device passcode or biometrics.";
Original file line number Diff line number Diff line change
Expand Up @@ -1059,5 +1059,8 @@
"CopyPrivateKey" = "Private açarı kopyala";
"CopyFingerprint" = "Barmaq izini kopyala";
"SSHKeys" = "SSH açarları";
"NothingAvailableToAutofill" = "Avto-doldurmaq üçün istifadə ediləcək heç nə yoxdur";
"FailedToGenerateVerificationCode" = "Doğrulama kodunu yaratma uğursuz oldu";
"FailedToAutofillItem" = "%1$@ elementini avto-doldurmaq uğursuz oldu";
"ExportingFailed" = "Xaricə köçürmə uğursuzdur";
"YouMayNeedToEnableDevicePasscodeOrBiometrics" = "Cihaz parolunu və ya biometriklərini fəallaşdırmaq lazım gələ bilər.";
Original file line number Diff line number Diff line change
Expand Up @@ -1059,5 +1059,8 @@
"CopyPrivateKey" = "Copy private key";
"CopyFingerprint" = "Copy fingerprint";
"SSHKeys" = "SSH keys";
"NothingAvailableToAutofill" = "Nothing available to autofill";
"FailedToGenerateVerificationCode" = "Failed to generate verification code";
"FailedToAutofillItem" = "Failed to autofill item %1$@";
"ExportingFailed" = "Exporting failed";
"YouMayNeedToEnableDevicePasscodeOrBiometrics" = "You may need to enable device passcode or biometrics.";
Loading

0 comments on commit 6a53202

Please sign in to comment.