diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo.png index 5218f4c..d2d2014 100644 Binary files a/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo.png and b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo_old.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo_old.png new file mode 100644 index 0000000..5218f4c Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-hdpi/logo_old.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/logo.png index b9e102a..d2d2014 100644 Binary files a/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/logo.png and b/client/Nightr/App_Resources/Android/src/main/res/drawable-ldpi/logo.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo.png index 6263387..d2d2014 100644 Binary files a/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo.png and b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo_old.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo_old.png new file mode 100644 index 0000000..6263387 Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-mdpi/logo_old.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png index ad8ee2f..d2d2014 100644 Binary files a/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo_old.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo_old.png new file mode 100644 index 0000000..ad8ee2f Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xhdpi/logo_old.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png index 6683278..d2d2014 100644 Binary files a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo_old.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo_old.png new file mode 100644 index 0000000..6683278 Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxhdpi/logo_old.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png index fa6331c..d2d2014 100644 Binary files a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png differ diff --git a/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo_old.png b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo_old.png new file mode 100644 index 0000000..fa6331c Binary files /dev/null and b/client/Nightr/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo_old.png differ diff --git a/client/Nightr/src/app/home-page/home-page.component.css b/client/Nightr/src/app/home-page/home-page.component.css index 990379e..6b0ca11 100644 --- a/client/Nightr/src/app/home-page/home-page.component.css +++ b/client/Nightr/src/app/home-page/home-page.component.css @@ -4,3 +4,13 @@ left: 90%; top: 160%; } + + .font-awesome { + font-family: "fontawesome-webfont"; + font-size: 24; +} + +.radioBefore { + font-family: "fontawesome-webfont"; + font-size: 24; +} diff --git a/client/Nightr/src/app/home-page/home-page.component.ts b/client/Nightr/src/app/home-page/home-page.component.ts index 0894901..329ff98 100644 --- a/client/Nightr/src/app/home-page/home-page.component.ts +++ b/client/Nightr/src/app/home-page/home-page.component.ts @@ -4,7 +4,7 @@ import { RouterExtensions } from "nativescript-angular/router"; import { TouchGestureEventData, GestureEventData } from 'tns-core-modules/ui/gestures' import { isEnabled, enableLocationRequest, getCurrentLocation, watchLocation, distance, clearWatch, Location } from "nativescript-geolocation"; -import { MyHttpPostService } from '../services/my-http-post-service'' +import { MyHttpPostService } from '../services/my-http-post-service'; @Component({ @@ -22,6 +22,7 @@ export class HomePageComponent implements OnInit { image: any; flat_earth: boolean; in_australia: boolean; + changeYes: boolean; constructor(private routerExtensions: RouterExtensions, ) { } @@ -29,6 +30,13 @@ export class HomePageComponent implements OnInit { ngOnInit(): void { } + public changeGenderMale(){ + if(this.changeYes == true) + this.changeYes = false; + else + this.changeYes = true; + } + public onTap(args: GestureEventData): void { this.routerExtensions.navigateByUrl("/result-page"); } diff --git a/client/Nightr/src/app/result-page/result-page.component.ts b/client/Nightr/src/app/result-page/result-page.component.ts index 2b849ac..f447ffb 100644 --- a/client/Nightr/src/app/result-page/result-page.component.ts +++ b/client/Nightr/src/app/result-page/result-page.component.ts @@ -65,10 +65,29 @@ private makePostRequest(): void { .subscribe(res => { //console.log('This is res', res); this.JSONObject = res; + this.addToArray(); //console.log('THis is myreturnJSON', this.myReturnJSON); }); } +public addToArray(): void { + + if (this.JSONObject.night) { + this.night = "It is night"; + } else { + this.night = "It is day"; + } + + this.percentage = "At least we are "+Math.floor(this.JSONObject.weighted_probabilities_mean*100)+"% sure, here's why" + for (let i = 0; i < this.JSONObject.predictions.length; i++) { + var causestring = "" + for (let j = 0; j < this.JSONObject.predictions[i].reasons.length; j++) { + causestring = causestring + " - " + this.JSONObject.predictions[i].reasons[j] + "\n"; + } + this.reasons.push(new Reason(""+Math.round(this.JSONObject.predictions[i].contribution*100)+"% - " + this.JSONObject.predictions[i].name, causestring)); + } + } + goBack(): void { this.routerExtensions.back(); } diff --git a/client/Nightr/src/main.js b/client/Nightr/src/main.js index d07591d..faf70ce 100644 --- a/client/Nightr/src/main.js +++ b/client/Nightr/src/main.js @@ -11,4 +11,4 @@ var app_module_1 = require("./app/app.module"); // so we provide a wrapper platform object, platformNativeScriptDynamic, // that sets up a NativeScript application and can bootstrap the Angular framework. platform_1.platformNativeScriptDynamic().bootstrapModule(app_module_1.AppModule); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1haW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwR0FBMEc7QUFDMUcsMERBQTRFO0FBRTVFLCtDQUE2QztBQUU3QyxnRkFBZ0Y7QUFDaEYsMEVBQTBFO0FBQzFFLHNFQUFzRTtBQUN0RSx5REFBeUQ7QUFDekQseUVBQXlFO0FBQ3pFLHdFQUF3RTtBQUN4RSxtRkFBbUY7QUFDbkYsc0NBQTJCLEVBQUUsQ0FBQyxlQUFlLENBQUMsc0JBQVMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBpbXBvcnQgc2hvdWxkIGJlIGZpcnN0IGluIG9yZGVyIHRvIGxvYWQgc29tZSByZXF1aXJlZCBzZXR0aW5ncyAobGlrZSBnbG9iYWxzIGFuZCByZWZsZWN0LW1ldGFkYXRhKVxuaW1wb3J0IHsgcGxhdGZvcm1OYXRpdmVTY3JpcHREeW5hbWljIH0gZnJvbSBcIm5hdGl2ZXNjcmlwdC1hbmd1bGFyL3BsYXRmb3JtXCI7XG5cbmltcG9ydCB7IEFwcE1vZHVsZSB9IGZyb20gXCIuL2FwcC9hcHAubW9kdWxlXCI7XG5cbi8vIEEgdHJhZGl0aW9uYWwgTmF0aXZlU2NyaXB0IGFwcGxpY2F0aW9uIHN0YXJ0cyBieSBpbml0aWFsaXppbmcgZ2xvYmFsIG9iamVjdHMsXG4vLyBzZXR0aW5nIHVwIGdsb2JhbCBDU1MgcnVsZXMsIGNyZWF0aW5nLCBhbmQgbmF2aWdhdGluZyB0byB0aGUgbWFpbiBwYWdlLlxuLy8gQW5ndWxhciBhcHBsaWNhdGlvbnMgbmVlZCB0byB0YWtlIGNhcmUgb2YgdGhlaXIgb3duIGluaXRpYWxpemF0aW9uOlxuLy8gbW9kdWxlcywgY29tcG9uZW50cywgZGlyZWN0aXZlcywgcm91dGVzLCBESSBwcm92aWRlcnMuXG4vLyBBIE5hdGl2ZVNjcmlwdCBBbmd1bGFyIGFwcCBuZWVkcyB0byBtYWtlIGJvdGggcGFyYWRpZ21zIHdvcmsgdG9nZXRoZXIsXG4vLyBzbyB3ZSBwcm92aWRlIGEgd3JhcHBlciBwbGF0Zm9ybSBvYmplY3QsIHBsYXRmb3JtTmF0aXZlU2NyaXB0RHluYW1pYyxcbi8vIHRoYXQgc2V0cyB1cCBhIE5hdGl2ZVNjcmlwdCBhcHBsaWNhdGlvbiBhbmQgY2FuIGJvb3RzdHJhcCB0aGUgQW5ndWxhciBmcmFtZXdvcmsuXG5wbGF0Zm9ybU5hdGl2ZVNjcmlwdER5bmFtaWMoKS5ib290c3RyYXBNb2R1bGUoQXBwTW9kdWxlKTtcbiJdfQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm1haW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwR0FBMEc7QUFDMUcsMERBQTRFO0FBRTVFLCtDQUE2QztBQUU3QyxnRkFBZ0Y7QUFDaEYsMEVBQTBFO0FBQzFFLHNFQUFzRTtBQUN0RSx5REFBeUQ7QUFDekQseUVBQXlFO0FBQ3pFLHdFQUF3RTtBQUN4RSxtRkFBbUY7QUFDbkYsc0NBQTJCLEVBQUUsQ0FBQyxlQUFlLENBQUMsc0JBQVMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBpbXBvcnQgc2hvdWxkIGJlIGZpcnN0IGluIG9yZGVyIHRvIGxvYWQgc29tZSByZXF1aXJlZCBzZXR0aW5ncyAobGlrZSBnbG9iYWxzIGFuZCByZWZsZWN0LW1ldGFkYXRhKVxyXG5pbXBvcnQgeyBwbGF0Zm9ybU5hdGl2ZVNjcmlwdER5bmFtaWMgfSBmcm9tIFwibmF0aXZlc2NyaXB0LWFuZ3VsYXIvcGxhdGZvcm1cIjtcclxuXHJcbmltcG9ydCB7IEFwcE1vZHVsZSB9IGZyb20gXCIuL2FwcC9hcHAubW9kdWxlXCI7XHJcblxyXG4vLyBBIHRyYWRpdGlvbmFsIE5hdGl2ZVNjcmlwdCBhcHBsaWNhdGlvbiBzdGFydHMgYnkgaW5pdGlhbGl6aW5nIGdsb2JhbCBvYmplY3RzLFxyXG4vLyBzZXR0aW5nIHVwIGdsb2JhbCBDU1MgcnVsZXMsIGNyZWF0aW5nLCBhbmQgbmF2aWdhdGluZyB0byB0aGUgbWFpbiBwYWdlLlxyXG4vLyBBbmd1bGFyIGFwcGxpY2F0aW9ucyBuZWVkIHRvIHRha2UgY2FyZSBvZiB0aGVpciBvd24gaW5pdGlhbGl6YXRpb246XHJcbi8vIG1vZHVsZXMsIGNvbXBvbmVudHMsIGRpcmVjdGl2ZXMsIHJvdXRlcywgREkgcHJvdmlkZXJzLlxyXG4vLyBBIE5hdGl2ZVNjcmlwdCBBbmd1bGFyIGFwcCBuZWVkcyB0byBtYWtlIGJvdGggcGFyYWRpZ21zIHdvcmsgdG9nZXRoZXIsXHJcbi8vIHNvIHdlIHByb3ZpZGUgYSB3cmFwcGVyIHBsYXRmb3JtIG9iamVjdCwgcGxhdGZvcm1OYXRpdmVTY3JpcHREeW5hbWljLFxyXG4vLyB0aGF0IHNldHMgdXAgYSBOYXRpdmVTY3JpcHQgYXBwbGljYXRpb24gYW5kIGNhbiBib290c3RyYXAgdGhlIEFuZ3VsYXIgZnJhbWV3b3JrLlxyXG5wbGF0Zm9ybU5hdGl2ZVNjcmlwdER5bmFtaWMoKS5ib290c3RyYXBNb2R1bGUoQXBwTW9kdWxlKTtcclxuIl19 \ No newline at end of file