From 40ca9803071bc4106ad1087b32457f774bc53ae7 Mon Sep 17 00:00:00 2001
From: NickIliev <Nikolay.Iliev@telerik.com>
Date: Thu, 4 Jul 2019 16:23:33 +0300
Subject: [PATCH] fix: updated hubble link for thumbnails

---
 app/pages/hubble/hubble.component.html |  2 +-
 app/pages/hubble/hubble.component.ts   |  6 ++----
 app/services/hubble.service.ts         |  4 ++--
 package.json                           | 28 +++++++++++++-------------
 webpack.config.js                      |  3 ---
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/app/pages/hubble/hubble.component.html b/app/pages/hubble/hubble.component.html
index dc35a33..f652efe 100644
--- a/app/pages/hubble/hubble.component.html
+++ b/app/pages/hubble/hubble.component.html
@@ -7,7 +7,7 @@
                     <Label [text]="news.name" class="h2" textWrap="true"></Label>
                     <!-- <Label [text]="news.release.url" class="h4" textAlignment="center"></Label> -->
                     <Image *ngIf="isAndroid" [src]="news.release.thumbnail" loadMode="async" stretch="aspectFill"></Image>
-                    <Image *ngIf="!isAndroid" [src]="news.release.thumbnail" height="200" loadMode="async" stretch="aspectFill"></Image>
+                    <Image *ngIf="!isAndroid" [src]="news.release.thumbnail" loadMode="async" stretch="aspectFit"></Image>
 
                     <StackLayout >
                         <Label [text]="news.release.isExpanded ? 'hide' : 'see the whole story'" (tap)="onExpand(i)" class="h4" opacity="0.7"></Label>
diff --git a/app/pages/hubble/hubble.component.ts b/app/pages/hubble/hubble.component.ts
index 7f403ad..ea5d882 100644
--- a/app/pages/hubble/hubble.component.ts
+++ b/app/pages/hubble/hubble.component.ts
@@ -26,8 +26,7 @@ export class HubbleComponent {
         this._hubbleService.getNews().subscribe(result => {
             (<Array<News>>result).forEach(singleNews => {
                 let release: any;
-
-                this._hubbleService.getRelease("http://hubblesite.org/api/v3/news_release/" + singleNews["news_id"])
+                this._hubbleService.getRelease("https://hubblesite.org/api/v3/news_release/" + singleNews["news_id"])
                 .subscribe(newsRelease => {
                     release = new NewsRelease(
                         newsRelease["name_id"],
@@ -35,10 +34,9 @@ export class HubbleComponent {
                         newsRelease["url"],
                         newsRelease["abstract"],
                         newsRelease["mission"],
-                        newsRelease["thumbnail"],
+                        "https:" + newsRelease["thumbnail"],
                         newsRelease["publication"],
                         false);
-
                     this.latestNews.push(new News(singleNews["news_id"], singleNews["name"], release));
                 });
             });
diff --git a/app/services/hubble.service.ts b/app/services/hubble.service.ts
index b0ae5fb..f1f8d0e 100644
--- a/app/services/hubble.service.ts
+++ b/app/services/hubble.service.ts
@@ -9,8 +9,8 @@ export class HubbleService {
     RELEASE_URL: string;
 
     constructor(private _http: HttpClient) {
-        this.API_URL = "http://hubblesite.org/api/v3/news";
-        this.RELEASE_URL = "http://hubblesite.org/news_release/news/";
+        this.API_URL = "https://hubblesite.org/api/v3/news";
+        this.RELEASE_URL = "https://hubblesite.org/news_release/news/";
     }
 
     getRelease(releaseUrl: string) {
diff --git a/package.json b/package.json
index 442496e..486b99d 100644
--- a/package.json
+++ b/package.json
@@ -9,20 +9,20 @@
       "version": "6.0.0-2019-06-27-141115-01"
     },
     "tns-ios": {
-      "version": "6.0.0-rc-2019-06-28-105002-01"
+      "version": "6.0.0-2019-07-03-115841-01"
     }
   },
   "dependencies": {
-    "@angular/animations": "8.0.0",
-    "@angular/common": "8.0.0",
-    "@angular/compiler": "8.0.0",
-    "@angular/core": "8.0.0",
-    "@angular/forms": "8.0.0",
+    "@angular/animations": "~8.0.0",
+    "@angular/common": "~8.0.0",
+    "@angular/compiler": "~8.0.0",
+    "@angular/core": "~8.0.0",
+    "@angular/forms": "~8.0.0",
     "@angular/http": "8.0.0-beta.10",
-    "@angular/platform-browser": "8.0.0",
-    "@angular/platform-browser-dynamic": "8.0.0",
-    "@angular/router": "8.0.0",
-    "nativescript-angular": "next",
+    "@angular/platform-browser": "~8.0.0",
+    "@angular/platform-browser-dynamic": "~8.0.0",
+    "@angular/router": "~8.0.0",
+    "nativescript-angular": "8.1.0-next-2019-07-04-092208-01",
     "nativescript-app-center": "^1.0.3",
     "nativescript-cardview": "^3.2.0",
     "nativescript-permissions": "^1.3.6",
@@ -31,8 +31,8 @@
     "nativescript-theme-core": "^1.0.6",
     "nativescript-ui-sidedrawer": "androidx",
     "reflect-metadata": "~0.1.13",
-    "rxjs": "^6.5.2",
-    "tns-core-modules": "next",
+    "rxjs": "^6.3.3",
+    "tns-core-modules": "6.1.0-next-2019-07-03-144356-02",
     "zone.js": "^0.9.1"
   },
   "devDependencies": {
@@ -45,10 +45,10 @@
     "mocha": "~5.2.0",
     "mochawesome": "~3.1.2",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-webpack": "next",
+    "nativescript-dev-webpack": "1.0.0-next-2019-06-28-135258-05",
     "tns-platform-declarations": "next",
     "tslint": "^5.11.0",
-    "typescript": "3.4.1"
+    "typescript": "~3.4.5"
   },
   "scripts": {
     "tslint": "tslint -p tsconfig.json",
diff --git a/webpack.config.js b/webpack.config.js
index 6a470f1..e94ffc0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -308,9 +308,6 @@ module.exports = env => {
             ],
             projectRoot,
             webpackConfig: config,
-            targetArchs: ["arm", "arm64", "ia32"],
-            useLibs: true,
-            androidNdkPath: "/Library/android-sdk-macosx/ndk-bundle"
         }));
     }