diff --git a/App.tsx b/App.tsx index d224ea19..59c829d5 100644 --- a/App.tsx +++ b/App.tsx @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ import React, { useEffect, useRef, useState } from "react" -import { NavigationContainer } from "@react-navigation/native" +import { NavigationContainer, DefaultTheme } from "@react-navigation/native" import { hideAsync } from "expo-splash-screen" import { useFonts } from "@expo-google-fonts/roboto" import { @@ -20,10 +20,12 @@ import { LoginContext, LoginState } from "contexts/login" import { SettingsContext, Settings } from "contexts/settings" import { useLoadTokens } from "utils/loadTokens" import { HttpClient } from "api/HttpClient" +import { usePalette } from "utils/colors" const client = HttpClient.getInstance() export default function App() { + const { homeBackground } = usePalette() const [settingsReady, setSettingsReady] = useState(false) const [settings, setSettings] = useState({ theme: "predefined", @@ -130,7 +132,15 @@ export default function App() { if (!settingsReady || !fontsLoaded || !tokensLoaded) return null return ( - + = ({ filter }) => { key={"menu_add_row" + i} style={{ flexDirection: "row", - marginVertical: 2, + marginVertical: 6, width: 288, }} > diff --git a/src/components/Home/MenuButton.tsx b/src/components/Home/MenuButton.tsx index 1ba96572..93bd04bf 100644 --- a/src/components/Home/MenuButton.tsx +++ b/src/components/Home/MenuButton.tsx @@ -85,7 +85,7 @@ export const MenuButton: FC<{ justifyContent: "space-between", alignItems: "center", borderRadius: 10, - marginTop: 8, //added margin to the top due to the deleting operation + marginTop: 15, //added margin to the top due to the deleting operation }} > @@ -111,31 +111,29 @@ export const MenuButton: FC<{ {isDeleting && buttonIcon.id !== 9 && ( { onDelete && onDelete() }} + hitSlop={10} > - - - {delIcon && ( - - )} - - + + {delIcon && ( + + )} + )} diff --git a/src/components/Home/PoliSearchBar.tsx b/src/components/Home/PoliSearchBar.tsx index d5ec1624..4de04f47 100644 --- a/src/components/Home/PoliSearchBar.tsx +++ b/src/components/Home/PoliSearchBar.tsx @@ -38,7 +38,7 @@ export const PoliSearchBar: FC<{