@olea-bps/base 1.0.5 → 1.1.1

package/components/MealItem/styles.js

@@ -1,15 +1,4 @@
-// Helper function to add alpha to a color
-const addAlpha = (hexColor, alpha) => {
-    // Remove # if present
-    const hex = hexColor.replace('#', '');
-
-    // Parse RGB values
-    const r = parseInt(hex.substring(0, 2), 16);
-    const g = parseInt(hex.substring(2, 4), 16);
-    const b = parseInt(hex.substring(4, 6), 16);
-
-    return `rgba(${r}, ${g}, ${b}, ${alpha})`;
-};
+import { addAlpha } from '../../libraries/core/helper/color';
 
 export default function(theme) {
     return {

package/components/MensaMenu/index.js

@@ -20,7 +20,7 @@ import {
     Image
 } from 'react-native';
 import { connect } from 'react-redux'
-import { Button, Dialog, Portal, useTheme } from 'react-native-paper';
+import { Button, Dialog, IconButton, Portal, useTheme } from 'react-native-paper';
 import { useTranslation } from 'react-i18next';
 
 import { useFilteredMenu } from '../../context/context-canteen';
@@ -29,6 +29,7 @@ import { onUpdateRefreshing } from '../../libraries/core';
 import IconsOpenasist from '../../libraries/icons-openasist';
 
 import componentStyles from './styles';
+import { addAlpha } from '../../libraries/core/helper/color';
 
 /**
  * Mensa Menu Component
@@ -199,19 +200,21 @@ function Meal({ settings, meal, priceGroupCode, priceGroupName }) {
                     {
                         meal?.additives || meal?.allergens
                             ? <>
-                                <Button
+                                <IconButton
                                     style={styles.btnAddionals}
-                                    color={colors.buttonText}
-                                    labelStyle={styles.buttonLabel}
+                                    iconColor={colors.secondaryText}
+                                    rippleColor={addAlpha(colors.primary, 0.12)}
+                                    size={15}
                                     accessibilityLabel={t('canteen:allergeneTitle')}
                                     onPress={() => setAdditionalDialogVisible(true)}
-                                >
-                                    <IconsOpenasist
-                                        icon={"info"}
-                                        color={colors.secondaryText}
-                                        size={15}
-                                    />
-                                </Button>
+                                    icon={({ size, color }) => (
+                                        <IconsOpenasist
+                                            icon={"info"}
+                                            color={color}
+                                            size={size}
+                                        />
+                                    )}
+                                />
                                 <AdditionalDialog
                                     allergens={meal?.allergens}
                                     additives={meal?.additives}

package/context/context-callmanager/index.js

@@ -46,7 +46,7 @@ function CallManagerContextProvider({ children }) {
             switch (callManagerApiProvider?.toLowerCase()) {
                 case TucCallManagerProviderName:
                     console.debug(componentName, ':', 'use tu chemnitz call manager');
-                    return new TucCallManager.from(callManagerApiBaseUrl, 'de', accessToken);
+                    return TucCallManager.from(callManagerApiBaseUrl, 'de', accessToken);
                 default:
                     console.log(`${componentName}: Can't build api provider: ${callManagerApiProvider}`)
                     return null;

package/context/context-canteen/index.js

@@ -386,10 +386,10 @@ function CanteenContextProvider({ children, settings, rootUrl, rootStgUrl, useSt
             switch (canteenApiProvider?.toLowerCase()) {
                 case AsistServerProviderName:
                     console.debug(componentName, ': use asist server api');
-                    return new AsistServerApiProvider.from(canteenApiBaseUrl, canteenApiUniversity, language);
+                    return AsistServerApiProvider.from(canteenApiBaseUrl, canteenApiUniversity, language);
                 case CollectorVersion2ProviderName:
                     console.debug(componentName, ': use collector v2 api');
-                    return new CollektorVersion2ApiProvider.from(canteenApiBaseUrl, language);
+                    return CollektorVersion2ApiProvider.from(canteenApiBaseUrl, language);
                 default:
                     console.log(`${componentName}: Can't build api provider: ${canteenApiProvider}`)
                     return null;

package/context/context-flex-menu/index.js

@@ -61,7 +61,7 @@ function FlexMenuContextProvider({ children }) {
                 //    return new AsistServerApiProvider.from(timetableApiBaseUrl, timetableApiUniversity, 'de');
                 //    break;
                 case CollectorVersion2ProviderName:
-                    return new CollectorVersion2ApiProvider.from(flexMenuApiBaseUrl);
+                    return CollectorVersion2ApiProvider.from(flexMenuApiBaseUrl);
                     break;
                 default:
                     console.log(`${componentName}: Can't build api provider: ${flexMenuApiProvider}`)

package/context/context-news/index.js

@@ -72,7 +72,7 @@ function NewsContextProvider({ children }) {
             switch (newsApiProvider?.toLowerCase()) {
                 case CollectorVersion2ProviderName:
                     console.debug(componentName, ': use collector v2 api');
-                    return new CollektorVersion2ApiProvider.from(newsApiBaseUrl, language);
+                    return CollektorVersion2ApiProvider.from(newsApiBaseUrl, language);
                 default:
                     console.log(`${componentName}: Can't build api provider: ${newsApiProvider}`)
                     return null;

package/libraries/core/constants/api.js

@@ -8,7 +8,7 @@ export const GETOptions = {
         "Accept-Language" : "de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7",
         "Cache-Control" : "no-cache",
         'Pragma': 'no-cache',
-        'Expires': 0,
+        'Expires': '0',
     }
 };
 export const GETOptionsByLanguage = (languageCode = null) => {
@@ -28,7 +28,7 @@ export const GETOptionsByLanguage = (languageCode = null) => {
             "Accept-Language": acceptLanguage,
             "Cache-Control": "no-cache",
             'Pragma': 'no-cache',
-            'Expires': 0,
+            'Expires': '0',
         }
     }
 };

package/libraries/core/helper/color.js

@@ -0,0 +1,8 @@
+// Add an alpha channel to a hex color, returning an rgba() string.
+export const addAlpha = (hexColor, alpha) => {
+    const hex = hexColor.replace('#', '');
+    const r = parseInt(hex.substring(0, 2), 16);
+    const g = parseInt(hex.substring(2, 4), 16);
+    const b = parseInt(hex.substring(4, 6), 16);
+    return `rgba(${r}, ${g}, ${b}, ${alpha})`;
+};

package/libraries/notifications/index.js

@@ -13,7 +13,13 @@
  */
 
 import React from 'react';
-import messaging from '@react-native-firebase/messaging';
+import {
+    getMessaging,
+    setBackgroundMessageHandler,
+    onMessage,
+    unregisterDeviceForRemoteMessages,
+    AuthorizationStatus,
+} from '@react-native-firebase/messaging';
 
 import notifee, { AndroidStyle, EventType } from '@notifee/react-native';
 import { feedApi, RootNavigation, store, updateFeeds } from '../core';
@@ -44,7 +50,7 @@ export default class OpenASiSTNotifications {
      * Important: This function must be called as soon as possible! (Before app initialization)
      */
     initBackgroundHandler() {
-        messaging().setBackgroundMessageHandler(async remoteMessage => {
+        setBackgroundMessageHandler(getMessaging(), async remoteMessage => {
             await this.createNotification(remoteMessage);
         });
 
@@ -61,7 +67,7 @@ export default class OpenASiSTNotifications {
             await this.subscriberService.initializeSubscriber();
 
             // Listen for new Messages while the app is in foreground
-            messaging().onMessage(async remoteMessage => {
+            onMessage(getMessaging(), async remoteMessage => {
                 await this.createNotification(remoteMessage);
             });
 
@@ -73,7 +79,7 @@ export default class OpenASiSTNotifications {
 
     unregister() {
         // Unregister the user device from firebase
-        messaging().unregisterDeviceForRemoteMessages().then(() => {/* Unregistered */});
+        unregisterDeviceForRemoteMessages(getMessaging()).then(() => {/* Unregistered */});
         notifee.cancelAllNotifications().then(() => {/* Cancelled all notifications */});
     }
 
@@ -128,8 +134,8 @@ export default class OpenASiSTNotifications {
         });
 
         const enabled =
-            authStatus === messaging.AuthorizationStatus.AUTHORIZED ||
-            authStatus === messaging.AuthorizationStatus.PROVISIONAL;
+            authStatus === AuthorizationStatus.AUTHORIZED ||
+            authStatus === AuthorizationStatus.PROVISIONAL;
 
         await notifee.requestPermission({
             criticalAlert: true

package/libraries/notifications/services/subscriber.service.js

@@ -1,5 +1,11 @@
 import uuid from 'react-native-uuid';
-import messaging from '@react-native-firebase/messaging';
+import {
+    getMessaging,
+    isDeviceRegisteredForRemoteMessages,
+    registerDeviceForRemoteMessages,
+    getToken,
+    onTokenRefresh,
+} from '@react-native-firebase/messaging';
 import debounce from 'lodash/debounce';
 
 import { store } from '../../core';
@@ -32,8 +38,9 @@ export default class SubscriberService {
      */
     async initializeSubscriber() {
         this.subscriberId = this.getSubscriberId();
-        if(!messaging().isDeviceRegisteredForRemoteMessages) {
-            await messaging().registerDeviceForRemoteMessages();
+        const messaging = getMessaging();
+        if(!isDeviceRegisteredForRemoteMessages(messaging)) {
+            await registerDeviceForRemoteMessages(messaging);
         }
         const token = await this.getFCMToken();
 
@@ -66,7 +73,7 @@ export default class SubscriberService {
      * @returns {Promise<void>}
      */
     async getFCMToken() {
-        return await messaging().getToken();
+        return await getToken(getMessaging());
     }
 
 
@@ -92,7 +99,7 @@ export default class SubscriberService {
 
         // Listen for Token updates
         if(!skipRefresh) {
-            messaging().onTokenRefresh(newToken => {
+            onTokenRefresh(getMessaging(), newToken => {
                 this.upsertSubscriber(newToken, true);
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olea-bps/base",
-  "version": "1.0.5",
+  "version": "1.1.1",
   "description": "OLEA base library",
   "main": "index.js",
   "repository": {
@@ -30,34 +30,34 @@
     "@notifee/react-native": "^9.1.8",
     "@novu/client": "^2.6.6",
     "@react-native-async-storage/async-storage": "~2.2.0",
-    "@react-native-community/netinfo": "^11.4.1",
-    "@react-native-firebase/app": "^22.2.0",
-    "@react-native-firebase/messaging": "^22.2.0",
+    "@react-native-community/netinfo": "12.0.1",
+    "@react-native-firebase/app": "^24.0.0",
+    "@react-native-firebase/messaging": "^24.0.0",
     "@react-navigation/drawer": "^7.3.12",
     "@react-navigation/native": "^7.1.9",
-    "expo-application": "~7.0.8",
-    "expo-auth-session": "~7.0.11",
-    "expo-crypto": "~15.0.9",
-    "expo-linear-gradient": "~15.0.7",
-    "expo-web-browser": "~15.0.10",
+    "expo-application": "~56.0.3",
+    "expo-auth-session": "~56.0.12",
+    "expo-crypto": "~56.0.4",
+    "expo-linear-gradient": "~56.0.4",
+    "expo-web-browser": "~56.0.5",
     "jwt-decode": "4.0.0",
     "moment": "^2.29.4",
     "react-native-elements": "^3.4.3",
     "react-native-modalbox": "^2.0.2",
-    "react-native-paper": "^5.14.5",
+    "react-native-paper": "^5.15.2",
     "react-native-svg": "15.15.4",
     "react-native-swipe-gestures": "^1.0.5",
     "react-native-tab-view": "^4.1.3",
     "react-native-uuid": "^2.0.3",
     "react-native-vector-icons": "^10.2.0",
-    "react-native-webview": "13.16.0",
+    "react-native-webview": "13.16.1",
     "react-redux": "^9.2.0",
     "redux": "^4.0.5",
     "redux-persist": "^6.0.0"
   },
   "peerDependencies": {
     "react": "^19.0.0",
-    "react-native": "^0.81.0",
+    "react-native": "^0.85.0",
     "react-native-paper": "^5.0.0",
     "react-redux": "^9.2.0",
     "redux": "^4.0.5"