From 7ed488ffb40ea40fb24997b23ce68c67fc676c91 Mon Sep 17 00:00:00 2001
From: Thomas Carstens <thomaxarstens@gmail.com>
Date: Sun, 11 Nov 2018 09:42:20 +0200
Subject: [PATCH] zoom on feed pictures

---
 config.xml                    |  1 +
 package-lock.json             | 10 ++++++++++
 package.json                  |  5 ++++-
 src/app/app.firebaseconfig.ts | 23 +++++++++++++++++------
 src/app/app.module.ts         |  3 +++
 src/pages/feed/feed.html      |  2 +-
 src/pages/feed/feed.ts        | 11 +++++++++--
 7 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/config.xml b/config.xml
index ab201e42..5400a95c 100644
--- a/config.xml
+++ b/config.xml
@@ -90,6 +90,7 @@
     <allow-navigation href="http://10.0.0.4:8100" />
     <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
     <plugin name="cordova-plugin-firebase" spec="^1.1.4" />
+    <plugin name="com-sarriaroman-photoviewer" spec="^1.1.18" />
     <engine name="android" spec="7.1.0" />
     <engine name="browser" spec="5.0.4" />
     <engine name="ios" spec="4.5.5" />
diff --git a/package-lock.json b/package-lock.json
index 3e5ac779..3b86213b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -325,6 +325,11 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/firebase/-/firebase-4.12.2.tgz",
       "integrity": "sha512-OvOrH1Jma8wpJcopT4yRmwX3c6q0+wVtGYUMvBGA4S0zfEdkTlXJiKpLOoyHS0SymSPdbXoJaYErdmw0QWKd2g=="
     },
+    "@ionic-native/photo-viewer": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/photo-viewer/-/photo-viewer-4.17.0.tgz",
+      "integrity": "sha512-Vjge8CbtXYnPzaDmtj/Ez1uAKY84/Ue+bDOC0rX0o0gfuhJveMXUKVsINrjeyAyD1ngofzBFehBaTzgoxfJKpg=="
+    },
     "@ionic-native/splash-screen": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-4.7.0.tgz",
@@ -1333,6 +1338,11 @@
       "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
       "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g="
     },
+    "com-sarriaroman-photoviewer": {
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/com-sarriaroman-photoviewer/-/com-sarriaroman-photoviewer-1.1.18.tgz",
+      "integrity": "sha512-ExogN6XpvsX+uthA7ll3jpNNts/rb3qksT9yRrYFkFTvg9w7PzoLkRw0RGU+B+q19qBlN7Fs7crUT9lNtGrueA=="
+    },
     "combined-stream": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
diff --git a/package.json b/package.json
index 0698f901..f626ec14 100644
--- a/package.json
+++ b/package.json
@@ -25,10 +25,12 @@
     "@ionic-native/camera": "^4.7.0",
     "@ionic-native/core": "4.7.0",
     "@ionic-native/firebase": "^4.12.2",
+    "@ionic-native/photo-viewer": "^4.17.0",
     "@ionic-native/splash-screen": "4.7.0",
     "@ionic-native/status-bar": "4.7.0",
     "@ionic/storage": "^2.2.0",
     "angularfire2": "^5.0.1",
+    "com-sarriaroman-photoviewer": "^1.1.18",
     "cordova-android": "7.1.0",
     "cordova-browser": "5.0.4",
     "cordova-ios": "4.5.5",
@@ -67,7 +69,8 @@
       "cordova-plugin-firebase": {},
       "cordova-plugin-statusbar": {},
       "cordova-plugin-app-version": {},
