From 3ab9e1922c6c9231edb8a51c11885859041c5d53 Mon Sep 17 00:00:00 2001 From: Gabriel Masclef Date: Thu, 21 Sep 2017 17:13:16 -0400 Subject: [PATCH] Feat: advanced settings added --- src/app/app.module.ts | 3 ++ src/pages/settings/advanced/advanced.html | 54 +++++++++++++++++++++++ src/pages/settings/advanced/advanced.scss | 7 +++ src/pages/settings/advanced/advanced.ts | 33 ++++++++++++++ src/pages/settings/settings.html | 4 ++ src/pages/settings/settings.scss | 4 +- src/pages/settings/settings.ts | 5 +++ 7 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 src/pages/settings/advanced/advanced.html create mode 100644 src/pages/settings/advanced/advanced.scss create mode 100644 src/pages/settings/advanced/advanced.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4951cfd79..a618fd78f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -36,6 +36,7 @@ import { SendPage } from '../pages/send/send'; import { SettingsPage } from '../pages/settings/settings'; /* Settings */ import { AboutPage } from '../pages/settings/about/about'; +import { AdvancedPage } from '../pages/settings/advanced/advanced'; import { TermsOfUsePage } from '../pages/settings/about/terms-of-use/terms-of-use'; import { AltCurrencyPage } from '../pages/settings/alt-currency/alt-currency'; @@ -71,6 +72,7 @@ export function createTranslateLoader(http: Http) { ScanPage, SettingsPage, AboutPage, + AdvancedPage, TermsOfUsePage, OnboardingPage, TourPage, @@ -107,6 +109,7 @@ export function createTranslateLoader(http: Http) { SendPage, SettingsPage, AboutPage, + AdvancedPage, TermsOfUsePage, OnboardingPage, TourPage, diff --git a/src/pages/settings/advanced/advanced.html b/src/pages/settings/advanced/advanced.html new file mode 100644 index 000000000..6821e410f --- /dev/null +++ b/src/pages/settings/advanced/advanced.html @@ -0,0 +1,54 @@ + + + + + Advanced + + + + + + + + + +
+ Use Unconfirmed Funds + +
+
+ + If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays. + +
+ + + +
+ Recent Transaction Card + +
+
+ + If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab. + +
+ + + +
+ Show Next Steps Card + +
+
+ + If enabled, the "Next Steps Card" will appear in the Home tab. + +
+ +
diff --git a/src/pages/settings/advanced/advanced.scss b/src/pages/settings/advanced/advanced.scss new file mode 100644 index 000000000..fc3f55d7a --- /dev/null +++ b/src/pages/settings/advanced/advanced.scss @@ -0,0 +1,7 @@ +page-advanced { + .toggle-header { + display: flex; + justify-content: space-between; + align-items: center; + } +} diff --git a/src/pages/settings/advanced/advanced.ts b/src/pages/settings/advanced/advanced.ts new file mode 100644 index 000000000..80ea2f62e --- /dev/null +++ b/src/pages/settings/advanced/advanced.ts @@ -0,0 +1,33 @@ +import { Component } from '@angular/core'; +import { NavController, NavParams } from 'ionic-angular'; + +@Component({ + selector: 'page-advanced', + templateUrl: 'advanced.html', +}) +export class AdvancedPage { + + public spendUnconfirmed: boolean; + public recentTransactionsEnabled: boolean; + public showNextSteps: boolean; + + constructor(public navCtrl: NavController, public navParams: NavParams) { + } + + ionViewDidLoad() { + console.log('ionViewDidLoad AdvancedPage'); + } + + spendUnconfirmedChange() { + console.log("this.spendUnconfirmed", this.spendUnconfirmed); + } + + recentTransactionsChange() { + console.log("this.recentTransactionsEnabled", this.recentTransactionsEnabled); + } + + nextStepsChange() { + console.log("this.showNextSteps", this.showNextSteps); + } + +} diff --git a/src/pages/settings/settings.html b/src/pages/settings/settings.html index bb8ee6b39..09ba0acd4 100644 --- a/src/pages/settings/settings.html +++ b/src/pages/settings/settings.html @@ -80,6 +80,10 @@ More + + + Advanced + About {{appName}} diff --git a/src/pages/settings/settings.scss b/src/pages/settings/settings.scss index ee78e1c3f..9151f1471 100644 --- a/src/pages/settings/settings.scss +++ b/src/pages/settings/settings.scss @@ -1,3 +1,5 @@ page-settings { - + ion-item { + cursor: pointer; + } } diff --git a/src/pages/settings/settings.ts b/src/pages/settings/settings.ts index 2ed750564..09f3eb541 100644 --- a/src/pages/settings/settings.ts +++ b/src/pages/settings/settings.ts @@ -7,6 +7,7 @@ import { RateProvider } from '../../providers/rate/rate'; import { AltCurrencyPage } from './alt-currency/alt-currency'; import { AboutPage } from './about/about'; +import { AdvancedPage } from './advanced/advanced'; @Component({ selector: 'page-settings', @@ -46,6 +47,10 @@ export class SettingsPage { this.language.set(lang); } + openAdvancedPage() { + this.navCtrl.push(AdvancedPage); + } + openAboutPage() { this.navCtrl.push(AboutPage); }