Skip to content

Commit 548992e

Browse files
ADjenkovADjenkov
committed
chore: fix typescript errors
1 parent 864d406 commit 548992e

4 files changed

Lines changed: 88 additions & 92 deletions

File tree

‎tns-core-modules/ui/core/view/view.d.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,9 @@ export abstract class View extends ViewBase {
645645
_gestureObservers: any;
646646
/**
647647
* @private
648+
* androidx.fragment.app.FragmentManager
648649
*/
649-
_manager: androidx.fragment.app.FragmentManager
650+
_manager: any;
650651
/**
651652
* @private
652653
*/

‎tns-core-modules/ui/frame/fragment.transitions.android.ts‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// Definitions.
44
import { NavigationType } from "./frame-common";
55
import { NavigationTransition, BackstackEntry } from "../frame";
6-
import { ExpandedEntry, ExpandedTransitionListener, ExpandedAnimator } from "./fragment.transitions";
76

87
// Types.
98
import { Transition, AndroidTransitionType } from "../transition/transition";
@@ -24,6 +23,35 @@ export const completedEntries = new Map<number, ExpandedEntry>();
2423
let TransitionListener: TransitionListener;
2524
let AnimationListener: android.animation.Animator.AnimatorListener;
2625

26+
interface ExpandedTransitionListener extends androidx.transition.Transition.TransitionListener {
27+
entry: ExpandedEntry;
28+
transition: androidx.transition.Transition;
29+
}
30+
31+
interface ExpandedAnimator extends android.animation.Animator {
32+
entry: ExpandedEntry;
33+
transitionType?: string;
34+
}
35+
36+
interface ExpandedEntry extends BackstackEntry {
37+
38+
enterTransitionListener: ExpandedTransitionListener;
39+
exitTransitionListener: ExpandedTransitionListener;
40+
reenterTransitionListener: ExpandedTransitionListener;
41+
returnTransitionListener: ExpandedTransitionListener;
42+
43+
enterAnimator: ExpandedAnimator;
44+
exitAnimator: ExpandedAnimator;
45+
popEnterAnimator: ExpandedAnimator;
46+
popExitAnimator: ExpandedAnimator;
47+
48+
transition: Transition;
49+
transitionName: string;
50+
frameId: number;
51+
52+
isNestedDefaultTransition: boolean;
53+
}
54+
2755
export function _setAndroidFragmentTransitions(
2856
animated: boolean,
2957
navigationTransition: NavigationTransition,

‎tns-core-modules/ui/frame/fragment.transitions.d.ts‎

Lines changed: 53 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -2,92 +2,59 @@
22
* @module "ui/transition"
33
*/ /** */
44

5-
import { NavigationTransition, BackstackEntry } from "../frame";
6-
// Types.
7-
import { Transition, AndroidTransitionType } from "../transition/transition";
8-
9-
/**
10-
* @private
11-
*/
12-
13-
export interface ExpandedTransitionListener extends androidx.transition.Transition.TransitionListener {
14-
entry: ExpandedEntry;
15-
transition: androidx.transition.Transition;
16-
}
5+
import { NavigationTransition, BackstackEntry } from "../frame";
6+
// Types.
7+
import { Transition, AndroidTransitionType } from "../transition/transition";
178

18-
export interface ExpandedAnimator extends android.animation.Animator {
19-
entry: ExpandedEntry;
20-
transitionType?: string;
21-
}
22-
23-
export interface ExpandedEntry extends BackstackEntry {
24-
25-
enterTransitionListener: ExpandedTransitionListener;
26-
exitTransitionListener: ExpandedTransitionListener;
27-
reenterTransitionListener: ExpandedTransitionListener;
28-
returnTransitionListener: ExpandedTransitionListener;
29-
30-
enterAnimator: ExpandedAnimator;
31-
exitAnimator: ExpandedAnimator;
32-
popEnterAnimator: ExpandedAnimator;
33-
popExitAnimator: ExpandedAnimator;
9+
/**
10+
* @private
11+
*/
12+
export function _setAndroidFragmentTransitions(
13+
animated: boolean,
14+
navigationTransition: NavigationTransition,
15+
currentEntry: BackstackEntry,
16+
newEntry: BackstackEntry,
17+
frameId: number,
18+
fragmentTransaction: any,
19+
isNestedDefaultTransition?: boolean): void;
20+
/**
21+
* @private
22+
*/
23+
export function _getAnimatedEntries(frameId: number): Set<BackstackEntry>;
24+
/**
25+
* @private
26+
* Called once fragment is recreated after it was destroyed.
27+
* Reapply animations and transitions from entry to fragment if any.
28+
*/
29+
export function _updateTransitions(entry: BackstackEntry): void;
30+
/**
31+
* @private
32+
* Called once fragment is going to reappear from backstack.
33+
* Reverse transitions from entry to fragment if any.
34+
*/
35+
export function _reverseTransitions(previousEntry: BackstackEntry, currentEntry: BackstackEntry): boolean;
36+
/**
37+
* @private
38+
* Called when entry is removed from backstack (either back navigation or
39+
* navigate with clear history). Removes all animations and transitions from entry
40+
* and fragment and clears all listeners in order to prevent memory leaks.
41+
*/
42+
export function _clearEntry(entry: BackstackEntry): void;
43+
/**
44+
* @private
45+
* Called when fragment is destroyed because activity is destroyed.
46+
* Removes all animations and transitions but keeps them on the entry
47+
* in order to reapply them when new fragment is created for the same entry.
48+
*/
49+
export function _clearFragment(entry: BackstackEntry): void;
50+
/**
51+
* @private
52+
*/
53+
export function _createIOSAnimatedTransitioning(navigationTransition: NavigationTransition, nativeCurve: any, operation: number, fromVC: any, toVC: any): any;
3454

35-
transition: Transition;
36-
transitionName: string;
37-
frameId: number;
38-
39-
isNestedDefaultTransition: boolean
40-
}
41-
42-
/**
43-
* @private
44-
*/
45-
export function _setAndroidFragmentTransitions(
46-
animated: boolean,
47-
navigationTransition: NavigationTransition,
48-
currentEntry: BackstackEntry,
49-
newEntry: BackstackEntry,
50-
frameId: number,
51-
fragmentTransaction: any,
52-
isNestedDefaultTransition?: boolean): void;
53-
/**
54-
* @private
55-
*/
56-
export function _getAnimatedEntries(frameId: number): Set<BackstackEntry>;
57-
/**
58-
* @private
59-
* Called once fragment is recreated after it was destroyed.
60-
* Reapply animations and transitions from entry to fragment if any.
61-
*/
62-
export function _updateTransitions(entry: BackstackEntry): void;
63-
/**
64-
* @private
65-
* Called once fragment is going to reappear from backstack.
66-
* Reverse transitions from entry to fragment if any.
67-
*/
68-
export function _reverseTransitions(previousEntry: BackstackEntry, currentEntry: BackstackEntry): boolean;
69-
/**
70-
* @private
71-
* Called when entry is removed from backstack (either back navigation or
72-
* navigate with clear history). Removes all animations and transitions from entry
73-
* and fragment and clears all listeners in order to prevent memory leaks.
74-
*/
75-
export function _clearEntry(entry: BackstackEntry): void;
76-
/**
77-
* @private
78-
* Called when fragment is destroyed because activity is destroyed.
79-
* Removes all animations and transitions but keeps them on the entry
80-
* in order to reapply them when new fragment is created for the same entry.
81-
*/
82-
export function _clearFragment(entry: BackstackEntry): void;
83-
/**
84-
* @private
85-
*/
86-
export function _createIOSAnimatedTransitioning(navigationTransition: NavigationTransition, nativeCurve: any, operation: number, fromVC: any, toVC: any): any;
87-
88-
/**
89-
* @private
90-
*/
91-
export function addNativeTransitionListener(entry: ExpandedEntry, nativeTransition: androidx.transition.Transition): ExpandedTransitionListener;
55+
/**
56+
* @private
57+
* nativeTransition: androidx.transition.Transition
58+
*/
59+
export function addNativeTransitionListener(entry: any, nativeTransition: any): any;
9260
//@endprivate
93-

‎tns-core-modules/ui/frame/frame.android.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import {
1414
} from "./frame-common";
1515

1616
import {
17-
_setAndroidFragmentTransitions, _getAnimatedEntries, ExpandedEntry,
18-
_updateTransitions, _reverseTransitions, _clearEntry, _clearFragment, addNativeTransitionListener, ExpandedTransitionListener
17+
_setAndroidFragmentTransitions, _getAnimatedEntries,
18+
_updateTransitions, _reverseTransitions, _clearEntry, _clearFragment, addNativeTransitionListener
1919
} from "./fragment.transitions";
2020

2121
// TODO: Remove this and get it from global to decouple builder for angular
@@ -553,7 +553,7 @@ export class Frame extends FrameBase {
553553
});
554554
}
555555
}
556-
function cloneExpandedTransitionListener(expandedTransitionListener: ExpandedTransitionListener) {
556+
function cloneExpandedTransitionListener(expandedTransitionListener: any) {
557557
if (!expandedTransitionListener) {
558558
return null;
559559
}
@@ -811,7 +811,7 @@ class FragmentCallbacksImplementation implements AndroidFragmentCallbacks {
811811
@profile
812812
public onCreateAnimator(fragment: androidx.fragment.app.Fragment, transit: number, enter: boolean, nextAnim: number, superFunc: Function): android.animation.Animator {
813813
let animator = null;
814-
const entry = (<ExpandedEntry>this.entry);
814+
const entry = <any>this.entry;
815815

816816
// Return enterAnimator only when new (no current entry) nested transition.
817817
if (enter && entry.isNestedDefaultTransition) {

0 commit comments

Comments
 (0)