Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mobile: Resolves #10092: Added empty trash option on long pressing the trash folder. #10120

Merged
merged 13 commits into from Mar 14, 2024
Merged

Mobile: Resolves #10092: Added empty trash option on long pressing the trash folder. #10120

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5847b3c
filtered deleted and trash folder for counting number of notebooks
Sidd-R Mar 8, 2024
2418797
Merge branch 'dev' into dev
Sidd-R Mar 8, 2024
0249e9c
used gettrashfolderid instead of hardcoding
Sidd-R Mar 8, 2024
8f5d0c7
Merge branch 'dev' of https://github.com/Sidd-R/joplin into HEAD
Sidd-R Mar 8, 2024
21a6fea
Merge branch 'dev' into dev
Sidd-R Mar 8, 2024
3f1e819
created function to check whether a real folder exists and added unit…
Sidd-R Mar 11, 2024
7949dd5
Merge branch 'laurent22:dev' into dev
Sidd-R Mar 11, 2024
dcb4540
added test for empty array
Sidd-R Mar 11, 2024
401c2b7
Merge branch 'laurent22:dev' into dev
Sidd-R Mar 12, 2024
2513257
Merge branch 'dev' of https://github.com/Sidd-R/joplin into HEAD
Sidd-R Mar 14, 2024
a24cd80
added empty trash option
Sidd-R Mar 14, 2024
a170358
aligned empty trash's message with destop
Sidd-R Mar 14, 2024
60ef2af
Merge branch 'dev' into empty_trash
Sidd-R Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 23 additions & 3 deletions packages/app-mobile/components/side-menu-content.tsx
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ import { reg } from '@joplin/lib/registry';
import { ProfileConfig } from '@joplin/lib/services/profileConfig/types';
import { getTrashFolderIcon, getTrashFolderId } from '@joplin/lib/services/trash';
import restoreItems from '@joplin/lib/services/trash/restoreItems';
import emptyTrash from '@joplin/lib/services/trash/emptyTrash';
import { ModelType } from '@joplin/lib/BaseModel';
const { substrWithEllipsis } = require('@joplin/lib/string-utils');

Expand Down Expand Up @@ -146,11 +147,30 @@ const SideMenuContentComponent = (props: Props) => {

const folder = folderOrAll as FolderEntity;

if (folder && folder.id === getTrashFolderId()) return;

const menuItems: any[] = [];

if (folder && !!folder.deleted_time) {
if (folder && folder.id === getTrashFolderId()) {
menuItems.push({
text: _('Empty trash'),
onPress: async () => {
Alert.alert('', _('This will permanently delete all items in the trash. Continue?'), [
{
text: _('Empty trash'),
onPress: async () => {
await emptyTrash();
},
},
{
text: _('Cancel'),
onPress: () => { },
style: 'cancel',
},
]);
},
style: 'destructive',
});

} else if (folder && !!folder.deleted_time) {
menuItems.push({
text: _('Restore'),
onPress: async () => {
Expand Down