@olea-bps/base 1.1.1 → 1.1.2

package/context/context-public-transport-ticket/CollektorVersion2ApiProvider.js

@@ -1,5 +1,9 @@
+import { DateTime } from 'luxon';
+
 import HttpApiProvider, { JsonContentType } from '../../libraries/base-api-provider';
 
+
+
 /**
  * Infos-API-Client für Kollektor
  */
@@ -25,7 +29,24 @@ export default class CollektorVersion2ApiProvider extends HttpApiProvider {
         const getTicketUrl = this.getTicketUrl();
 
         return this.get(getTicketUrl)
-            .then(response => response.json());
+            .then(response => response.json())
+            .then(
+                jsonTicket => {
+                    const ticketValidFromDateTime = jsonTicket?.validFrom
+                        ? DateTime.fromISO(jsonTicket.validFrom)
+                        : null;
+
+                    const ticketValidToDateTime = jsonTicket?.validTo
+                        ? DateTime.fromISO(jsonTicket?.validTo)
+                        : null;
+
+                    return {
+                        ...jsonTicket,
+                        validFrom: ticketValidFromDateTime,
+                        validTo: ticketValidToDateTime,
+                    }
+                }
+            );
     }
 
     /**

package/context/context-public-transport-ticket/index.js

@@ -16,6 +16,8 @@ import { createContext, useEffect, useContext, useMemo, useCallback } from 'reac
 
 import { useTheme } from 'react-native-paper';
 
+import { DateTime } from 'luxon';
+
 import { useSecureStoredState } from '../../libraries/stored-state';
 import { useLanguage, useStagingServer } from '../../libraries/core';
 import { useAccessToken } from '../context-user';
@@ -34,8 +36,8 @@ import CollektorVersion2ApiProvider from './CollektorVersion2ApiProvider';
  * @typedef PublicTransportTicketContext
  * @property {string} ticketBarcode Barcode Data-URI/URL
  * @property {string} ticketOwner
- * @property {string} ticketValidFrom
- * @property {string} ticketValidTo
+ * @property {DateTime|null} ticketValidFrom
+ * @property {DateTime|null} ticketValidTo
  * @property {() => Promise<void>} refreshTicket
  */
 
@@ -137,7 +139,13 @@ function usePublicTransportTicketContext() {
  * Liefert alle noch austehenden Infos zurück.
  * Austehende Infos sind noch nicht als angezeigt markiert.
  *
- * @returns {[barcode: string|undefined, owner: string|undefined, validForm: string|undefined, validTo: string|undefined, refreshTicket: () => Promise<void>|undefined]}
+ * @returns {[
+ *     barcode: string|undefined,
+ *     owner: string|undefined,
+ *     validForm: DateTime|null,
+ *     validTo: DateTime|null,
+ *     refreshTicket: () => Promise<void>|undefined,
+ * ]}
  * @example
  * const [
  *     ticketBarcode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olea-bps/base",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "OLEA base library",
   "main": "index.js",
   "repository": {
@@ -43,6 +43,7 @@
     "jwt-decode": "4.0.0",
     "moment": "^2.29.4",
     "react-native-elements": "^3.4.3",
+    "react-native-enriched-markdown": "^0.6.0",
     "react-native-modalbox": "^2.0.2",
     "react-native-paper": "^5.15.2",
     "react-native-svg": "15.15.4",

package/views/Dashboard/index.js

@@ -12,7 +12,10 @@
  * limitations under the License.
  */
 
-import { useMemo, useCallback } from 'react';
+import {
+    useMemo,
+    useCallback,
+} from 'react';
 import {
     Animated,
     StyleSheet,
@@ -20,13 +23,15 @@ import {
     RefreshControl,
     SafeAreaView,
     useAnimatedValue,
+    Linking,
+    Alert,
 } from 'react-native';
 
 import { connect } from 'react-redux';
 import { Appbar, Button, Dialog, Portal, useTheme } from 'react-native-paper';
 import { useTranslation } from 'react-i18next';
 import { useFocusEffect } from '@react-navigation/native';
-import Markdown from 'react-native-markdown-display';
+import { EnrichedMarkdownText } from 'react-native-enriched-markdown';
 
 import { onUpdateRefreshing, DataService } from '../../libraries/core';
 import TopNewsComponent from '../../components/TopNews';
@@ -140,9 +145,35 @@ function DashboardView(props) {
                     <Dialog.Content>
                         {
                             pendingInfo
-                                ? <Markdown>
-                                    {pendingInfo?.message}
-                                </Markdown>
+                                ? <EnrichedMarkdownText
+                                    markdown={pendingInfo?.message}
+                                    selectable={false}
+                                    md4cFlags={{
+                                        // Texte können mit _text_ unterstrichen werden
+                                        underline: true,
+                                        // Texte können mit ==text== hervorgehoben werden
+                                        highlight: true,
+                                    }}
+                                    onLinkPress={
+                                        event =>
+                                            Linking
+                                                .openURL(event.url)
+                                                .catch(
+                                                    reason => {
+                                                        console.debug(componentName, ':', 'can´t open url', event.url);
+
+                                                        // Zeige dem Nutzer an, das der Link nicht geöffent werden konnte
+                                                        Alert.alert(
+                                                            t('infodialog:unopenableUrlAlert:title'),
+                                                            t('infodialog:unopenableUrlAlert:message', { link: event.url }),
+                                                            [
+                                                                { text: t('infodialog:unopenableUrlAlert:okButton'), style: 'default', isPreferred: true }
+                                                            ],
+                                                        )
+                                                    }
+                                                )
+                                    }
+                                />
                                 : null
                         }
                     </Dialog.Content>