Revize f22a2126

FIX: colors fix
re #10896

src/pages/NotesViewPage.tsx

@@ -1 +1 @@
 import React, { useCallback, useEffect, useState } from "react"
 import { log } from "../logging/logger"
 import { DrawerScreenProps } from "@react-navigation/drawer"
-import { Box, Button, ChevronDownIcon, ChevronUpIcon, Flex, HStack, MinusIcon, Popover, Switch, Text, VStack, useToast } from "native-base"
+import {
+  Box,
+  Button,
+  ChevronDownIcon,
+  ChevronUpIcon,
+  Flex,
+  HStack,
+  MinusIcon,
+  Popover,
+  Switch,
+  Text,
+  VStack,
+  useToast,
+  KeyboardAvoidingView
+} from "native-base"
 import { SortOptions } from "../types/general"
 import { Note } from "../types/note"
 import NotesListView from "../components/notes/NotesListView"
@@ -13 +27 @@
 import { ErrorToast } from "../components/toast/ErrorToast"
 import { InfoToast } from "../components/toast/InfoToast"
 
-import { Dimensions } from "react-native";
+import {Dimensions, Platform} from "react-native";
 
 const NotesViewPage = ({ navigation }: DrawerScreenProps<RootStackParamList, 'Notes'>) => {
 
@@ -143 +157 @@
 
 
   return (
-    <Box>
-      <VStack>
-        <Flex direction="row" align="flex-start" justifyContent="space-between" marginTop={1} marginLeft={2.5} marginRight={2.5}>
-          <Text fontWeight="semibold" mt={3} ml={2} fontSize="md" color="#4D4D4D">General comments</Text>
-          <Switch isChecked={generalCommentsCheck} onValueChange={() => { if (!notesLoading) setGeneralCommentsCheck(!generalCommentsCheck) }} size="lg" marginRight={2} />
-        </Flex>
-        <Flex direction="row" align="flex-start" justifyContent="space-between" marginTop={-1} marginLeft={2.5} marginRight={2.5}>
-          <Text fontWeight="semibold" mt={3} ml={2} fontSize="md" color="#4D4D4D">My comments</Text>
-          <Switch padding={0} isChecked={myCommentsCheck} onValueChange={() => { if (!notesLoading) setMyCommentsCheck(!myCommentsCheck) }} size="lg" marginRight={2} />
-        </Flex>
-        <Popover // @ts-ignore
-          trigger={triggerProps => {
-            return <Button marginLeft={4} marginBottom={2} width={150} backgroundColor="#F4DFAB" {...triggerProps} onPress={() => setIsSortOpen(true)}
-              borderRadius={7}
-              rightIcon={(sortSettings.date != SortOptions.None || sortSettings.items != SortOptions.None) ? (getSortIcon(sortSettings.date != SortOptions.None ? sortSettings.date : sortSettings.items, "xs", "#654B07")) : undefined}
-            >
-              <Text fontSize={14} color="#654B07">
-                Sort {(sortSettings.date != SortOptions.None || sortSettings.items != SortOptions.None) ? (sortSettings.date != SortOptions.None ? "by date" : "by items") : ""}
-              </Text>
-            </Button>;
-          }} isOpen={isSortOpen} onClose={() => setIsSortOpen(!isSortOpen)}>
-          <Popover.Content w="48">
-            <Popover.Arrow />
-            <Popover.CloseButton onPress={() => setIsSortOpen(false)} />
-            <Popover.Header><Text fontSize={"md"} color="#654B07">Sort Options</Text></Popover.Header>
-            <Popover.Body>
-              <VStack>
-                <Button size="md" variant="outline" onPress={() => handleSortChanged("items", sortSettings)}
-                  rightIcon={getSortIcon(sortSettings.items, "sm", "#654B07")}
+
+        <Box>
+          <VStack>
+            <Flex direction="row" align="flex-start" justifyContent="space-between" marginTop={1} marginLeft={2.5} marginRight={2.5}>
+              <Text fontWeight="semibold" mt={3} ml={2} fontSize="md" color="primary.500">General comments</Text>
+              <Switch isChecked={generalCommentsCheck} onValueChange={() => { if (!notesLoading) setGeneralCommentsCheck(!generalCommentsCheck) }} size="md" marginRight={2} />
+            </Flex>
+            <Flex direction="row" align="flex-start" justifyContent="space-between" marginTop={0} marginLeft={2.5} marginRight={2.5}>
+              <Text fontWeight="semibold" mt={3} ml={2} fontSize="md" color="primary.500" >My comments</Text>
+              <Switch padding={0} isChecked={myCommentsCheck} onValueChange={() => { if (!notesLoading) setMyCommentsCheck(!myCommentsCheck) }} size="md" marginRight={2} />
+            </Flex>
+            <Popover // @ts-ignore
+              trigger={triggerProps => {
+                return <Button marginLeft={4} marginBottom={2} width={150} backgroundColor="secondary.500" {...triggerProps} onPress={() => setIsSortOpen(true)}
+                  borderRadius={7}
+                  rightIcon={(sortSettings.date != SortOptions.None || sortSettings.items != SortOptions.None) ? (getSortIcon(sortSettings.date != SortOptions.None ? sortSettings.date : sortSettings.items, "xs", "primary.500")) : undefined}
                 >
-                  Items</Button>
-                <Button size="md" variant="outline" marginTop={"5%"} onPress={() => handleSortChanged("date", sortSettings)}
-                  rightIcon={getSortIcon(sortSettings.date, "sm", "#654B07")}>
-                  Date</Button>
-              </VStack>
-            </Popover.Body>
-            <Popover.Footer justifyContent="flex-end">
-              <Button.Group space={2}>
-                <Button colorScheme="coolGray" variant="ghost" onPress={() => setIsSortOpen(false)}>
-                  Cancel
-                </Button>
-                <Button backgroundColor={"#F4DFAB"} onPress={() => { setIsSortOpen(false); getNotes() }}>
-                  <Text color="#654B07">
-                    Save
+                  <Text fontSize={14} color="primary.500">
+                    Sort {(sortSettings.date != SortOptions.None || sortSettings.items != SortOptions.None) ? (sortSettings.date != SortOptions.None ? "by date" : "by items") : ""}
                   </Text>
-                </Button>
-              </Button.Group>
-            </Popover.Footer>
-          </Popover.Content>
-        </Popover>
-        {
-          notesLoading ? (
-            <LoadingBox text="Loading notes" />
-          )
-            :
-            (<NotesListView height={Dimensions.get('window').height - 307} notes={notes} navigation={navigation} handleCreateComment={handleCreateComment} requestPending={requestPending} />)
-        }
-
-
-      </VStack>
-    </Box>
+                </Button>;
+              }} isOpen={isSortOpen} onClose={() => setIsSortOpen(!isSortOpen)}>
+              <Popover.Content w="48">
+                <Popover.Arrow />
+                <Popover.CloseButton onPress={() => setIsSortOpen(false)} />
+                <Popover.Header><Text fontSize={"md"} color="primary.500">Sort Options</Text></Popover.Header>
+                <Popover.Body>
+                  <VStack>
+                    <Button size="md" variant="outline" onPress={() => handleSortChanged("items", sortSettings)}
+                      rightIcon={getSortIcon(sortSettings.items, "sm", "primary.500")}
+                    >
+                      Items</Button>
+                    <Button size="md" variant="outline" marginTop={"5%"} onPress={() => handleSortChanged("date", sortSettings)}
+                      rightIcon={getSortIcon(sortSettings.date, "sm", "primary.500")}>
+                      Date</Button>
+                  </VStack>
+                </Popover.Body>
+                <Popover.Footer justifyContent="flex-end">
+                  <Button.Group space={2}>
+                    <Button colorScheme="coolGray" variant="ghost" onPress={() => setIsSortOpen(false)}>
+                      Cancel
+                    </Button>
+                    <Button backgroundColor={"secondary.500"} onPress={() => { setIsSortOpen(false); getNotes() }}>
+                      <Text color="primary.500">
+                        Save
+                      </Text>
+                    </Button>
+                  </Button.Group>
+                </Popover.Footer>
+              </Popover.Content>
+            </Popover>
+            {
+              notesLoading ? (
+                <LoadingBox text="Loading notes" />
+              )
+                :
+                (<NotesListView height={Dimensions.get('window').height - 400} notes={notes} navigation={navigation} handleCreateComment={handleCreateComment} requestPending={requestPending} />)
+            }
+
+
+          </VStack>
+        </Box>
   );
 }