Skip to content

Commit

Permalink
Merge branch 'develop' into 10313-MoreIconConversionsAgain
Browse files Browse the repository at this point in the history
  • Loading branch information
Sparowhawk authored Dec 12, 2024
2 parents 178aeda + bc3e64d commit 26a61e9
Show file tree
Hide file tree
Showing 50 changed files with 415 additions and 519 deletions.
27 changes: 21 additions & 6 deletions .github/workflows/e2e_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:

matrix-e2e-android:
if: (!cancelled()) && needs.output_detox_tests_to_run.outputs.output1 != ''
runs-on: macos-latest-xl
runs-on: macos-13
needs: [start_slack_thread, output_detox_tests_to_run]
strategy:
fail-fast: false
Expand Down Expand Up @@ -209,7 +209,22 @@ jobs:
force-avd-creation: false
disable-animations: true
arch: x86_64
avd-name: Pixel_4_XL_API_28
avd-name: Pixel_6_Pro_API_33
script: yarn e2e:android-test /e2e/tests/${{matrix.testsuite}} --updateSnapshot
continue-on-error: true

- name: Run e2e tests for Android - Full Test - Retry
id: run_e2e_tests_full_retry
if: steps.run_e2e_tests.outcome == 'failure'
uses: reactivecircus/android-emulator-runner@v2
with:
working-directory: VAMobile
api-level: 28
profile: pixel_6_pro
force-avd-creation: false
disable-animations: true
arch: x86_64
avd-name: Pixel_6_Pro_API_33
script: yarn e2e:android-test /e2e/tests/${{matrix.testsuite}} --updateSnapshot
continue-on-error: true

Expand All @@ -224,7 +239,7 @@ jobs:
force-avd-creation: false
disable-animations: true
arch: x86_64
avd-name: Pixel_4_XL_API_28
avd-name: Pixel_6_Pro_API_33
script: yarn e2e:android-test /e2e/tests/Navigation.e2e AvailabilityFramework.e2e ${{matrix.testsuite}}.e2e --updateSnapshot
continue-on-error: true

Expand All @@ -239,7 +254,7 @@ jobs:
force-avd-creation: false
disable-animations: true
arch: x86_64
avd-name: Pixel_4_XL_API_28
avd-name: Pixel_6_Pro_API_33
script: yarn e2e:android-test /e2e/tests/Navigation.e2e AvailabilityFramework.e2e ${{matrix.testsuite}}.e2e --updateSnapshot

- name: Upload e2e-junit
Expand All @@ -250,15 +265,15 @@ jobs:
path: VAMobile/e2e/test_reports/e2e-junit.xml

- name: Upload artifacts on failure
if: failure() || steps.run_e2e_tests.outcome == 'failure'
if: failure() || steps.run_e2e_tests_full_retry.outcome == 'failure'
uses: actions/upload-artifact@v4
with:
name: detox-artifacts-${{ runner.os }}-${{ github.run_id }}-${{matrix.testsuite}}
path: VAMobile/artifacts
retention-days: 1

- name: Fail workflow if needed(View e2e step for details)
if: steps.run_e2e_tests.outcome == 'failure'
if: steps.run_e2e_tests_full_retry.outcome == 'failure'
run: exit 1

