Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: fix ui

Ammar Ahmede62891b9c00a
diff --git a/apps/mobile/app/components/side-menu/notebook-item.tsx b/apps/mobile/app/components/side-menu/notebook-item.tsx
index eefa4d322..0e0010425 100644
--- a/apps/mobile/app/components/side-menu/notebook-item.tsx
+++ b/apps/mobile/app/components/side-menu/notebook-item.tsx
@@ -79,6 +79,7 @@ export const NotebookItem = ({
useEffect(() => {
const onNotebookUpdate = (id?: string) => {
if (id && id !== notebook.id) return;
+ getTotalNotesRef.current([item.notebook.id]);
onItemUpdate(id);
};
@@ -86,7 +87,7 @@ export const NotebookItem = ({
return () => {
eUnSubscribeEvent(eOnNotebookUpdated, onNotebookUpdate);
};
- }, [notebook.id, onItemUpdate]);
+ }, [item.notebook.id, notebook.id, onItemUpdate]);
return (
<View
diff --git a/apps/mobile/app/hooks/use-actions.tsx b/apps/mobile/app/hooks/use-actions.tsx
index 5bbf7f7e1..1975379e0 100644
--- a/apps/mobile/app/hooks/use-actions.tsx
+++ b/apps/mobile/app/hooks/use-actions.tsx
@@ -533,7 +533,7 @@ export const useActions = ({
},
{
id: "move-notes",
- title: strings.linkNotes(),
+ title: strings.addNotes(),
hidden: item.type !== "notebook",
icon: "text",
onPress: () => {
diff --git a/apps/mobile/app/screens/move-notes/index.tsx b/apps/mobile/app/screens/move-notes/index.tsx
index bd6a4cd35..fe208c11f 100644
--- a/apps/mobile/app/screens/move-notes/index.tsx
+++ b/apps/mobile/app/screens/move-notes/index.tsx
@@ -21,8 +21,7 @@ import { Note, Notebook, VirtualizedGrouping } from "@notesnook/core";
import { strings } from "@notesnook/intl";
import { useThemeColors } from "@notesnook/theme";
import React, { useEffect, useRef, useState } from "react";
-import { ActivityIndicator, TextInput, View } from "react-native";
-import { FlashList } from "react-native-actions-sheet/dist/src/views/FlashList";
+import { ActivityIndicator, FlatList, TextInput, View } from "react-native";
import { SafeAreaView } from "react-native-safe-area-context";
import { db } from "../../common/database";
import { FloatingButton } from "../../components/container/floating-button";
@@ -117,12 +116,12 @@ export const MoveNotes = (props: NavigationProps<"MoveNotes">) => {
backgroundColor: colors.primary.background
}}
>
- <Header title={strings.linkNotes()} canGoBack />
+ <Header title={strings.addNotes()} canGoBack />
<View
style={{
paddingHorizontal: DefaultAppStyles.GAP,
- flex: 1,
+ flexGrow: 1,
gap: DefaultAppStyles.GAP_VERTICAL
}}
>
@@ -136,7 +135,12 @@ export const MoveNotes = (props: NavigationProps<"MoveNotes">) => {
testID="search-input"
fwdRef={inputRef}
wrapperStyle={{
- marginBottom: 0
+ marginBottom: 0,
+ flexShrink: 1
+ }}
+ flexGrow={0}
+ containerStyle={{
+ flexGrow: 0
}}
autoCapitalize="none"
onChangeText={(v) => {
@@ -153,7 +157,7 @@ export const MoveNotes = (props: NavigationProps<"MoveNotes">) => {
}}
/>
- <FlashList
+ <FlatList
ListEmptyComponent={
<View
style={{
@@ -171,7 +175,9 @@ export const MoveNotes = (props: NavigationProps<"MoveNotes">) => {
)}
</View>
}
- estimatedItemSize={50}
+ style={{
+ flexGrow: 1
+ }}
data={loading ? [] : notes?.placeholders}
renderItem={renderItem}
/>