self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-12-20 23:30:05 +02:00
Code Issues Releases Activity

Revert "Mobile: Refactored and made dialog boxes more reliable"

Browse Source 
This reverts commit f432734338.

This new package has its own glitches and doesn't look good
when button labels are too large. So reverting to the less
glitchy package.
This commit is contained in:
Laurent Cozic
2020-06-13 16:20:59 +01:00
parent 9a9cfbd130
commit 1dc4516efc
15 changed files with 153 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ReactNativeClient/lib/components/screens/notes.js
View File

@@ -12,7 +12,8 @@ const { themeStyle } = require('lib/components/global-style.js');
const { ScreenHeader } = require('lib/components/screen-header.js');
const { _ } = require('lib/locale.js');
const { ActionButton } = require('lib/components/action-button.js');
const dialogs = require('lib/components/dialogs.js').default;
const { dialogs } = require('lib/dialogs.js');
const DialogBox = require('react-native-dialogbox').default;
const { BaseScreenComponent } = require('lib/components/base-screen.js');
const { BackButtonService } = require('lib/services/back-button.js');
@@ -63,17 +64,17 @@ class NotesScreenComponent extends BaseScreenComponent {
id: { name: 'showCompletedTodos', value: !Setting.value('showCompletedTodos') },
});
const r = await dialogs.pop(Setting.settingMetadata('notes.sortOrder.field').label(), buttons);
const r = await dialogs.pop(this, Setting.settingMetadata('notes.sortOrder.field').label(), buttons);
if (!r) return;
Setting.setValue(r.name, r.value);
};
this.backHandler = () => {
// if (this.dialogbox.state.isVisible) {
// this.dialogbox.close();
// return true;
// }
if (this.dialogbox.state.isVisible) {
this.dialogbox.close();
return true;
}
return false;
};
}
@@ -150,7 +151,7 @@ class NotesScreenComponent extends BaseScreenComponent {
}
deleteFolder_onPress(folderId) {
dialogs.confirm(_('Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.')).then(ok => {
dialogs.confirm(this, _('Delete notebook? All notes and sub-notebooks within this notebook will also be deleted.')).then(ok => {
if (!ok) return;
Folder.delete(folderId)
@@ -235,7 +236,11 @@ class NotesScreenComponent extends BaseScreenComponent {
<ScreenHeader title={title} showBackButton={false} parentComponent={thisComp} sortButton_press={this.sortButton_press} folderPickerOptions={this.folderPickerOptions()} showSearchButton={true} showSideMenuButton={true} />
<NoteList style={this.styles().noteList} />
{actionButtonComp}
<DialogBox
ref={dialogbox => {
this.dialogbox = dialogbox;
}}
/>
</View>
);
}