diff --git a/apps/mobile/app/components/container/floating-button.tsx b/apps/mobile/app/components/container/floating-button.tsx
index 4baef0bc5..de3d5f6ce 100644
--- a/apps/mobile/app/components/container/floating-button.tsx
+++ b/apps/mobile/app/components/container/floating-button.tsx
@@ -36,6 +36,7 @@ import { getElevationStyle } from "../../utils/elevation";
import { AppFontSize, normalize } from "../../utils/size";
import { DefaultAppStyles } from "../../utils/styles";
import { hexToRGBA, RGB_Linear_Shade } from "../../utils/colors";
+import AppIcon from "../ui/AppIcon";
interface FloatingButtonProps {
onPress: () => void;
@@ -140,7 +141,7 @@ const FloatingButton = ({
borderBottomWidth: 0,
borderLeftWidth: 0,
borderRightWidth: 0,
- backgroundColor: colors.primary.background
+ backgroundColor: colors.primary.accent
}}
onPress={onPress}
>
@@ -148,26 +149,19 @@ const FloatingButton = ({
style={{
alignItems: "center",
justifyContent: "center",
- height: normalize(size === "small" ? 40 : 60),
- width: normalize(size === "small" ? 40 : 60),
+ height: 55,
+ width: 55,
backgroundColor: color
? RGB_Linear_Shade(0.87, hexToRGBA(color))
- : colors.primary.shade,
+ : colors.primary.accent,
borderRadius: size === "small" ? 15 : 20
}}
>
-
diff --git a/apps/mobile/app/components/list-items/headers/section-header.tsx b/apps/mobile/app/components/list-items/headers/section-header.tsx
index 620b6692b..c2191e603 100644
--- a/apps/mobile/app/components/list-items/headers/section-header.tsx
+++ b/apps/mobile/app/components/list-items/headers/section-header.tsx
@@ -82,7 +82,7 @@ export const SectionHeader = React.memo<
width: "100%",
paddingHorizontal: Spacing.LEVEL_3,
marginBottom: Spacing.LEVEL_3,
- marginTop: Spacing.LEVEL_3
+ marginTop: index === 0 ? 0 : Spacing.LEVEL_3
}}
>
{!item.title || item.title === ""
? screen === "Search"
@@ -180,6 +181,7 @@ export const SectionHeader = React.memo<
: "normal"
});
}}
+ type={isCompactModeEnabled ? "shade" : undefined}
size={16}
/>
>
diff --git a/apps/mobile/app/components/list-items/note/index.tsx b/apps/mobile/app/components/list-items/note/index.tsx
index 012cdb4af..343ba3159 100644
--- a/apps/mobile/app/components/list-items/note/index.tsx
+++ b/apps/mobile/app/components/list-items/note/index.tsx
@@ -381,7 +381,7 @@ const NoteItem = ({
{decode(item.headline, {
@@ -492,21 +493,24 @@ const NoteItem = ({
{compactMode ? null : (
{getFormattedDate(
date,
diff --git a/apps/mobile/app/components/list-items/selection-wrapper/index.tsx b/apps/mobile/app/components/list-items/selection-wrapper/index.tsx
index 5f91ea5ca..dcf5c610b 100644
--- a/apps/mobile/app/components/list-items/selection-wrapper/index.tsx
+++ b/apps/mobile/app/components/list-items/selection-wrapper/index.tsx
@@ -73,7 +73,6 @@ const SelectionWrapper = ({
return (
@@ -87,16 +86,19 @@ const SelectionWrapper = ({
customAlpha={!isDark ? -0.02 : 0.02}
customOpacity={1}
style={{
- width: "100%",
- alignSelf: "center",
- overflow: "hidden",
- paddingHorizontal: Spacing.LEVEL_3,
- borderRadius: 0,
- alignItems: "flex-start",
- // paddingVertical: Spacing.LEVEL_2,
- paddingTop: Spacing.LEVEL_2
+ paddingHorizontal: Spacing.LEVEL_3
}}
>
+ {hasGroupHeader ? null : (
+
+ )}
{children}
-
);
diff --git a/apps/mobile/app/components/list/card.tsx b/apps/mobile/app/components/list/card.tsx
index a3197234a..8c90314b2 100644
--- a/apps/mobile/app/components/list/card.tsx
+++ b/apps/mobile/app/components/list/card.tsx
@@ -49,8 +49,7 @@ export const Card = ({
style={{
width: "100%",
paddingHorizontal: Spacing.LEVEL_3,
- marginBottom: Spacing.LEVEL_4,
- marginTop: Spacing.LEVEL_3
+ marginBottom: Spacing.LEVEL_4
}}
>
{
flexDirection: "row",
width: "100%",
justifyContent: "space-between",
+ paddingHorizontal: isSelectionEnabled ? Spacing.LEVEL_5 : 0,
backgroundColor: colors.primary.background,
borderTopWidth: 1,
borderTopColor: colors.primary.separator,
@@ -439,7 +441,11 @@ const TabBar = (props: SimpleTabBarProps) => {
name: "title",
placeholder: "eg. journal",
ref: React.createRef(),
- validators: [validators.required(strings.allFieldsRequired())]
+ validators: [
+ validators.required(
+ strings.allFieldsRequired()
+ )
+ ]
}
],
onFormSubmit: async (form) => {
@@ -451,7 +457,10 @@ const TabBar = (props: SimpleTabBarProps) => {
useTagStore.getState().refresh();
return true;
} catch (e) {
- form.setError("title", (e as Error).message);
+ form.setError(
+ "title",
+ (e as Error).message
+ );
return false;
}
}
diff --git a/apps/mobile/app/components/side-menu/side-menu-tags.tsx b/apps/mobile/app/components/side-menu/side-menu-tags.tsx
index efdd50bc2..a139bdc1c 100644
--- a/apps/mobile/app/components/side-menu/side-menu-tags.tsx
+++ b/apps/mobile/app/components/side-menu/side-menu-tags.tsx
@@ -76,7 +76,7 @@ const TagItem = (props: {
>
{item ? (
{
Properties.present(item, false, [
{
@@ -147,21 +147,16 @@ const TagItem = (props: {
{enabled ? (
-
-
-
+
) : (
<>
{item?.id && totalNotes.totalNotes?.(item?.id) !== undefined ? (
@@ -322,9 +317,9 @@ export const SideMenuTags = () => {
style={{
width: "100%",
backgroundColor: colors.primary.background,
- borderTopColor: colors.primary.border,
+ borderTopColor: colors.primary.separator,
borderTopWidth: 1,
- paddingVertical: DefaultAppStyles.GAP_VERTICAL,
+ paddingVertical: Spacing.LEVEL_2,
flexDirection: "row",
justifyContent: "space-between"
}}
diff --git a/apps/mobile/app/components/ui/icon-button/index.tsx b/apps/mobile/app/components/ui/icon-button/index.tsx
index c6ed9bebc..c70b58350 100644
--- a/apps/mobile/app/components/ui/icon-button/index.tsx
+++ b/apps/mobile/app/components/ui/icon-button/index.tsx
@@ -53,10 +53,10 @@ export const IconButton = ({
style,
size = AppFontSize.xxl,
iconStyle = {},
- left = 10,
- right = 10,
- top = 30,
- bottom = 10,
+ left = 4,
+ right = 4,
+ top = 4,
+ bottom = 4,
onLongPress,
tooltipText,
type = "plain",
diff --git a/apps/mobile/app/hooks/use-actions.tsx b/apps/mobile/app/hooks/use-actions.tsx
index 2907ae2fd..0c40f51ad 100644
--- a/apps/mobile/app/hooks/use-actions.tsx
+++ b/apps/mobile/app/hooks/use-actions.tsx
@@ -416,6 +416,10 @@ export const useActions = ({
presentDialog({
title: strings.doActions.delete.unknown(item.type, 1),
paragraph: strings.actionConfirmations.delete.unknown(item.type, 1),
+ icon: "warning-circle",
+ centered: true,
+ iconFamily: "notesnook",
+ iconType: "error",
positivePress: async () => {
if (item.type === "reminder") {
await db.reminders.remove(item.id);
@@ -434,7 +438,7 @@ export const useActions = ({
});
},
positiveText: strings.delete(),
- positiveType: "errorShade"
+ positiveType: "accent"
});
return;
}
diff --git a/apps/mobile/app/screens/home/index.tsx b/apps/mobile/app/screens/home/index.tsx
index b8d220aee..4b7cf5d5e 100755
--- a/apps/mobile/app/screens/home/index.tsx
+++ b/apps/mobile/app/screens/home/index.tsx
@@ -31,6 +31,7 @@ import useNavigationStore from "../../stores/use-navigation-store";
import { useNotes } from "../../stores/use-notes-store";
import { openEditor } from "../notes/common";
import LineSeparator from "../../components/ui/seperator/line-separator";
+import { Spacing } from "../../common/design/spacing";
export const Home = ({ navigation, route }: NavigationProps<"Notes">) => {
const [notes, loading] = useNotes();
@@ -67,7 +68,7 @@ export const Home = ({ navigation, route }: NavigationProps<"Notes">) => {
onPressDefaultRightButton={openEditor}
/>
-
+
{
await db.tags.remove(...itemIds);
useTagStore.getState().refresh();