diff --git a/App.tsx b/App.tsx
index dae6c03..337f8e9 100755
--- a/App.tsx
+++ b/App.tsx
@@ -18,11 +18,12 @@ import { Tariff } from "./types/tariff";
import { CloseButton } from "./components/header/closeButton";
import { DetailHeader } from "./components/detail/detailHeader";
-import { useFetchAppData } from "./hooks/fetchAppData";
+import { useFetchAppData } from "./hooks/usefetchAppData";
import { useCustomFonts } from "./hooks/customFont";
import { scale } from "react-native-size-matters";
import { FeedbackView } from "./screens/feedbackView";
import { ToastNotification } from "./components/detail/feedbackView/toastNotification";
+import { useAopMetrics } from "./hooks/useAppMetrics";
const queryClient = new QueryClient();
const RootStack = createStackNavigator();
@@ -46,7 +47,7 @@ function AppWrapper(): JSX.Element {
useEffect(() => {
const subscription = AppState.addEventListener(
"change",
- onAppStateChange
+ onAppStateChange,
);
return () => {
@@ -55,6 +56,7 @@ function AppWrapper(): JSX.Element {
}, [onAppStateChange]);
useFetchAppData();
+ useAopMetrics();
const fontLoaded = useCustomFonts();
if (!fontLoaded) {
diff --git a/app.json b/app.json
index 13a7595..2fa4095 100755
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
"expo": {
"name": "Ladefuchs",
"slug": "ladefuchs",
- "version": "2.2.0",
+ "version": "2.2.2",
"orientation": "portrait",
"scheme": "com.ladefuchs.app",
"icon": "./assets/fuchs/app_icon.png",
@@ -14,7 +14,7 @@
},
"assetBundlePatterns": ["**/*"],
"ios": {
- "buildNumber": "17",
+ "buildNumber": "5",
"supportsTablet": false,
"jsEngine": "jsc",
"bundleIdentifier": "app.ladefuchs.Ladefuchs",
@@ -33,7 +33,7 @@
"resizeMode": "contain",
"backgroundColor": "#F3EEE2"
},
- "versionCode": 237,
+ "versionCode": 238,
"adaptiveIcon": {
"foregroundImage": "./assets/fuchs/android_logo.png",
"backgroundColor": "#F3EEE2"
diff --git a/components/detail/detailHeader.tsx b/components/detail/detailHeader.tsx
index e979a20..aa37489 100644
--- a/components/detail/detailHeader.tsx
+++ b/components/detail/detailHeader.tsx
@@ -23,7 +23,10 @@ export function DetailHeader({ tariff, navigation }: Props): JSX.Element {
{tariff.providerName}
- navigation.goBack()} />
+ navigation.goBack()}
+ backgroundColor={colors.ladefuchsDarkBackground}
+ />
);
diff --git a/components/header/appHeader.tsx b/components/header/appHeader.tsx
index b8fd661..2422cd7 100644
--- a/components/header/appHeader.tsx
+++ b/components/header/appHeader.tsx
@@ -19,11 +19,6 @@ export function AppHeader(): JSX.Element {
const navigation = useNavigation();
const reloadBanner = useAppStore((state) => state.reloadBanner);
- const handleLongPress = () => {
- console.log("handleLongPress reloadBanner");
- reloadBanner();
- };
-
return (
reloadBanner()}
>
diff --git a/components/header/closeButton.tsx b/components/header/closeButton.tsx
index 8c0cb65..fc046d5 100644
--- a/components/header/closeButton.tsx
+++ b/components/header/closeButton.tsx
@@ -1,27 +1,38 @@
import { TouchableOpacity, ViewStyle, View } from "react-native";
import Svg, { Path } from "react-native-svg";
import { colors } from "../../theme";
+import React from "react";
+import { scale } from "react-native-size-matters";
interface Props {
onPress: () => void;
+ backgroundColor?: string;
style?: ViewStyle;
}
-export function CloseButton({ onPress, style }: Props): JSX.Element {
+export function CloseButton({
+ onPress,
+ style,
+ backgroundColor = colors.ladefuchsDarkGrayBackground,
+}: Props): JSX.Element {
+ const size = scale(19);
return (
-