diff --git a/apps/mobile/android/app/build.gradle b/apps/mobile/android/app/build.gradle index 4d204b579..b09ee995d 100644 --- a/apps/mobile/android/app/build.gradle +++ b/apps/mobile/android/app/build.gradle @@ -140,7 +140,7 @@ android { if (project.hasProperty("prBuildNumber")) { versionCode Integer.parseInt(prBuildNumber()) } else { - versionCode 3102 + versionCode 3103 } versionName getNpmVersion() testBuildType System.getProperty('testBuildType', 'debug') 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 add087e23..de9b3f0cb 100644 --- a/apps/mobile/app/components/list-items/headers/section-header.tsx +++ b/apps/mobile/app/components/list-items/headers/section-header.tsx @@ -47,6 +47,7 @@ type SectionHeaderProps = { groupOptions: GroupOptions; group: GroupingKey; onOpenJumpToDialog: () => void; + itemCount?: number; }; export const SectionHeader = React.memo< @@ -60,13 +61,16 @@ export const SectionHeader = React.memo< screen, groupOptions, group, - onOpenJumpToDialog + onOpenJumpToDialog, + itemCount }: SectionHeaderProps) { const { colors } = useThemeColors(); const isCompactModeEnabled = useIsCompactModeEnabled( dataType as "note" | "notebook" | "searchResult" ); + console.log(item); + return ( {!item.title || item.title === "" - ? strings.pinned().toUpperCase() + ? screen === "Search" + ? strings.results(itemCount || 0) + : strings.pinned().toUpperCase() : item.title.toUpperCase()} @@ -202,6 +208,7 @@ export const SectionHeader = React.memo< }, (prev, next) => { if (prev.item.title !== next.item.title) return false; + if (prev.itemCount !== next.itemCount) return false; if (prev.groupOptions?.groupBy !== next.groupOptions.groupBy) return false; if (prev.groupOptions?.sortDirection !== next.groupOptions.sortDirection) return false; diff --git a/apps/mobile/app/components/list/list-item.wrapper.tsx b/apps/mobile/app/components/list/list-item.wrapper.tsx index 7243d6f53..be5ce74e0 100644 --- a/apps/mobile/app/components/list/list-item.wrapper.tsx +++ b/apps/mobile/app/components/list/list-item.wrapper.tsx @@ -305,6 +305,7 @@ export function ListItemWrapper(props: ListItemWrapperProps) { dataType={item.type} color={props.customAccentColor} groupOptions={groupOptions} + itemCount={items?.placeholders.length} onOpenJumpToDialog={() => { eSendEvent(eOpenJumpToDialog, { ref: props.scrollRef, diff --git a/apps/mobile/ios/build-configs/ios-build.active.xcconfig b/apps/mobile/ios/build-configs/ios-build.active.xcconfig index 434b2f3ac..c43e701d0 100644 --- a/apps/mobile/ios/build-configs/ios-build.active.xcconfig +++ b/apps/mobile/ios/build-configs/ios-build.active.xcconfig @@ -1,6 +1,6 @@ // Production iOS build identifiers -IOS_CURRENT_PROJECT_VERSION = 2181 -IOS_MARKETING_VERSION = 3.3.21 +IOS_CURRENT_PROJECT_VERSION = 2182 +IOS_MARKETING_VERSION = 3.3.22 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share diff --git a/apps/mobile/ios/build-configs/ios-build.production.xcconfig b/apps/mobile/ios/build-configs/ios-build.production.xcconfig index 434b2f3ac..c43e701d0 100644 --- a/apps/mobile/ios/build-configs/ios-build.production.xcconfig +++ b/apps/mobile/ios/build-configs/ios-build.production.xcconfig @@ -1,6 +1,6 @@ // Production iOS build identifiers -IOS_CURRENT_PROJECT_VERSION = 2181 -IOS_MARKETING_VERSION = 3.3.21 +IOS_CURRENT_PROJECT_VERSION = 2182 +IOS_MARKETING_VERSION = 3.3.22 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share diff --git a/apps/mobile/ios/build-configs/ios-build.staging.xcconfig b/apps/mobile/ios/build-configs/ios-build.staging.xcconfig index 0a50b72f7..ebddfea0f 100644 --- a/apps/mobile/ios/build-configs/ios-build.staging.xcconfig +++ b/apps/mobile/ios/build-configs/ios-build.staging.xcconfig @@ -1,6 +1,6 @@ // Staging iOS build identifiers -IOS_CURRENT_PROJECT_VERSION = 2181 -IOS_MARKETING_VERSION = 3.3.21 +IOS_CURRENT_PROJECT_VERSION = 2182 +IOS_MARKETING_VERSION = 3.3.22 IOS_MAIN_BUNDLE_ID = org.streetwriters.notesnook IOS_WIDGET_BUNDLE_ID = org.streetwriters.notesnook.notewidget IOS_SHARE_BUNDLE_ID = org.streetwriters.notesnook.share diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 5f6135d74..748d71929 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@notesnook/mobile", - "version": "3.3.21", + "version": "3.3.22", "private": true, "license": "GPL-3.0-or-later", "scripts": { diff --git a/fastlane/metadata/android/en-US/changelogs/15514.txt b/fastlane/metadata/android/en-US/changelogs/15514.txt new file mode 100644 index 000000000..3aaf71b15 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/15514.txt @@ -0,0 +1,3 @@ +- Bug fixes and improvements + +Thank you for using Notesnook! diff --git a/packages/core/src/api/lookup.ts b/packages/core/src/api/lookup.ts index d2506a17e..d1ae43f00 100644 --- a/packages/core/src/api/lookup.ts +++ b/packages/core/src/api/lookup.ts @@ -273,7 +273,7 @@ export default class Lookup { ); matches.ids = matches.values.map((c) => c.id); } else { - const sortedNoteIds = await this.db.notes.all + const sortedNoteIds = await this.db.notes.exportable .fields(["notes.id"]) .items(matches.ids, sortOptions); const sorted: Matches = { ids: [], values: [] };