Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
M-i-k-e-l committed Nov 22, 2023
2 parents 3281d5d + b45ce69 commit 8280b49
Show file tree
Hide file tree
Showing 50 changed files with 778 additions and 1,557 deletions.
1 change: 0 additions & 1 deletion demo/src/screens/SettingsScreen.js
Expand Up @@ -80,7 +80,6 @@ class SettingsScreen extends Component {
value={defaultScreen?.value}
label={'Default Screen'}
onChange={this.setDefaultScreen}
migrateTextField
>
{_.map(filteredScreens, screen => (
<Picker.Item key={screen.value} value={screen.value} label={screen.label}/>
Expand Down
43 changes: 43 additions & 0 deletions demo/src/screens/__tests__/__snapshots__/AvatarScreen.spec.js.snap
Expand Up @@ -20,6 +20,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -111,6 +112,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -143,6 +145,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -234,6 +237,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -264,6 +268,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"borderRadius": 25,
Expand Down Expand Up @@ -326,6 +331,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -417,6 +423,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -487,6 +494,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"borderRadius": 25,
Expand Down Expand Up @@ -551,6 +559,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -642,6 +651,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -722,6 +732,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"position": "absolute",
"right": 2.322330470336313,
Expand All @@ -739,6 +750,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{},
{},
{
Expand Down Expand Up @@ -781,6 +793,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -872,6 +885,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -973,6 +987,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"bottom": 2.322330470336313,
"position": "absolute",
Expand All @@ -990,6 +1005,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{},
{},
{
Expand Down Expand Up @@ -1032,6 +1048,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -1123,6 +1140,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -1224,6 +1242,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"bottom": 0.8578643762690499,
"left": 0.8578643762690499,
Expand All @@ -1241,6 +1260,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{},
{},
{
Expand Down Expand Up @@ -1283,6 +1303,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -1374,6 +1395,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -1409,6 +1431,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"borderRadius": 999,
Expand Down Expand Up @@ -1485,6 +1508,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -1576,6 +1600,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -1677,6 +1702,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"left": 3.2512626584708375,
"position": "absolute",
Expand All @@ -1694,6 +1720,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{},
{},
{
Expand Down Expand Up @@ -1736,6 +1763,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -1827,6 +1855,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -1939,6 +1968,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"position": "absolute",
"right": 0.28679656440357526,
Expand All @@ -1956,6 +1986,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{},
{},
{
Expand Down Expand Up @@ -2031,6 +2062,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -2122,6 +2154,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -2215,6 +2248,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -2306,6 +2340,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -2441,6 +2476,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -2532,6 +2568,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -2667,6 +2704,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -2758,6 +2796,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -2851,6 +2890,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{
"alignItems": "center",
"flexDirection": "row",
Expand Down Expand Up @@ -2942,6 +2982,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
[
{
"alignItems": "center",
Expand Down Expand Up @@ -3021,6 +3062,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{},
{},
{},
Expand All @@ -3041,6 +3083,7 @@ exports[`AvatarScreen renders screen 1`] = `
undefined,
undefined,
undefined,
undefined,
{},
{},
{
Expand Down
5 changes: 0 additions & 5 deletions demo/src/screens/componentScreens/DateTimePickerScreen.tsx
Expand Up @@ -62,14 +62,12 @@ export default class DateTimePickerScreen extends Component<{}, State> {
<View padding-page>
<Text text40>Date Time Picker</Text>
<DateTimePicker
migrateTextField
containerStyle={{marginVertical: 20}}
label={'Date'}
placeholder={'Select a date'}
// value={new Date('October 13, 2014')}
/>
<DateTimePicker
migrateTextField
mode={'time'}
label={'Time'}
placeholder={'Select time'}
Expand All @@ -80,14 +78,12 @@ export default class DateTimePickerScreen extends Component<{}, State> {
Disabled
</Text>
<DateTimePicker
migrateTextField
containerStyle={{marginBottom: 20}}
editable={false}
label={'Date'}
placeholder={'Select a date'}
/>
<DateTimePicker
migrateTextField
editable={false}
mode={'time'}
label={'Time'}
Expand All @@ -108,7 +104,6 @@ export default class DateTimePickerScreen extends Component<{}, State> {
</View>
</View>
<DateTimePicker
migrateTextField
containerStyle={{marginVertical: 20}}
renderInput={this.renderCustomInput}
mode={mode}
Expand Down
@@ -1,7 +1,7 @@
import _ from 'lodash';
import React, {PureComponent} from 'react';
import {ScrollView, StyleSheet} from 'react-native';
import {Card, Text, Image, ListItem, Carousel, Spacings, View, ExpandableSection, Switch} from 'react-native-ui-lib';
import {Card, Text, Image, ListItem, Carousel, View, ExpandableSection, Switch} from 'react-native-ui-lib';

const cardImage2 = require('../../assets/images/empty-state.jpg');
const cardImage = require('../../assets/images/card-example.jpg');
Expand Down

0 comments on commit 8280b49

Please sign in to comment.