javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert: fix(android): nested dialog/fragment handling (#9495)

Browse Source 
This reverts commit 4c547bb00c.
This commit is contained in:
Nathan Walker
2021-08-11 10:24:03 -07:00
parent 3e98d1e934
commit 3aff057b99
7 changed files with 4 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/ui/src/modal-view/nested-modal-tab.xml
View File

@@ -1,24 +0,0 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
<ActionBar>
<Label text="Nested Modal Tab"></Label>
</ActionBar>
<TabView selectedTabTextColor="green">
<TabViewItem title="First">
<GridLayout>
<Frame id="nestedFrame" defaultPage="nested-frames/nested-page" actionBarVisibility="always"></Frame>
</GridLayout>
</TabViewItem>
<TabViewItem title="Second">
<GridLayout>
<Frame id="nestedFrame" defaultPage="nested-frames/nested-page" actionBarVisibility="always"></Frame>
</GridLayout>
</TabViewItem>
<TabViewItem title="Third">
<GridLayout>
<Frame id="nestedFrame" defaultPage="nested-frames/nested-page" actionBarVisibility="always"></Frame>
</GridLayout>
</TabViewItem>
</TabView>
</Page>

8
apps/ui/src/modal-view/nested-modal.ts
View File

@@ -9,14 +9,6 @@ export function onShowingModally(args: ShownModallyData) {
onTap: function () {
Dialogs.alert('it works!');
},
openNestedModal: function () {
page.showModal('modal-view/nested-nested-modal', {
context: 'Neste mODAL',
closeCallback: () => {
console.log('nested-modal.openNestedModal');
},
});
},
});
}

1
apps/ui/src/modal-view/nested-modal.xml
View File

@@ -5,6 +5,5 @@
<StackLayout backgroundColor="PaleGreen" margin="10">
<Label text="{{ context }}"/>
<Button text="Show Alert" tap="{{ onTap }}"/>
<Button text="Open Nested Modal" tap="{{ openNestedModal }}"/>
</StackLayout>
</Page>

29
apps/ui/src/modal-view/nested-nested-frame.ts
View File

@@ -1,29 +0,0 @@
import { Page, EventData, fromObject, Dialogs } from '@nativescript/core';
export function navigatingTo(args) {
const page = <Page>args.object;
page.bindingContext = fromObject({
context: args.context,
onTap: function () {
Dialogs.alert('it works!');
},
openNestedFrames: function () {
page.showModal('modal-view/nested-modal-tab', {
context: 'Nested Modal Tab',
fullscreen: true,
closeCallback: () => {
console.log('nested-modal.openNestedModal');
},
});
},
});
}
export function onLoaded(args: EventData) {
console.log('nested-nested-modal.onLoaded');
}
export function onUnloaded() {
console.log('nested-nested-modal.onUnloaded');
}

9
apps/ui/src/modal-view/nested-nested-frame.xml
View File

@@ -1,9 +0,0 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd"
navigatingTo="navigatingTo"
loaded="onLoaded" unloaded="onUnloaded" backgroundColor="Red">
<StackLayout backgroundColor="PaleGreen" margin="10">
<Label text="{{ context }}"/>
<Button text="Show Alert" tap="{{ onTap }}"/>
<Button text="Open Nested Frames" tap="{{ openNestedFrames }}" />
</StackLayout>
</Page>

1
apps/ui/src/modal-view/nested-nested-modal.xml
View File

@@ -1 +0,0 @@
<Frame defaultPage="modal-view/nested-nested-frame"></Frame>