Merge remote-tracking branch 'origin/master'

Author: farfromrefug

demo-snippets/ng/indicator/indicator.component.html

@@ -4,13 +4,16 @@
 </ActionBar>
 
 <StackLayout>
-    <Pager [items]="items" height="300" [selectedIndex]="selectedIndex" (selectedIndexChange)="onIndexChanged($event)"
-        indicator="fill" showIndicator="true">
-        <ng-template let-i="index" let-item="item">
-            <GridLayout [backgroundColor]="item.color">
-                <Label class="label" [text]="item.title"></Label>
-            </GridLayout>
-        </ng-template>
-    </Pager>
+    <GridLayout>
+        <Pager id="pager" [items]="items" height="300" [selectedIndex]="selectedIndex" (selectedIndexChange)="onIndexChanged($event)">
+            <ng-template let-i="index" let-item="item">
+                <GridLayout [backgroundColor]="item.color">
+                    <Label class="label" [text]="item.title"></Label>
+                </GridLayout>
+            </ng-template>
+        </Pager>
+        <PagerIndicator pagerViewId="pager" type="thin_worm" verticalAlignment="bottom" horizontalAlignment="center"
+            marginBottom="10" color="#C3AEC6" selectedColor="#77567a" />
+    </GridLayout>
     <Button text="Reset" (tap)="resetPager()"></Button>
 </StackLayout>

demo-snippets/ng/install.module.ts

@@ -1,7 +1,9 @@
 import { NO_ERRORS_SCHEMA, NgModule } from '@angular/core';
-import { NativeScriptCommonModule, NativeScriptModule } from '@nativescript/angular';
+import { NativeScriptCommonModule, NativeScriptModule, registerElement } from '@nativescript/angular';
 
 import { PagerModule } from '@nativescript-community/ui-pager/angular';
+import { PagerIndicator } from "@nativescript-community/ui-pager-indicator";
+registerElement("PagerIndicator", () => PagerIndicator)
 
 import { StaticPagerComponent } from './static-pager/static-pager.component';
 import { BasicPagerComponent } from './basic-pager/basic-pager.component';

packages/ui-pager-indicator/blueprint.md

@@ -28,6 +28,28 @@ Run the following command from the root of your project:
 PagerIndicator add page control for Pager or other Paging Views.
 ```
 
+## Usage in Angular
+
+
+If you are planning to use an indicator, add the following to your module:
+
+```typescript
+import { registerElement } from "@nativescript/angular";
+import { PagerIndicator } from "@nativescript-community/ui-pager-indicator";
+registerElement("PagerIndicator", () => PagerIndicator)
+```
+
+Then in your template:
+```html
+<Pager id="pager" [items]="items"
+    ...
+</Pager>
+<PagerIndicator pagerViewId="pager" />
+```
+
+### Examples
+- [Indicator Pager](demo-snippets/ng/indicator)
+  - A simple pager example using dynamic content and indicator.
 
 ## Usage in Vue
 

src/ui-pager/index.android.ts

@@ -718,12 +718,12 @@ function initPagerChangeCallback() {
                         object: owner
                     });
                     owner.lastEvent = 1;
-                } else if (owner.lastEvent === 1 && state === 1) {
+                else if ((owner.lastEvent === 2 || owner.lastEvent === 0) && state === 0) {
                     owner.notify({
                         eventName: Pager.swipeOverEvent,
                         object: owner
                     });
-                    owner.lastEvent = 1;
+                    owner.lastEvent = 0;
                 } else if (owner.lastEvent === 1 && state === 2) {
                     owner.notify({
                         eventName: Pager.swipeEndEvent,

src/ui-pager/vue/pager.ts

@@ -17,7 +17,7 @@ export default {
     props: {
         items: {
             //@ts-ignore
-            type: Array | Object
+            type: [Array, Object]
         },
         '+alias': {
             type: String,