Skip to content

Commit

Permalink
chore: switch to safe-area-context
Browse files Browse the repository at this point in the history
  • Loading branch information
hevelius committed Jan 30, 2024
1 parent f029570 commit 41fd877
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 16 deletions.
4 changes: 3 additions & 1 deletion ts/features/fci/components/DocumentWithSignature.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Pdf from "react-native-pdf";
import { constNull, pipe } from "fp-ts/lib/function";
import * as O from "fp-ts/lib/Option";
import * as pot from "@pagopa/ts-commons/lib/pot";
import { SafeAreaView, StyleSheet, View } from "react-native";
import { StyleSheet, View } from "react-native";
import {
ButtonSolidProps,
FooterWithButtons,
Expand All @@ -14,6 +14,7 @@ import {
IOStyles,
VSpacer
} from "@pagopa/io-app-design-system";
import { SafeAreaView } from "react-native-safe-area-context";
import I18n from "../../../i18n";
import { ExistingSignatureFieldAttrs } from "../../../../definitions/fci/ExistingSignatureFieldAttrs";
import { SignatureFieldToBeCreatedAttrs } from "../../../../definitions/fci/SignatureFieldToBeCreatedAttrs";
Expand Down Expand Up @@ -186,6 +187,7 @@ const DocumentWithSignature = (props: Props) => {
<SafeAreaView
style={[IOStyles.flex, IOStyles.bgWhite]}
testID={"FciDocumentsScreenTestID"}
edges={["bottom", "left", "right"]}
>
<View style={[IOStyles.horizontalContentPadding, styles.header]}>
<HSpacer />
Expand Down
9 changes: 7 additions & 2 deletions ts/features/fci/components/ErrorComponent.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import { SafeAreaView, View } from "react-native";
import { View } from "react-native";
import { EmailString } from "@pagopa/ts-commons/lib/strings";
import {
ButtonOutline,
Expand All @@ -10,6 +10,7 @@ import {
Pictogram,
VSpacer
} from "@pagopa/io-app-design-system";
import { SafeAreaView } from "react-native-safe-area-context";
import I18n from "../../../i18n";
import { WithTestID } from "../../../types/WithTestID";
import {
Expand Down Expand Up @@ -135,7 +136,11 @@ const ErrorComponent = (props: Props) => {
};

return (
<SafeAreaView style={IOStyles.flex} testID={props.testID}>
<SafeAreaView
style={IOStyles.flex}
testID={props.testID}
edges={["bottom", "left", "right"]}
>
<InfoScreenComponent
image={<Pictogram name={props.pictogram} />}
title={props.title}
Expand Down
5 changes: 3 additions & 2 deletions ts/features/fci/screens/valid/FciDataSharingScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as pot from "@pagopa/ts-commons/lib/pot";
import { useNavigation, useRoute } from "@react-navigation/native";
import * as React from "react";
import { SafeAreaView, StyleSheet, View, ScrollView } from "react-native";
import { StyleSheet, View, ScrollView } from "react-native";
import * as O from "fp-ts/lib/Option";
import {
Body,
Expand All @@ -16,6 +16,7 @@ import {
ListItemNav,
VSpacer
} from "@pagopa/io-app-design-system";
import { SafeAreaView } from "react-native-safe-area-context";
import I18n from "../../../../i18n";
import { useIOSelector } from "../../../../store/hooks";
import {
Expand Down Expand Up @@ -119,7 +120,7 @@ const FciDataSharingScreen = (): React.ReactElement => {

return (
<>
<SafeAreaView style={IOStyles.flex}>
<SafeAreaView style={IOStyles.flex} edges={["bottom", "left", "right"]}>
<ScrollView
style={IOStyles.horizontalContentPadding}
testID={"FciDataSharingScreenListTestID"}
Expand Down
4 changes: 3 additions & 1 deletion ts/features/fci/screens/valid/FciDocumentPreviewScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from "react";
import { SafeAreaView, StyleSheet } from "react-native";
import { StyleSheet } from "react-native";
import * as S from "fp-ts/lib/string";
import { SafeAreaView } from "react-native-safe-area-context";
import I18n from "../../../../i18n";
import { IOStackNavigationRouteProps } from "../../../../navigation/params/AppParamsList";
import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
Expand Down Expand Up @@ -56,6 +57,7 @@ export const FciDocumentPreviewScreen = (
<SafeAreaView
style={styles.container}
testID={"FciDocumentPreviewScreenTestID"}
edges={["bottom", "left", "right"]}
>
{S.isEmpty(documentUrl) === false && (
<DocumentViewer
Expand Down
9 changes: 7 additions & 2 deletions ts/features/fci/screens/valid/FciDocumentsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { pipe } from "fp-ts/lib/function";
import * as RA from "fp-ts/lib/ReadonlyArray";
import * as O from "fp-ts/lib/Option";
import * as S from "fp-ts/lib/string";
import { SafeAreaView, StyleSheet } from "react-native";
import { StyleSheet } from "react-native";
import { useSelector } from "react-redux";
import {
RouteProp,
Expand All @@ -20,6 +20,7 @@ import {
IOColors,
IOStyles
} from "@pagopa/io-app-design-system";
import { SafeAreaView } from "react-native-safe-area-context";
import I18n from "../../../../i18n";
import DocumentsNavigationBar from "../../components/DocumentsNavigationBar";
import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
Expand Down Expand Up @@ -243,7 +244,11 @@ const FciDocumentsScreen = () => {
disabled={false}
testID={"FciDocumentsNavBarTestID"}
/>
<SafeAreaView style={IOStyles.flex} testID={"FciDocumentsScreenTestID"}>
<SafeAreaView
style={IOStyles.flex}
testID={"FciDocumentsScreenTestID"}
edges={["bottom", "left", "right"]}
>
{documents.length > 0 && (
<>
{renderPager()}
Expand Down
9 changes: 7 additions & 2 deletions ts/features/fci/screens/valid/FciQtspClausesScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import { SafeAreaView, FlatList, View, ScrollView } from "react-native";
import { FlatList, View, ScrollView } from "react-native";
import { useSelector } from "react-redux";
import { useNavigation } from "@react-navigation/native";
import * as pot from "@pagopa/ts-commons/lib/pot";
Expand All @@ -12,6 +12,7 @@ import {
IOStyles,
VSpacer
} from "@pagopa/io-app-design-system";
import { SafeAreaView } from "react-native-safe-area-context";
import I18n from "../../../../i18n";
import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
import {
Expand Down Expand Up @@ -168,7 +169,11 @@ const FciQtspClausesScreen = () => {

return (
<>
<SafeAreaView style={IOStyles.flex} testID={"FciQtspClausesTestID"}>
<SafeAreaView
style={IOStyles.flex}
edges={["bottom", "left", "right"]}
testID={"FciQtspClausesTestID"}
>
<ScrollView style={IOStyles.horizontalContentPadding}>
<H2>{I18n.t("features.fci.qtspTos.title")}</H2>
<VSpacer size={16} />
Expand Down
9 changes: 7 additions & 2 deletions ts/features/fci/screens/valid/FciSignatureFieldsScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import { View, SafeAreaView, SectionList, ScrollView } from "react-native";
import { View, SectionList, ScrollView } from "react-native";
import { useSelector } from "react-redux";
import { StackActions, useNavigation } from "@react-navigation/native";
import * as RA from "fp-ts/lib/ReadonlyArray";
Expand All @@ -15,6 +15,7 @@ import {
IOStyles,
VSpacer
} from "@pagopa/io-app-design-system";
import { SafeAreaView } from "react-native-safe-area-context";
import I18n from "../../../../i18n";
import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
import { useIODispatch } from "../../../../store/hooks";
Expand Down Expand Up @@ -272,7 +273,11 @@ const FciSignatureFieldsScreen = (

return (
<>
<SafeAreaView style={IOStyles.flex} testID={"FciSignatureFieldsTestID"}>
<SafeAreaView
style={IOStyles.flex}
testID={"FciSignatureFieldsTestID"}
edges={["bottom", "left", "right"]}
>
<ScrollView style={IOStyles.horizontalContentPadding}>
<H2>{I18n.t("features.fci.signatureFields.title")}</H2>
<VSpacer size={32} />
Expand Down
5 changes: 3 additions & 2 deletions ts/features/fci/screens/valid/FciSignatureRequestsScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as React from "react";
import { SafeAreaView, SectionList, ScrollView } from "react-native";
import { SectionList, ScrollView } from "react-native";
import { H2, IOStyles } from "@pagopa/io-app-design-system";
import { SafeAreaView } from "react-native-safe-area-context";
import SignatureRequestItem from "../../components/SignatureRequestItem";
import { useIODispatch, useIOSelector } from "../../../../store/hooks";
import { fciSignaturesListSelector } from "../../store/reducers/fciSignaturesList";
Expand Down Expand Up @@ -89,7 +90,7 @@ const FciSignatureRequestsScreen = () => {
return (
<LoadingSpinnerOverlay isLoading={dataItems === undefined}>
<>
<SafeAreaView style={IOStyles.flex}>
<SafeAreaView style={IOStyles.flex} edges={["bottom", "left", "right"]}>
<ScrollView style={IOStyles.horizontalContentPadding}>
<H2>{I18n.t("features.fci.requests.title")}</H2>
{renderSignatureRequests()}
Expand Down
8 changes: 6 additions & 2 deletions ts/features/fci/screens/valid/FciThankyouScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as React from "react";
import { SafeAreaView } from "react-native";
import * as pot from "@pagopa/ts-commons/lib/pot";
import {
ButtonSolidProps,
FooterWithButtons,
IOStyles,
Pictogram
} from "@pagopa/io-app-design-system";
import { SafeAreaView } from "react-native-safe-area-context";
import { useIODispatch, useIOSelector } from "../../../../store/hooks";
import { fciSignatureSelector } from "../../store/reducers/fciSignature";
import GenericErrorComponent from "../../components/GenericErrorComponent";
Expand Down Expand Up @@ -50,7 +50,11 @@ const FciThankyouScreen = () => {
};
return (
<>
<SafeAreaView style={IOStyles.flex} testID={"FciTypSuccessTestID"}>
<SafeAreaView
style={IOStyles.flex}
testID={"FciTypSuccessTestID"}
edges={["bottom", "left", "right"]}
>
<InfoScreenComponent
image={<Pictogram name={"success"} />}
title={I18n.t("features.fci.thankYouPage.title")}
Expand Down

0 comments on commit 41fd877

Please sign in to comment.