spacenerdmo/goober-ionic
Archived
1
0
Fork 0
Code Issues 33 Pull requests Projects Releases 12 Packages Wiki Activity

wire up cc on reply setting and refresh timeline on back event

Browse source
This commit is contained in:
Morgan McMillian 2017-08-05 08:59:22 -07:00
parent 3f57ebe195
commit 83d1ff2555
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pages/settings/settings.ts
View file

@ -1,6 +1,7 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { NavController, NavParams } from 'ionic-angular'; import { NavController, NavParams } from 'ionic-angular';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { Events } from 'ionic-angular';
/** /**
* Generated class for the SettingsPage page. * Generated class for the SettingsPage page.
@ -17,7 +18,8 @@ export class SettingsPage {
private set_unified: boolean; private set_unified: boolean;
private set_cc: boolean; private set_cc: boolean;
constructor(public navCtrl: NavController, private storage: Storage, public navParams: NavParams) { constructor(public navCtrl: NavController, private storage: Storage, public navParams: NavParams,
public events: Events) {
} }
ngAfterViewInit() { ngAfterViewInit() {
@ -34,6 +36,10 @@ export class SettingsPage {
}); });
} }
ionViewDidLeave() {
this.events.publish('stream:reload', {});
}
updateUnified() { updateUnified() {
this.storage.set('unified', this.set_unified); this.storage.set('unified', this.set_unified);
} }

12
src/pages/stream/stream.ts
View file

@ -29,12 +29,17 @@ export class StreamPage {
myUsername: string; myUsername: string;
showScrollBtn: boolean = false; showScrollBtn: boolean = false;
showUnified: boolean; showUnified: boolean;
ccOnReply: boolean = false;
constructor(public navCtrl: NavController, public navParams: NavParams, public modalCtrl: ModalController, constructor(public navCtrl: NavController, public navParams: NavParams, public modalCtrl: ModalController,
private changeDetectorRef: ChangeDetectorRef, public toastCtrl: ToastController, private storage: Storage, private changeDetectorRef: ChangeDetectorRef, public toastCtrl: ToastController, private storage: Storage,
public popoverCtrl: PopoverController, public events: Events) { public popoverCtrl: PopoverController, public events: Events) {
// console.log(JSON.stringify(navParams)); // console.log(JSON.stringify(navParams));
this.storage.get('cc').then((val) => {
this.ccOnReply = val;
});
this.storage.get('unified').then((val) => { this.storage.get('unified').then((val) => {
this.showUnified = val; this.showUnified = val;
@ -274,13 +279,13 @@ export class StreamPage {
} }
showReplyPost(postData) { showReplyPost(postData) {
let newPostModal = this.modalCtrl.create(NewPostModal, {type: 'reply', post: postData, me: this.myUsername}); let newPostModal = this.modalCtrl.create(NewPostModal, {type: 'reply', post: postData, me: this.myUsername, cc: this.ccOnReply});
newPostModal.present(); newPostModal.present();
} }
showQuotedPost(postData) { showQuotedPost(postData) {
console.log(postData); console.log(postData);
let newPostModal = this.modalCtrl.create(NewPostModal, {type: 'quote', post: postData, me: this.myUsername}); let newPostModal = this.modalCtrl.create(NewPostModal, {type: 'quote', post: postData, me: this.myUsername, cc: this.ccOnReply});
newPostModal.present(); newPostModal.present();
} }
@ -401,6 +406,9 @@ export class NewPostModal {
parseMentions(mentions) { parseMentions(mentions) {
let mtext = "" let mtext = ""
if (this.navParams.data.cc) {
mtext += "\n/";
}
for(var i = 0; i < mentions.length; i++) { for(var i = 0; i < mentions.length; i++) {
let mu = mentions[i].text; let mu = mentions[i].text;
if (mu !== this.myUsername) { if (mu !== this.myUsername) {