Skip to content

Commit

Permalink
Merge pull request #969 from UNICEFECAR/resolveBug
Browse files Browse the repository at this point in the history 
Fix -  Resolve bug
  • Loading branch information
@DivyaniPatel96
DivyaniPatel96 authored Apr 29, 2024
2 parents 95207da + 193b19e commit b8a3d5f
Show file tree
Hide file tree
Showing 54 changed files with 1,004 additions and 899 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ android {
applicationId 'org.unicef.ecar.bebbo'
targetSdkVersion rootProject.ext.targetSdkVersion
resValue "string", "build_config_package", "com.myapp"
versionCode 19
versionName "2.1.0"
versionCode 20
versionName "2.1.1"
signingConfig signingConfigs.release
}
prodstaging {
Expand Down
Binary file removed android/app/src/main/assets/fonts/fontello.ttf
View file
Binary file not shown.
30 changes: 15 additions & 15 deletions app/assets/data/bebbo/localization.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,21 +195,21 @@ const localizationall = [
},
],
},
// {
// name: 'Slovakia',
// countryId: 151,
// displayName: 'Slovakia (Slovensko)',
// languages: [
// {
// name: 'slovenský',
// displayName: 'slovenský',
// languageCode: 'sk',
// locale: 'sk',
// luxonLocale:'sk-SK ',
// pluralShow:true
// }
// ],
// },
{
name: 'Slovakia',
countryId: 151,
displayName: 'Slovakia (Slovensko)',
languages: [
{
name: 'slovenský',
displayName: 'slovenský',
languageCode: 'sk',
locale: 'sk',
luxonLocale:'sk-SK',
pluralShow:true
}
],
},
{
name: 'Tajikistan',
countryId: 46,
Expand Down
Binary file modified app/assets/fonts/fontello.ttf
View file
Binary file not shown.
684 changes: 342 additions & 342 deletions app/assets/iconConfig/config.json
View file

Large diffs are not rendered by default.

156 changes: 78 additions & 78 deletions app/components/ChildDate.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ import {
FormDateText,
FormInputBox,
FormInputGroup,
LabelDatePlaceHolderText,
LabelText,
LabelText1
LabelText1,
LabelTextTerms
} from './shared/ChildSetupStyle';
import FormPrematureContainer, {
FormDobInfoPress,
Expand Down Expand Up @@ -173,11 +175,11 @@ const ChildDate = (props: any): any => {
<Pressable onPress={showdobDatepicker}>
<FormInputBox>
<FlexFDirRowSpace>
<Text>
{doborExpectedDate
? formatStringDate(doborExpectedDate)
: prevScreen == 'EditScreen' ? t('childSetupdobText') : t('childSetupdobSelector')}
</Text>
{doborExpectedDate ?
<LabelTextTerms>
{formatStringDate(doborExpectedDate)}
</LabelTextTerms> :
''}
{showdob && (
<DateTimePicker
testID="dobdatePicker"
Expand Down Expand Up @@ -208,33 +210,33 @@ const ChildDate = (props: any): any => {
</FormInfoPress></FormInfoLabel>
</FormPrematureContainer>
<Pressable onPress={showdobDatepicker}>
<View style={{marginTop:-10}}>
<FormInputBox>
<FlexFDirRowSpace>
<Text>
{doborExpectedDate
? formatStringDate(doborExpectedDate)
: prevScreen == 'EditScreen' ? t('childSetupdobText') : t('childSetupdobSelector')}
</Text>
{showdob && (
<DateTimePickerModal
isVisible={isDobDatePickerVisible}
mode="date"
date={doborExpectedDate != null ? doborExpectedDate : new Date()}
onConfirm={handleDobConfirm}
onCancel={(): any => {
setDobDatePickerVisibility(false);
}}
minimumDate={new Date(dobMin)}
maximumDate={new Date(dobMax)} />
)}
</FlexFDirRowSpace>
<FormDateAction>
<Icon name="ic_calendar" size={20} color="#000" />
</FormDateAction>
</FormInputBox>
</View>
<View style={{ marginTop: -10 }}>
<FormInputBox>
<FlexFDirRowSpace>
{doborExpectedDate ?
<LabelTextTerms>
{formatStringDate(doborExpectedDate)}
</LabelTextTerms> :
''}
{showdob && (
<DateTimePickerModal
isVisible={isDobDatePickerVisible}
mode="date"
date={doborExpectedDate != null ? doborExpectedDate : new Date()}
onConfirm={handleDobConfirm}
onCancel={(): any => {
setDobDatePickerVisibility(false);
}}
minimumDate={new Date(dobMin)}
maximumDate={new Date(dobMax)} />
)}
</FlexFDirRowSpace>
<FormDateAction>
<Icon name="ic_calendar" size={20} color="#000" />
</FormDateAction>
</FormInputBox>
</View>

</Pressable>
</FormInputGroup>
)}
Expand Down Expand Up @@ -285,58 +287,56 @@ const ChildDate = (props: any): any => {
<FormInputGroup onPress={showdueDatepicker}>
<LabelText>{t('childSetupdueLabel')}</LabelText>
<ShiftFromTop10>
<FormInputBox>
<FormDateText style={styles.formDateText}>
<Text>
{' '}
{dueDate
? formatStringDate(dueDate)
: t('childSetupdobSelector')}
</Text>
{showdue && (
<DateTimePicker
testID="duedatePicker"
value={dueDate != null ? dueDate : new Date()}
mode={'date'}
display="spinner"
minimumDate={
new Date(
DateTime.fromJSDate(doborExpectedDate as Date)
.plus({ weeks: minDue })
.toISODate(),
)
}
maximumDate={
new Date(
DateTime.fromJSDate(doborExpectedDate as Date)
.plus({ months: maxDue })
.toISODate(),
)
}
// minimumDate={{}}
// maximumDate={{}}
onChange={ondueDateChange}
/>
)}
</FormDateText>
<FormDateAction>
<Icon name="ic_calendar" size={20} color="#000" />
</FormDateAction>
</FormInputBox>
<FormInputBox>
<FormDateText style={styles.formDateText}>
{dueDate ?
<LabelTextTerms>
{formatStringDate(dueDate)}
</LabelTextTerms> :
''}
{showdue && (
<DateTimePicker
testID="duedatePicker"
value={dueDate != null ? dueDate : new Date()}
mode={'date'}
display="spinner"
minimumDate={
new Date(
DateTime.fromJSDate(doborExpectedDate as Date)
.plus({ weeks: minDue })
.toISODate(),
)
}
maximumDate={
new Date(
DateTime.fromJSDate(doborExpectedDate as Date)
.plus({ months: maxDue })
.toISODate(),
)
}
// minimumDate={{}}
// maximumDate={{}}
onChange={ondueDateChange}
/>
)}
</FormDateText>
<FormDateAction>
<Icon name="ic_calendar" size={20} color="#000" />
</FormDateAction>
</FormInputBox>
</ShiftFromTop10>

</FormInputGroup>
) : (
<FormInputGroup onPress={showdueDatepicker}>
<LabelText>{t('childSetupdueLabel')}</LabelText>
<FormInputBox>
<FormDateText style={styles.formDateText}>
<Text>
{' '}
{dueDate
? formatStringDate(dueDate)
: t('childSetupdobSelector')}
</Text>
{dueDate ?
<LabelTextTerms>
{formatStringDate(dueDate)}
</LabelTextTerms> :
''}
{showdue && (
<DateTimePickerModal
isVisible={isDueDatePickerVisible}
Expand Down
4 changes: 2 additions & 2 deletions app/components/ChildDevelopmentCollapsibleItem.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ const ChildDevelopmentCollapsibleItem = React.memo((props: any) => {
{item && item.body ?
<HTML
source={{ html: addSpaceToHtml(item.body) }}
baseFontStyle={styles.htmlFontSize}
ignoredStyles={['color', 'fontSize', 'fontFamily', 'margin', 'padding']}
baseStyle={styles.htmlFontSize}
ignoredStyles={['color', 'fontSize', 'fontFamily']}
tagsStyles={{
p: { textAlign: 'left', marginTop: 0 },
h1: { textAlign: 'left' },
Expand Down
6 changes: 3 additions & 3 deletions app/components/CountryItem.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Icon from '@components/shared/Icon';
import React from 'react';
import { Pressable, View } from 'react-native';
import Radio, { RadioActive, RadioItem, RadioItemText } from './shared/radio';
import Radio, { RadioActive, RadioCountryItem, RadioItemText } from './shared/radio';

const CountryItem = ({item, currentItem, setCountry}:any):any => {
const isActive: boolean = item === currentItem ? true : false;
Expand All @@ -11,7 +11,7 @@ const CountryItem = ({item, currentItem, setCountry}:any):any => {
onPress={():any => {
setCountry(item);
}}>
<RadioItem>
<RadioCountryItem>
<View>
{isActive ? (
<RadioActive>
Expand All @@ -22,7 +22,7 @@ const CountryItem = ({item, currentItem, setCountry}:any):any => {
)}
</View>
<RadioItemText isActive={isActive}>{item.displayName}</RadioItemText>
</RadioItem>
</RadioCountryItem>
</Pressable>
</>
);
Expand Down
10 changes: 4 additions & 6 deletions app/components/HeaderBabyMenu.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ import { getStatusBarHeight } from '../services/StatusBarHeight';
import { formatDate } from '../services/Utils';
import {
ButtonContainer,
ButtonLinkPress,
ButtonPrimary,
ButtonText,
ButtonTextLine
ButtonUpperCaseText
} from './shared/ButtonGlobal';
import { FDirRow, FlexColEnd } from './shared/FlexBoxStyle';
import { HeaderActionBox, HeaderActionView } from './shared/HeaderContainerStyle';
Expand Down Expand Up @@ -219,7 +217,7 @@ const HeaderBabyMenu = (props: any): any => {
genderName !== '' ?
(genderName === 'Boy' ?
<Icon name="ic_baby" size={36} color="#000" /> :
<Icon name="" size={36} color="#000" />) :
<Icon name="ic_baby_girl" size={36} color="#000" />) :
<Icon name="ic_baby_girl" size={36} color="#000" />
)}
</ProfileIconView>
Expand Down Expand Up @@ -310,7 +308,7 @@ const HeaderBabyMenu = (props: any): any => {
setModalVisible(false);
navigation.navigate('ChildProfileScreen')
}}>
<ButtonText numberOfLines={2}>{t('manageProfileTxt')}</ButtonText>
<ButtonUpperCaseText numberOfLines={2}>{t('manageProfileTxt')}</ButtonUpperCaseText>
</ButtonPrimary>
</ButtonContainer>
</View>
Expand Down Expand Up @@ -350,7 +348,7 @@ const HeaderBabyMenu = (props: any): any => {
<ImageIcon
source={{ uri: 'file://' + CHILDREN_PATH + activeChild.photoUri }}></ImageIcon>
) : (
activeChild.gender != '' ? activeChild.gender == '40' ? <Icon name="ic_baby" size={30} color="#FFF" /> : <Icon name="ic_baby_girl" size={30} color="#FFF" /> : <Icon name="ic_baby_girl" size={30} color="#FFF" />
activeChild.gender != '' ? activeChild.gender == '40' ? <Icon name="ic_baby" size={30} color={props.color || '#FFF'} /> : <Icon name="ic_baby_girl" size={30} color={props.color || '#FFF'} /> : <Icon name="ic_baby_girl" size={30} color={props.color || '#FFF'} />
)}
</HeaderActionBox>
</HeaderActionView>
Expand Down
Loading

0 comments on commit b8a3d5f

Please sign in to comment.