diff --git a/config.xml b/config.xml index 7158a48..0985fb4 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Goober Goober, a mobile app for pnut.io Morgan McMillian @@ -85,12 +85,13 @@ - + - - + + + - + diff --git a/package.json b/package.json index fc098f1..2f3393f 100644 --- a/package.json +++ b/package.json @@ -1,67 +1,71 @@ { - "name": "Goober", - "version": "0.0.1", - "author": "Ionic Framework", - "homepage": "http://ionicframework.com/", - "private": true, - "scripts": { - "clean": "ionic-app-scripts clean", - "build": "ionic-app-scripts build", - "lint": "ionic-app-scripts lint", - "ionic:build": "ionic-app-scripts build", - "ionic:serve": "ionic-app-scripts serve" + "name": "Goober", + "version": "0.0.1", + "author": "Ionic Framework", + "homepage": "http://ionicframework.com/", + "private": true, + "scripts": { + "clean": "ionic-app-scripts clean", + "build": "ionic-app-scripts build", + "lint": "ionic-app-scripts lint", + "ionic:build": "ionic-app-scripts build", + "ionic:serve": "ionic-app-scripts serve" + }, + "dependencies": { + "@angular/common": "5.2.5", + "@angular/compiler": "5.2.5", + "@angular/compiler-cli": "5.2.5", + "@angular/core": "5.2.5", + "@angular/forms": "5.2.5", + "@angular/http": "5.2.5", + "@angular/platform-browser": "5.2.5", + "@angular/platform-browser-dynamic": "5.2.5", + "@ionic-native/core": "4.5.3", + "@ionic-native/file-chooser": "^4.5.3", + "@ionic-native/splash-screen": "4.5.3", + "@ionic-native/status-bar": "4.5.3", + "@ionic/storage": "2.1.3", + "cordova-android": "^7.0.0", + "cordova-plugin-console": "^1.0.5", + "cordova-plugin-device": "^2.0.1", + "cordova-plugin-filechooser": "^1.0.1", + "cordova-plugin-inappbrowser": "^2.0.2", + "cordova-plugin-share-content": "^1.0.0", + "cordova-plugin-splashscreen": "^5.0.2", + "cordova-plugin-statusbar": "^2.2.2", + "cordova-plugin-telerik-imagepicker": "^2.1.8", + "cordova-plugin-whitelist": "^1.3.1", + "ionic-angular": "3.9.2", + "ionic-plugin-keyboard": "^2.2.1", + "ionicons": "3.0.0", + "moment": "^2.18.1", + "ng2-cordova-oauth": "0.0.8", + "pnut-butter": "^0.19.0", + "run": "^1.4.0", + "rxjs": "5.5.6", + "sw-toolbox": "3.6.0", + "zone.js": "0.8.20" + }, + "devDependencies": { + "@ionic/app-scripts": "3.1.8", + "ionic": "3.19.1", + "typescript": "2.7.2" + }, + "description": "An Ionic project", + "cordova": { + "plugins": { + "cordova-plugin-console": {}, + "cordova-plugin-device": {}, + "cordova-plugin-splashscreen": {}, + "cordova-plugin-statusbar": {}, + "cordova-plugin-whitelist": {}, + "ionic-plugin-keyboard": {}, + "cordova-plugin-inappbrowser": {}, + "cordova-plugin-share-content": {}, + "cordova-plugin-filechooser": {} }, - "dependencies": { - "@angular/common": "5.2.5", - "@angular/compiler": "5.2.5", - "@angular/compiler-cli": "5.2.5", - "@angular/core": "5.2.5", - "@angular/forms": "5.2.5", - "@angular/http": "5.2.5", - "@angular/platform-browser": "5.2.5", - "@angular/platform-browser-dynamic": "5.2.5", - "@ionic-native/core": "4.5.3", - "@ionic-native/splash-screen": "4.5.3", - "@ionic-native/status-bar": "4.5.3", - "@ionic/storage": "2.1.3", - "cordova-android": "^7.0.0", - "cordova-plugin-console": "^1.0.5", - "cordova-plugin-device": "^2.0.1", - "cordova-plugin-inappbrowser": "^2.0.2", - "cordova-plugin-share-content": "^1.0.0", - "cordova-plugin-splashscreen": "^5.0.2", - "cordova-plugin-statusbar": "^2.2.2", - "cordova-plugin-whitelist": "^1.3.1", - "ionic-angular": "3.9.2", - "ionic-plugin-keyboard": "^2.2.1", - "ionicons": "3.0.0", - "moment": "^2.18.1", - "ng2-cordova-oauth": "0.0.8", - "pnut-butter": "^0.19.0", - "run": "^1.4.0", - "rxjs": "5.5.6", - "sw-toolbox": "3.6.0", - "zone.js": "0.8.20" - }, - "devDependencies": { - "@ionic/app-scripts": "3.1.8", - "ionic": "3.19.1", - "typescript": "2.7.2" - }, - "description": "An Ionic project", - "cordova": { - "plugins": { - "cordova-plugin-console": {}, - "cordova-plugin-device": {}, - "cordova-plugin-splashscreen": {}, - "cordova-plugin-statusbar": {}, - "cordova-plugin-whitelist": {}, - "ionic-plugin-keyboard": {}, - "cordova-plugin-inappbrowser": {}, - "cordova-plugin-share-content": {} - }, - "platforms": [ - "android" - ] - } -} \ No newline at end of file + "platforms": [ + "android" + ] + } +} diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index 248bd95..18642d6 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index c75d09d..afa5173 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index 45ba517..ae05848 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index cf16450..5dd0cd7 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index 69cde96..f24cf36 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index 85c6471..ad3c47c 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png index 4b0e072..acc30d0 100644 Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png index bfa3a3a..931042f 100644 Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png index 23c132d..f17f8be 100644 Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png index e9f6c74..86f67a2 100644 Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png index 496d5f5..a909a8f 100644 Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png index 2b05506..cd27c83 100644 Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png index a2c5ef8..6b982c4 100644 Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png index a7af524..a478f7f 100644 Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png index 05bac15..0a0da55 100644 Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png index ca44d66..d6d89de 100644 Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png index 2d8f743..2e23659 100644 Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png index c5d8120..a5e003b 100644 Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/resources/icon.png.md5 b/resources/icon.png.md5 new file mode 100644 index 0000000..823fb32 --- /dev/null +++ b/resources/icon.png.md5 @@ -0,0 +1 @@ +b72de713e098078c68cbffd6ab82439b \ No newline at end of file diff --git a/resources/splash.png.md5 b/resources/splash.png.md5 new file mode 100644 index 0000000..d0efa07 --- /dev/null +++ b/resources/splash.png.md5 @@ -0,0 +1 @@ +7ce07128c050f41eb46a94eaddd55d4a \ No newline at end of file diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d403eeb..73e2d49 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -12,6 +12,7 @@ import { StatusBar } from '@ionic-native/status-bar'; import { SplashScreen } from '@ionic-native/splash-screen'; import { IonicStorageModule } from '@ionic/storage'; import { Device } from '@ionic-native/device'; +import { FileChooser } from '@ionic-native/file-chooser'; import { TimeagoPipe } from '../pipes/timeago/timeago'; import { ParserPipe } from '../pipes/parser/parser'; @@ -46,6 +47,7 @@ import { ParserPipe } from '../pipes/parser/parser'; StatusBar, SplashScreen, Device, + FileChooser, {provide: ErrorHandler, useClass: IonicErrorHandler} ] }) diff --git a/src/pages/stream/stream.ts b/src/pages/stream/stream.ts index 231978c..c1a7ef0 100644 --- a/src/pages/stream/stream.ts +++ b/src/pages/stream/stream.ts @@ -2,6 +2,7 @@ import { Component, ViewChild, ChangeDetectorRef } from '@angular/core'; import { ViewController, NavController, NavParams, ModalController, Content, ToastController, PopoverController } from 'ionic-angular'; import { ThreadPage } from '../thread/thread'; import { Storage } from '@ionic/storage'; +import { FileChooser } from '@ionic-native/file-chooser'; import { Events } from 'ionic-angular'; import * as pnut from 'pnut-butter'; @@ -335,6 +336,11 @@ export class StreamPage { + + +
{{textCount()}}