Allow toggling of page navigation #50

triniwiz · Mar 14, 2018 · b0a2101 · b0a2101
1 parent a53722a
commit b0a2101
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -157,7 +157,7 @@ _Angular v4+_
 ## Config
 
 ```xml
-<Pager disableSwipe="true" selectedIndex="5">
+<Pager disableSwipe="true" disableAnimation="true" selectedIndex="5">
 ```
 
 | IOS                                    | Android                                    |

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nativescript-pager",
-    "version": "7.1.3",
+    "version": "7.2.0",
     "description": "A Carousel/Pager plugin for NativeScript",
     "main": "pager",
     "typings": "index.d.ts",

diff --git a/src/pager.android.ts b/src/pager.android.ts
@@ -40,6 +40,7 @@ declare namespace com.eftimoff {
 export class Pager extends PagerBase {
   _androidViewId: number;
   disableSwipe: boolean;
+  private _disableAnimation: boolean;
   public pagesCount: number;
   public itemTemplateUpdated(oldData: any, newData: any): void {}
   private _android: android.support.v4.view.ViewPager;
@@ -118,6 +119,13 @@ export class Pager extends PagerBase {
     this.nativeView.setId(this._androidViewId);
   }
 
+  get disableAnimation(): boolean {
+    return this._disableAnimation;
+  }
+  set disableAnimation(value: boolean) {
+    this._disableAnimation = value;
+  }
+
   get pagerAdapter() {
     return this._pagerAdapter;
   }
@@ -139,7 +147,7 @@ export class Pager extends PagerBase {
 
   [selectedIndexProperty.setNative](value: number) {
     if (this._android) {
-      this._android.setCurrentItem(value, true);
+      this._android.setCurrentItem(value, this.disableAnimation);
     }
   }
 

diff --git a/src/pager.common.ts b/src/pager.common.ts
@@ -142,7 +142,8 @@ export abstract class PagerBase extends View {
 
   abstract get disableSwipe(): boolean;
   abstract set disableSwipe(value: boolean);
-
+  abstract get disableAnimation(): boolean;
+  abstract set disableAnimation(value: boolean);
   get pageSpacing() {
     return this._pageSpacing;
   }

diff --git a/src/pager.ios.ts b/src/pager.ios.ts
@@ -43,7 +43,8 @@ declare const ADTransitioningDelegate,
   ADTransitioningViewController;
 
 export class Pager extends PagerBase {
-  private _disableSwipe: any;
+  private _disableSwipe: boolean;
+  private _disableAnimation: boolean;
   public itemTemplateUpdated(oldData: any, newData: any): void {}
   private _orientation: UIPageViewControllerNavigationOrientation;
   private _options: NSDictionary<any, any>;
@@ -238,6 +239,14 @@ export class Pager extends PagerBase {
       this._ios.dataSource = this.dataSource;
     }
   }
+
+  get disableAnimation(): boolean {
+    return this._disableAnimation;
+  }
+  set disableAnimation(value: boolean) {
+    this._disableAnimation = value;
+  }
+
   public onUnloaded() {
     this._ios.delegate = null;
     super.onUnloaded();
@@ -260,7 +269,6 @@ export class Pager extends PagerBase {
         this.heightMeasureSpec
       );
 
-      // View.layoutChild(this, view, 0, 0, this.layoutWidth, this.layoutHeight);
       View.layoutChild(
         this,
         view,
@@ -273,7 +281,7 @@ export class Pager extends PagerBase {
   }
 
   public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
-    // console.log(`Pager.onMeasure: ${widthMeasureSpec}x${heightMeasureSpec}`)
+
     this.widthMeasureSpec = widthMeasureSpec;
     this.heightMeasureSpec = heightMeasureSpec;
 
@@ -289,7 +297,6 @@ export class Pager extends PagerBase {
       widthMeasureSpec,
       heightMeasureSpec
     );
-    // console.log(`Pager.onMeasure - measureChild = (${measuredWidth}x${measuredHeight})`);
 
     // Check against our minimum sizes
     measuredWidth = Math.max(measuredWidth, this.effectiveMinWidth);
@@ -382,7 +389,7 @@ export class Pager extends PagerBase {
       owner._ios.setViewControllersDirectionAnimatedCompletion(
         NSArray.arrayWithObject(vc),
         direction,
-        false,
+        this.disableAnimation,
         null
       );
     });