-      "cordova-plugin-camera": {}
+      "cordova-plugin-camera": {},
+      "com-sarriaroman-photoviewer": {}
     },
     "platforms": [
       "android",
diff --git a/src/app/app.firebaseconfig.ts b/src/app/app.firebaseconfig.ts
index 8fa496d4..ce7afb15 100644
--- a/src/app/app.firebaseconfig.ts
+++ b/src/app/app.firebaseconfig.ts
@@ -1,8 +1,19 @@
+//using the Implemented Database
+//export var config = {
+//    apiKey: "AIzaSyC_FMJcswceJB7ZYlzaRwKW1ij7kn8K6w4",
+//    authDomain: "myapp-93470.firebaseapp.com",
+//    databaseURL: "https://myapp-93470.firebaseio.com",
+//    projectId: "myapp-93470",
+//    storageBucket: "myapp-93470.appspot.com",
+//    messagingSenderId: "412208839835"
+//  };
+
+//using the Test Database
 export var config = {
-    apiKey: "AIzaSyC_FMJcswceJB7ZYlzaRwKW1ij7kn8K6w4",
-    authDomain: "myapp-93470.firebaseapp.com",
-    databaseURL: "https://myapp-93470.firebaseio.com",
-    projectId: "myapp-93470",
-    storageBucket: "myapp-93470.appspot.com",
-    messagingSenderId: "412208839835"
+    apiKey: "AIzaSyAQD8TaZnXghoRbTE-7_b9LWBK4g3T6hUQ",
+    authDomain: "dynamics1app.firebaseapp.com",
+    databaseURL: "https://dynamics1app.firebaseio.com",
+    projectId: "dynamics1app",
+    storageBucket: "dynamics1app.appspot.com",
+    messagingSenderId: "365540790494"
   };
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 02e0f10d..9112460c 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -31,6 +31,8 @@ import { PopoverController } from 'ionic-angular';
 import { Autosize } from '../components/autosize';
 import { PopupsProvider } from '../providers/popups/popups';
 
+import { PhotoViewer } from '@ionic-native/photo-viewer';
+
 firebase.initializeApp(config);
 firebase.firestore().settings({
   timestampsInSnapshots: true
@@ -72,6 +74,7 @@ firebase.firestore().settings({
     AngularFireAuth,
     AppVersion,
     PopoverController,
+    PhotoViewer,
     //ConfigurePage,
 //    NavController,
     {provide: ErrorHandler, useClass: IonicErrorHandler},
diff --git a/src/pages/feed/feed.html b/src/pages/feed/feed.html
index 56709cc1..a03944a6 100644
--- a/src/pages/feed/feed.html
+++ b/src/pages/feed/feed.html
@@ -72,7 +72,7 @@
       {{ post.data().text }}
     </ion-item>
 
-    <img [src]="post.data().image" *ngIf="post.data().image">
+    <img [src]="post.data().image" *ngIf="post.data().image" (click)="ViewPhoto(post.data().image)">
 
     <ion-row class="bottom-bar">
       <!--LIKES REMOVED.
diff --git a/src/pages/feed/feed.ts b/src/pages/feed/feed.ts
index 8ee728a5..78422dd8 100644
--- a/src/pages/feed/feed.ts
+++ b/src/pages/feed/feed.ts
@@ -9,6 +9,7 @@ import { CommentsPage } from '../comments/comments';
 import { CodesignPage } from '../codesign/codesign';
 import { Firebase } from '@ionic-native/firebase';
 import { PopupsProvider } from '../../providers/popups/popups';
+import { PhotoViewer } from '@ionic-native/photo-viewer';
 
 //import * as admin from 'firebase-admin';
 //import { UserProvider } from '../../providers/user/user';
@@ -50,7 +51,8 @@ export class FeedPage {
               private alertCtrl: AlertController,
               private modalCtrl: ModalController,
               private firebaseCordova: Firebase,
-              public popup: PopupsProvider
+              public popup: PopupsProvider,
+              private photoViewer: PhotoViewer
               //public userservice: UserProvider,
             ) {
 
@@ -451,6 +453,11 @@ PostSure(){
   }
 
 
+  ViewPhoto(url: string) {
+    //this.image =
+    this.photoViewer.show(url, '', {share: true});
+  }
+
 
   addPhoto() {
 
@@ -548,7 +555,7 @@ PostSure(){
       uploadTask.on("state_changed", (taskSnapshot: any) => {
         console.log(taskSnapshot)
         let percentage = taskSnapshot.bytesTransferred / taskSnapshot.totalBytes * 100;
-        loading.setContent("Uploaded " + percentage + "% ...")
+        loading.setContent("Uploaded " + percentage + "%...")
 
       }, (error) => {
         console.log(error)