Merge pull request #29 from nstudio/issue/27

Fix iOS pod changes

Author: bradmartin

demo/app/main-view-model.ts

@@ -137,7 +137,10 @@ export class LoadingTest extends Observable {
       color: '#fff000',
       mode: Mode.Determinate
     });
-    this.demoProgress('#fff000');
+
+    setTimeout(() => {
+      this.indicator.hide();
+    }, 3500);
   }
 
   public showLoaderAnnularDeterminate() {
@@ -147,17 +150,42 @@ export class LoadingTest extends Observable {
       backgroundColor: '#000',
       mode: Mode.AnnularDeterminate
     });
-    this.demoProgress('#38ef7d');
+
+    setTimeout(() => {
+      this.indicator.hide();
+    }, 3500);
   }
 
   public showLoaderDeterminateHorizontalBar() {
+    const mode = Mode.DeterminateHorizontalBar;
+    const color = '#FF0099';
+
     this.indicator.show({
       message: 'Determinate Horizontal Bar Mode',
-      color: '#FF0099',
+      color,
       backgroundColor: '#240b36',
-      mode: Mode.DeterminateHorizontalBar
+      mode
     });
-    this.demoProgress('#FF0099');
+
+    setTimeout(() => {
+      this.indicator.show({ progress: 0.15, color, mode });
+    }, 500);
+    setTimeout(() => {
+      this.indicator.show({ progress: 0.35, color, mode });
+    }, 1500);
+    setTimeout(() => {
+      this.indicator.show({ progress: 0.65, color, mode });
+    }, 2500);
+    setTimeout(() => {
+      this.indicator.show({ progress: 0.85, color, mode });
+    }, 3000);
+    setTimeout(() => {
+      this.indicator.show({ progress: 0.99, color, mode });
+    }, 3750);
+    setTimeout(() => {
+      this.indicator.show({ progress: 1, color, mode });
+      this.indicator.hide();
+    }, 4500);
   }
 
   public showLoaderModeText() {

src/loading-indicator.ios.ts

@@ -25,7 +25,7 @@ export class LoadingIndicator {
 
     // options
     if (options.message) {
-      this._hud.labelText = options.message;
+      this._hud.label.text = options.message;
     }
 
     if (options.progress) {
@@ -38,29 +38,35 @@ export class LoadingIndicator {
       (this._hud as any).mode = Mode.Indeterminate;
     }
 
-    if (options.dimBackground) this._hud.dimBackground = options.dimBackground;
+    if (options.dimBackground) {
+      this._hud.backgroundView.style = MBProgressHUDBackgroundStyle.SolidColor;
+      this._hud.backgroundView.color = new Color('#000').ios;
+      this._hud.backgroundView.alpha = 0.3;
+    }
 
     if (options.margin) this._hud.margin = options.margin;
 
     if (options.userInteractionEnabled)
       this._hud.userInteractionEnabled = options.userInteractionEnabled;
 
     if (options.backgroundColor) {
-      this._hud.color = new Color(options.backgroundColor).ios;
+      this._hud.bezelView.blurEffectStyle = UIBlurEffectStyle.Regular;
+      this._hud.bezelView.backgroundColor = new Color(
+        options.backgroundColor
+      ).ios;
     }
 
     if (options.color) {
       // make activity and main label same color
-      this._hud.activityIndicatorColor = new Color(options.color).ios;
       this._hud.contentColor = new Color(options.color).ios; // setting this seems to enforce coloring the activity indicator correctly
-      this._hud.labelColor = new Color(options.color).ios;
+      this._hud.label.textColor = new Color(options.color).ios;
     }
 
     if (options.details) {
-      this._hud.detailsLabelText = options.details;
+      this._hud.detailsLabel.text = options.details;
       // detail label same color with 80% opacity of that color
       // TODO: allow specific control
-      this._hud.detailsLabelColor =
+      this._hud.detailsLabel.textColor =
         options && options.color
           ? new Color(options.color).ios
           : new Color('#333').ios;

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/nativescript-loading-indicator",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A NativeScript plugin for showing an overlayed loading indicator.",
   "main": "loading-indicator",
   "typings": "index.d.ts",
@@ -29,7 +29,8 @@
     "plugin.prepare": "npm run build && cd ../demo && tns plugin remove nativescript-loading-indicator && tns plugin add ../src",
     "clean": "npm run demo.reset && npx rimraf -- node_modules package-lock.json && npm i",
     "ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**' --exclude '**/platforms/**' --exclude '**/typings/**'",
-    "prepack": "npm run build.native"
+    "prepack": "npm run build.native",
+    "generate.typings.ios": "cd ../demo && TNS_DEBUG_METADATA_PATH=\"$(pwd)/metadata\" tns build ios && TNS_TYPESCRIPT_DECLARATIONS_PATH=\"$(pwd)/typings\" tns build ios && echo 'Now look for your library typings in demo/typings!'"
   },
   "lint-staged": {
     "**/*.{js, css, ts, json, scss, html, xml, md}": [

src/platforms/ios/Podfile

@@ -1 +1 @@
-pod 'MBProgressHUD'
+pod 'MBProgressHUD', '~> 1.2.0'

src/typings/objc!MBProgressHUD.d.ts

@@ -75,8 +75,6 @@ declare class MBBarProgressView extends UIView {
 declare class MBProgressHUD extends UIView {
   static HUDForView(view: UIView): MBProgressHUD;
 
-  static allHUDsForView(view: UIView): NSArray<any>;
-
   static alloc(): MBProgressHUD; // inherited from NSObject
 
   static appearance(): MBProgressHUD; // inherited from UIAppearance
@@ -101,16 +99,12 @@ declare class MBProgressHUD extends UIView {
     containerTypes: NSArray<typeof NSObject> | typeof NSObject[]
   ): MBProgressHUD; // inherited from UIAppearance
 
-  static hideAllHUDsForViewAnimated(view: UIView, animated: boolean): number;
-
   static hideHUDForViewAnimated(view: UIView, animated: boolean): boolean;
 
   static new(): MBProgressHUD; // inherited from NSObject
 
   static showHUDAddedToAnimated(view: UIView, animated: boolean): MBProgressHUD;
 
-  activityIndicatorColor: UIColor;
-
   animationType: MBProgressHUDAnimation;
 
   readonly backgroundView: MBBackgroundView;
@@ -119,14 +113,10 @@ declare class MBProgressHUD extends UIView {
 
   readonly button: UIButton;
 
-  color: UIColor;
-
   completionBlock: () => void;
 
   contentColor: UIColor;
 
-  cornerRadius: number;
-
   customView: UIView;
 
   defaultMotionEffectsEnabled: boolean;
@@ -135,24 +125,10 @@ declare class MBProgressHUD extends UIView {
 
   readonly detailsLabel: UILabel;
 
-  detailsLabelColor: UIColor;
-
-  detailsLabelFont: UIFont;
-
-  detailsLabelText: string;
-
-  dimBackground: boolean;
-
   graceTime: number;
 
   readonly label: UILabel;
 
-  labelColor: UIColor;
-
-  labelFont: UIFont;
-
-  labelText: string;
-
   margin: number;
 
   minShowTime: number;
@@ -163,71 +139,23 @@ declare class MBProgressHUD extends UIView {
 
   offset: CGPoint;
 
-  opacity: number;
-
   progress: number;
 
   progressObject: NSProgress;
 
   removeFromSuperViewOnHide: boolean;
 
-  readonly size: CGSize;
-
   square: boolean;
 
-  taskInProgress: boolean;
-
-  xOffset: number;
-
-  yOffset: number;
-
   constructor(o: { view: UIView });
 
-  constructor(o: { window: UIWindow });
-
-  hide(animated: boolean): void;
-
-  hideAfterDelay(animated: boolean, delay: number): void;
-
   hideAnimated(animated: boolean): void;
 
   hideAnimatedAfterDelay(animated: boolean, delay: number): void;
 
   initWithView(view: UIView): this;
 
-  initWithWindow(window: UIWindow): this;
-
-  show(animated: boolean): void;
-
   showAnimated(animated: boolean): void;
-
-  showAnimatedWhileExecutingBlock(animated: boolean, block: () => void): void;
-
-  showAnimatedWhileExecutingBlockCompletionBlock(
-    animated: boolean,
-    block: () => void,
-    completion: () => void
-  ): void;
-
-  showAnimatedWhileExecutingBlockOnQueue(
-    animated: boolean,
-    block: () => void,
-    queue: NSObject
-  ): void;
-
-  showAnimatedWhileExecutingBlockOnQueueCompletionBlock(
-    animated: boolean,
-    block: () => void,
-    queue: NSObject,
-    completion: () => void
-  ): void;
-
-  showWhileExecutingOnTargetWithObjectAnimated(
-    method: string,
-    target: any,
-    object: any,
-    animated: boolean
-  ): void;
 }
 
 declare const enum MBProgressHUDAnimation {