Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/9816-EvenMoreIconMigrations #9916

Draft
wants to merge 29 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
fcdb488
finished
Sparowhawk Sep 27, 2024
d187717
view message screen
Sparowhawk Sep 27, 2024
24c3018
updated
Sparowhawk Sep 27, 2024
684f724
finished
Sparowhawk Oct 1, 2024
6efbd5d
unit tests
Sparowhawk Oct 1, 2024
9da6e38
unit tests
Sparowhawk Oct 1, 2024
d50c23d
Merge branch 'develop' into feature/9733-VAIconWithTextMigration
Sparowhawk Oct 2, 2024
2779f12
updated comment
Sparowhawk Oct 3, 2024
012f45b
Merge branch 'develop' into feature/9733-VAIconWithTextMigration
Sparowhawk Oct 3, 2024
b5e7a4d
first icon converted and removed
Sparowhawk Oct 3, 2024
41061c4
fixed doc site
Sparowhawk Oct 3, 2024
19623e4
bulleted list bullet
Sparowhawk Oct 3, 2024
6cbfa0f
more icons
Sparowhawk Oct 3, 2024
979fa68
more icons
Sparowhawk Oct 3, 2024
751f648
more icons
Sparowhawk Oct 3, 2024
5c66fb2
fixed linting
Sparowhawk Oct 3, 2024
9343ee0
added padding and removed border radius
Sparowhawk Oct 3, 2024
4273918
alignment
Sparowhawk Oct 3, 2024
5c368d7
alignment
Sparowhawk Oct 3, 2024
5859d24
Merge branch 'develop' into feature/9733-VAIconWithTextMigration
Sparowhawk Oct 4, 2024
df5e001
Merge branch 'feature/9733-VAIconWithTextMigration' into featue/9779-…
Sparowhawk Oct 4, 2024
12e161b
updates
Sparowhawk Oct 18, 2024
96fa32e
matched home sizing as close as possible
Sparowhawk Oct 22, 2024
ae9528c
Merge branch 'develop' into feature/9733-VAIconWithTextMigration
Sparowhawk Oct 22, 2024
760a3b5
Merge branch 'feature/9733-VAIconWithTextMigration' into featue/9779-…
Sparowhawk Oct 22, 2024
aea4f8a
Merge branch 'featue/9779-MoreIconMigrations' into feature/9816-EvenM…
Sparowhawk Oct 22, 2024
765efc3
Merge branch 'develop' into featue/9779-MoreIconMigrations
Sparowhawk Oct 23, 2024
4cb6318
Merge branch 'featue/9779-MoreIconMigrations' into feature/9816-EvenM…
Sparowhawk Oct 23, 2024
bdc5bbf
Merge branch 'develop' into feature/9816-EvenMoreIconMigrations
Sparowhawk Oct 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions VAMobile/src/components/PhotoAdd.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ import React, { FC } from 'react'
import { useTranslation } from 'react-i18next'
import { Pressable, PressableProps } from 'react-native'

import { Icon } from '@department-of-veterans-affairs/mobile-component-library'

import { NAMESPACE } from 'constants/namespaces'
import { useTheme } from 'utils/hooks'

import TextView, { TextViewProps } from './TextView'
import { Box, BoxProps, VAIcon } from './index'
import { Box, BoxProps } from './index'

type PhotoAddProps = {
/** width of the component */
Expand Down Expand Up @@ -49,14 +51,7 @@ const PhotoAdd: FC<PhotoAddProps> = ({ width, height, onPress }) => {
return (
<Pressable {...pressableProps}>
<Box {...boxProps}>
<VAIcon
name={'Add'}
width={32}
height={32}
fill={themeColor.icon.photoAdd}
fill2={themeColor.icon.transparent}
maxWidth={70}
/>
<Icon name={'AddCircle'} width={40} height={40} fill={themeColor.icon.photoAdd} maxWidth={70} />
</Box>
<Box width={width} flexDirection="row">
<TextView {...textProps}>{t('fileUpload.addPhoto')}</TextView>
Expand Down
4 changes: 2 additions & 2 deletions VAMobile/src/components/PhotoUpload.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ImagePickerResponse, launchCamera, launchImageLibrary } from 'react-nat

import AsyncStorage from '@react-native-async-storage/async-storage'

import { Icon } from '@department-of-veterans-affairs/mobile-component-library'
import styled from 'styled-components'

import { NAMESPACE } from 'constants/namespaces'
Expand All @@ -14,7 +15,6 @@ import { themeFn } from 'utils/theme'

import Box, { BoxProps } from './Box'
import TextView from './TextView'
import { VAIcon } from './index'

type PhotoUploadProps = {
/** width of the photo */
Expand Down Expand Up @@ -169,7 +169,7 @@ const PhotoUpload: FC<PhotoUploadProps> = ({ width, height }) => {
</Box>
) : (
<Box {...boxProps} mb={20}>
<VAIcon name="UploadPhoto" />
<Icon name="AddCircle" />
<TextView color="primaryContrast" variant="HelperText">
{t('veteranStatus.uploadPhoto')}
</TextView>
Expand Down
Loading