feat: BottomSheet Android add onChangeState function

Author: vallemar

src/bottomsheet/bottomsheet-common.ts

@@ -57,7 +57,9 @@ export abstract class ViewWithBottomSheetBase extends View {
 
     _bottomSheetFragment: any; // com.google.android.material.bottomsheet.BottomSheetDialogFragment
     protected abstract _hideNativeBottomSheet(parent, whenClosedCallback);
+
     protected _bottomSheetContext: any;
+
     _raiseShownBottomSheetEvent() {
         const args: ShownBottomSheetData = {
             eventName: shownInBottomSheetEvent,
@@ -68,6 +70,7 @@ export abstract class ViewWithBottomSheetBase extends View {
 
         this.notify(args);
     }
+
     public _bottomSheetClosed(): void {
         const _rootModalViews = this._getRootModalViews();
         const modalIndex = _rootModalViews.indexOf(this);
@@ -82,7 +85,9 @@ export abstract class ViewWithBottomSheetBase extends View {
         //     return true;
         // });
     }
+
     protected abstract _showNativeBottomSheet(parent: View, options: BottomSheetOptions);
+
     protected _commonShowNativeBottomSheet(parent: View, options: BottomSheetOptions) {
         this._getRootModalViews().push(this);
         this.cssClasses.add(CSSUtils.MODAL_ROOT_VIEW_CSS_CLASS);
@@ -134,6 +139,7 @@ export abstract class ViewWithBottomSheetBase extends View {
 
         this._bottomSheetContext.closeCallback = this._closeBottomSheetCallback;
     }
+
     protected _raiseShowingBottomSheetEvent() {
         const args: ShownBottomSheetData = {
             eventName: showingInBottomSheetEvent,
@@ -143,6 +149,7 @@ export abstract class ViewWithBottomSheetBase extends View {
         };
         this.notify(args);
     }
+
     public closeBottomSheet(...args) {
         const closeCallback = this._closeBottomSheetCallback;
         if (closeCallback) {
@@ -169,4 +176,4 @@ export abstract class ViewWithBottomSheetBase extends View {
             return view;
         }
     }
-}
+}

src/bottomsheet/bottomsheet.android.ts

@@ -1,6 +1,6 @@
 import { applyMixins } from '@nativescript-community/ui-material-core';
-import { AndroidActivityBackPressedEventData, Application, View, fromObject, Utils } from '@nativescript/core';
-import { BottomSheetOptions, ViewWithBottomSheetBase } from './bottomsheet-common';
+import { AndroidActivityBackPressedEventData, Application, Utils, View, fromObject } from '@nativescript/core';
+import { BottomSheetOptions, StateBottomSheet, ViewWithBottomSheetBase } from './bottomsheet-common';
 
 export { ViewWithBottomSheetBase } from './bottomsheet-common';
 
@@ -16,6 +16,52 @@ function getId(id: string) {
     return context.getResources().getIdentifier(id, 'id', context.getPackageName());
 }
 
+@NativeClass
+class ChangeStateBottomSheet extends com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback {
+    private owner: ViewWithBottomSheet;
+
+    constructor(owner: ViewWithBottomSheet) {
+        super();
+        this.owner = owner;
+        return global.__native(this);
+    }
+
+    onSlide(bottomSheet: android.view.View, slideOffset: number) {
+        if (this.checkActiveCallback()) {
+            this.owner._onChangeStateBottomSheetCallback(StateBottomSheet.DRAGGING, slideOffset);
+        }
+    }
+
+    onStateChanged(bottomSheet: android.view.View, newState: number) {
+        if (this.checkActiveCallback()) {
+            const status = this.getStateBottomSheetFromBottomSheetBehavior(newState);
+            if (status !== undefined) {
+                this.owner._onChangeStateBottomSheetCallback(status);
+            }
+        }
+    }
+
+    private checkActiveCallback() {
+        return this.owner && this.owner._onChangeStateBottomSheetCallback;
+    }
+
+    public getStateBottomSheetFromBottomSheetBehavior(state: number): StateBottomSheet | undefined {
+        switch (state) {
+            case com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN:
+                return StateBottomSheet.CLOSED;
+            case com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED:
+                return StateBottomSheet.EXPANDED;
+            case com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED:
+                return StateBottomSheet.COLLAPSED;
+            case com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_DRAGGING:
+                return StateBottomSheet.DRAGGING;
+            default:
+                // @ts-ignore
+                return;
+        }
+    }
+}
+
 export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
     _bottomSheetFragment: com.nativescript.material.bottomsheet.BottomSheetDialogFragment;
     protected _hideNativeBottomSheet(parent: View, whenClosedCallback: () => void) {
@@ -51,10 +97,10 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
                     },
 
                     onBackPressed(dialog: com.nativescript.material.bottomsheet.BottomSheetDialog) {
-                        if(bottomSheetOptions.options && bottomSheetOptions.options.dismissOnBackButton === false){
+                        if (bottomSheetOptions.options && bottomSheetOptions.options.dismissOnBackButton === false) {
                             return true;
                         }
-                        
+
                         if (!owner) {
                             return false;
                         }
@@ -133,13 +179,19 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
                     // disable peek/collapsed state
                     behavior.setSkipCollapsed(true);
                 }
-                
                 const peekHeight = bottomSheetOptions.options?.peekHeight;
-                if(peekHeight){
+                if (peekHeight) {
                     behavior.setState(com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED);
                     behavior.setPeekHeight(Utils.layout.toDevicePixels(peekHeight));
                 }
 
+                const onChangeState = bottomSheetOptions.options?.onChangeState;
+                if (onChangeState) {
+                    const changeStateBottomSheet = new ChangeStateBottomSheet(owner);
+                    behavior.addBottomSheetCallback(changeStateBottomSheet);
+                    owner._onChangeStateBottomSheetCallback(changeStateBottomSheet.getStateBottomSheetFromBottomSheetBehavior(behavior.getState()));
+                }
+
                 if (owner && !owner.isLoaded) {
                     owner.callLoaded();
                 }