output-slack-results-and-update-detox-failure-ticket:
Expand Down
2 changes: 1 addition & 1 deletion VAMobile/.detoxrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"emulator": {
"type": "android.emulator",
"device": {
"avdName": "Pixel_4_XL_API_28"
"avdName": "Pixel_6_Pro_API_33"
}
}
},
Expand Down
16 changes: 9 additions & 7 deletions VAMobile/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.1017.0)
aws-partitions (1.1020.0)
aws-sdk-core (3.214.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
Expand Down Expand Up @@ -113,7 +113,7 @@ GEM
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
fastlane-plugin-slack_bot (1.4.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.74.0)
google-apis-androidpublisher_v3 (0.75.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-core (0.15.1)
addressable (~> 2.5, >= 2.5.1)
Expand All @@ -131,15 +131,15 @@ GEM
google-apis-core (>= 0.15.0, < 2.a)
google-apis-playcustomapp_v1 (0.16.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-storage_v1 (0.47.0)
google-apis-storage_v1 (0.48.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.2.1)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.4.0)
google-cloud-storage (1.52.0)
google-cloud-storage (1.53.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-core (~> 0.13)
Expand All @@ -148,15 +148,17 @@ GEM
google-cloud-core (~> 1.6)
googleauth (~> 1.9)
mini_mime (~> 1.0)
googleauth (1.11.2)
google-logging-utils (0.1.0)
googleauth (1.12.0)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
google-cloud-env (~> 2.2)
google-logging-utils (~> 0.1)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.7)
http-cookie (1.0.8)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ Snackbars provide feedback regarding API interactions at the bottom of the scree
- If a screen has bottom navigation, the snackbar should open above the navigation.
- There should only ever be one snackbar on the screen. Opening a new snackbar will close the previous snackbar.

### Related
## Related
* [Snackbar - Material Design](https://m3.material.io/components/snackbar/overview)
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Allows users to select one or more items from a list. Checkboxes are an easily u
* Refer to the [VA Design System for accessibility considerations](https://design.va.gov/components/form/checkbox#accessibility-considerations)
* Screenreaders should announce the name, role, and state of each checkbox.

### Related
## Related
* [Checkbox - VA Design System](https://design.va.gov/components/form/checkbox)
* [Checkbox - USWDS](https://designsystem.digital.gov/components/checkbox/)
* [Checkbox - Material Design](https://m3.material.io/components/checkbox/overview)
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
title: Radio button
---

Radio buttons allow users to select exactly one choice from a group.

## Examples

### Default
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/radio-button--default) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=6703-12221&t=Dj0bTSPSPnEJEFCa-4)
<iframe width="620" height="500" title="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/radio-button--default&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

### Tile
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/radio-button--tile) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=6703-12221&t=Dj0bTSPSPnEJEFCa-4)
<iframe width="620" height="500" title="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/radio-button--tile&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

### Error
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/radio-button--error) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=6703-12221&t=Dj0bTSPSPnEJEFCa-4)
<iframe width="620" height="500" title="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/radio-button--error&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

## Usage
[Refer to the VA Design System for usage guidance](https://design.va.gov/components/form/radio-button)

## Code usage
[Open Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/radio-button--docs)

## Content considerations
* Refer to the [VA Design System for content considerations](https://design.va.gov/components/form/radio-button#content-considerations)

## Accessibility considerations
* Refer to the [VA Design System for accessibility considerations](https://design.va.gov/components/form/radio-button#accessibility-considerations)
* Screenreaders should announce the name, role, and state of each radio button.

## Related
* [Radio button - VA Design System](https://design.va.gov/components/form/radio-button)
* [Radio buttons - USWDS](https://designsystem.digital.gov/components/radio-buttons/)
* [Radio button - Material Design](https://m3.material.io/components/radio-button/overview)
44 changes: 44 additions & 0 deletions VAMobile/documentation/design/Components/Typography/Text.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
title: Text
---

Text is a typography component for headings, body copy, and display text.

## Examples

### Headings
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/text--heading) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=7101-3675&t=iL0TKvx4LGQO6STF-4)
<iframe width="620" height="200" title="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/text--heading&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

### Body
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/text--body) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=7101-3675&t=iL0TKvx4LGQO6STF-4)
<iframe width="620" height="400" title="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/text--body&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

### Display
**Open in**: [Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/text--display) | [Figma](https://www.figma.com/design/Zzt8z60hCtdEzXx2GFWghH/%F0%9F%93%90-Component-Library---Design-System---VA-Mobile?node-id=7101-3675&t=iL0TKvx4LGQO6STF-4)
<iframe width="620" height="200" title="Image of component in Storybook" src="https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/story/text--display&full=1&shortcuts=false&singleStory=true" allowfullscreen></iframe>

## Usage

### When to use Text
- To add content to a screen.

### When to consider something else
- For bulleted or numbered lists, use the Text list component (coming soon).
- For smaller Navigation copy (such as the bottom tab bar), apply the Navigation text style directly to a text box.

### How this component works
- This component is built using the [composite typography tokens](/va-mobile-app/design/Foundation/Design%20tokens/Typography#text-styles).
- Paragraph spacing is set to the minimum recommended values to align with accessibility guidelines ([WCAG SC 1.4.12](https://www.w3.org/WAI/WCAG22/Understanding/text-spacing.html)). While you can increase the amount of paragraph spacing, you should not decrease without consulting an accessibility specialist.

### Choosing between variations
There are 9 variations of the Text component.
- Use a Heading variation (large, medium, small, x-small) for headings.
- Use a Body variation (large, medium, small, x-small) for body copy.
- Use the Display variation for larger display text.

## Code usage
[Open Storybook](https://department-of-veterans-affairs.github.io/va-mobile-library/?path=/docs/text--docs)

## Related
- Text list (coming soon)
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
title: Typography
sidebar_position: 4
---

# Typography

Typographical selections intended to meet the highest standards of usability and accessibility, while setting a consistent look and feel in order to convey credibility.

## Typography tokens

Typography tokens define each property of a text style. They include font family, style, size, line height, and letter spacing. Math is used to calculate values for size and line height.

- The base font size is 16. Additional sizes are created using a scale of 1.125
- The default line height is set to 1.5x the font size. For headings, the line height is set to 1.2x. Line heights follow [accessibility best practices](https://department-of-veterans-affairs.github.io/va-mobile-app/docs/QA/QualityAssuranceProcess/Accessibility/a11y-checklist-ux-designers) and should not be decreased without consulting an accessibility specialist.

### Primitive
<iframe width="800" height="800" title="Image of design tokens in Figma" src="https://www.figma.com/embed?embed_host=share&url=https%3A%2F%2Fwww.figma.com/design/rdLIEaC9rVwX70QbIGkMvG/%F0%9F%93%90-Design-Tokens-Library---Design-System---VA-Mobile?node-id=2318-2705&t=CwihCLOelO0fGAMq-4" allowfullscreen></iframe>

### Semantic
<iframe width="800" height="1200" title="Image of design tokens in Figma" src="https://www.figma.com/embed?embed_host=share&url=https%3A%2F%2Fwww.figma.com/design/rdLIEaC9rVwX70QbIGkMvG/%F0%9F%93%90-Design-Tokens-Library---Design-System---VA-Mobile?node-id=2321-2924&t=CwihCLOelO0fGAMq-4" allowfullscreen></iframe>

## Text styles

Text styles (also known as composite tokens) combine each individual typography token into a defined style. They include styles for headings, body copy, and more. All properties are set using typography tokens, except for paragraph spacing. In the mobile app, spacing tokens are used to define paragraph spacing in a text style.

### Headings
<iframe width="800" height="800" title="Image of design tokens in Figma" src="https://www.figma.com/embed?embed_host=share&url=https%3A%2F%2Fwww.figma.com/design/rdLIEaC9rVwX70QbIGkMvG/%F0%9F%93%90-Design-Tokens-Library---Design-System---VA-Mobile?node-id=2321-2925&t=CwihCLOelO0fGAMq-4" allowfullscreen></iframe>

### Body
<iframe width="800" height="800" title="Image of design tokens in Figma" src="https://www.figma.com/embed?embed_host=share&url=https%3A%2F%2Fwww.figma.com/design/rdLIEaC9rVwX70QbIGkMvG/%F0%9F%93%90-Design-Tokens-Library---Design-System---VA-Mobile?node-id=2321-2926&t=CwihCLOelO0fGAMq-4" allowfullscreen></iframe>

### Other
<iframe width="800" height="500" title="Image of design tokens in Figma" src="https://www.figma.com/embed?embed_host=share&url=https%3A%2F%2Fwww.figma.com/design/rdLIEaC9rVwX70QbIGkMvG/%F0%9F%93%90-Design-Tokens-Library---Design-System---VA-Mobile?node-id=2321-2927&t=CwihCLOelO0fGAMq-4" allowfullscreen></iframe>

## How to use typography tokens

Designers and engineers are encouraged to use typography tokens to ensure a consistent look and feel throughout the app. Multiple typography tokens are combined to create composite tokens (aka text styles). To use typography tokens and text styles in the app, we recommend a few different approaches:

- For Headings and Body copy, use the [Text component](/va-mobile-app/design/Components/Typography/Text).
- For larger Display copy, use the [Text component](/va-mobile-app/design/Components/Typography/Text).
- For smaller Navigation copy (such as the bottom tab bar), apply the Navigation text style directly to a text box.

**Coming soon**
- For bulleted/numbered lists, there will be a separate component in the future.
- For inline links and styling (bold, italics, etc.), there will be a separate component in the future.
4 changes: 4 additions & 0 deletions VAMobile/documentation/design/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ A system to help you write, design, and build digital services on the VA Mobile

### Selection and input
- [Checkbox](/va-mobile-app/design/Components/Selection%20and%20input/Checkbox)
- [Radio button](/va-mobile-app/design/Components/Selection%20and%20input/RadioButton)

### Typography
- [Text](/va-mobile-app/design/Components/Typography/Text)

-----

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,4 @@
title: Radio button
---

Radio buttons allow users to select exactly one choice from a group.

## Examples

### Master component
<iframe width="800" height="450" title="Image of master component in Figma showing light and dark mode" src="https://www.figma.com/embed?embed_host=share&url=https%3A%2F%2Fwww.figma.com/file/mAMh8vyVgsevAOungfvGN6/%5BNEW%5D-Checkbox-%26-Radio-Buttons?type=design&node-id=1509-7909&mode=design&t=iS5TS46EHWCYCjWn-4" title="Image of master component in Figma showing light and dark mode" allowfullscreen></iframe>

### Examples
<iframe width="800" height="450" title="Image of component examples in Figma" src="https://www.figma.com/embed?embed_host=share&url=https%3A%2F%2Fwww.figma.com/file/mAMh8vyVgsevAOungfvGN6/%5BNEW%5D-Checkbox-%26-Radio-Buttons?type=design&node-id=1509-7910&mode=design&t=iS5TS46EHWCYCjWn-4" allowfullscreen></iframe>

## Usage

[Refer to the VA Design System for usage guidance](https://design.va.gov/components/form/radio-button)

## Content considerations
* Refer to the [VA Design System for content considerations](https://design.va.gov/components/form/radio-button/#content-considerations)

## Accessibility considerations
* Refer to the [VA Design System for accessibility considerations](https://design.va.gov/components/form/radio-button/#accessibility-considerations)
* Screenreaders should announce the name, role, and state of each checkbox.

## Code usage
Link to Storybook coming soon

## Related
* [Radio button - VA Design System](https://design.va.gov/components/form/radio-button)
* [Radio buttons - USWDS](https://designsystem.digital.gov/components/radio-buttons/)
* [Radio button - Material Design](https://m3.material.io/components/radio-button/overview)
See documentation in [Design System](/va-mobile-app/design/Components/Selection%20and%20input/RadioButton).
Loading

0 comments on commit 26a61e9

Please sign in to comment.