Skip to content
Permalink
Browse files

Upgrade to Apphoven 2.0.0

Added: LevelService, Google-Account Login, Archive-Piece Functionality.
Updated global UI elements, colors, fonts. Updated Plugins & Minor
bugfixes.
  • Loading branch information
Taremeh committed Feb 4, 2018
1 parent 7b9735e commit 125ad41f665fa46efd805c00c4004de8d255937a
Showing with 1,628 additions and 590 deletions.
  1. +15 −12 apphovenAlpha/app/App_Resources/Android/AndroidManifest.xml
  2. BIN apphovenAlpha/app/App_Resources/Android/drawable-hdpi/background.png
  3. BIN apphovenAlpha/app/App_Resources/Android/drawable-hdpi/bg_1.png
  4. BIN apphovenAlpha/app/App_Resources/Android/drawable-hdpi/bg_landscape_1.png
  5. BIN apphovenAlpha/app/App_Resources/Android/drawable-hdpi/bg_landscape_2.png
  6. BIN apphovenAlpha/app/App_Resources/Android/drawable-hdpi/bg_landscape_3.png
  7. BIN apphovenAlpha/app/App_Resources/Android/drawable-ldpi/background.png
  8. BIN apphovenAlpha/app/App_Resources/Android/drawable-ldpi/bg_1.png
  9. BIN apphovenAlpha/app/App_Resources/Android/drawable-mdpi/background.png
  10. BIN apphovenAlpha/app/App_Resources/Android/drawable-mdpi/bg_1.png
  11. BIN apphovenAlpha/app/App_Resources/Android/drawable-xhdpi/background.png
  12. BIN apphovenAlpha/app/App_Resources/Android/drawable-xhdpi/bg_1.png
  13. BIN apphovenAlpha/app/App_Resources/Android/drawable-xxhdpi/background.png
  14. BIN apphovenAlpha/app/App_Resources/Android/drawable-xxhdpi/bg_1.png
  15. BIN apphovenAlpha/app/App_Resources/Android/drawable-xxxhdpi/background.png
  16. BIN apphovenAlpha/app/App_Resources/Android/drawable-xxxhdpi/bg_1.png
  17. +1 −1 apphovenAlpha/app/App_Resources/Android/values/colors.xml
  18. +92 −6 apphovenAlpha/app/app.css
  19. +3 −2 apphovenAlpha/app/app.module.ts
  20. BIN apphovenAlpha/app/fonts/Vision-Bold.otf
  21. BIN apphovenAlpha/app/fonts/Vision-BoldItalic.otf
  22. BIN apphovenAlpha/app/fonts/Vision-LightItalic.otf
  23. BIN apphovenAlpha/app/fonts/Vision-Regular italic.otf
  24. BIN apphovenAlpha/app/fonts/Vision-Thin.otf
  25. BIN apphovenAlpha/app/fonts/Vision.otf
  26. +1 −1 apphovenAlpha/app/main.ts
  27. +3 −3 apphovenAlpha/app/pages/audio-recorder/audio-analyzer/audio-analyzer-common.css
  28. +3 −3 apphovenAlpha/app/pages/audio-recorder/audio-analyzer/audio-analyzer.component.html
  29. +3 −1 apphovenAlpha/app/pages/audio-recorder/audio-analyzer/audio-analyzer.component.ts
  30. +4 −4 apphovenAlpha/app/pages/audio-recorder/audio-list/audio-list.component.html
  31. +47 −3 apphovenAlpha/app/pages/audio-recorder/audio-recorder/audio-recorder-common.css
  32. +35 −40 apphovenAlpha/app/pages/audio-recorder/audio-recorder/audio-recorder.component.html
  33. +179 −103 apphovenAlpha/app/pages/audio-recorder/audio-recorder/audio-recorder.component.ts
  34. +13 −1 apphovenAlpha/app/pages/home/home-common.css
  35. +28 −10 apphovenAlpha/app/pages/home/home.component.html
  36. +133 −9 apphovenAlpha/app/pages/home/home.component.ts
  37. +3 −1 apphovenAlpha/app/pages/login/login-common.css
  38. +12 −5 apphovenAlpha/app/pages/login/login.component.html
  39. +29 −2 apphovenAlpha/app/pages/login/login.component.ts
  40. +3 −3 apphovenAlpha/app/pages/metronome/metronome.component.html
  41. +2 −2 apphovenAlpha/app/pages/piece/addpiece/addpiece-common.css
  42. +1 −1 apphovenAlpha/app/pages/piece/addpiece/addpiece.component.html
  43. +2 −1 apphovenAlpha/app/pages/piece/addpiece/addpiece.component.ts
  44. +18 −14 apphovenAlpha/app/pages/piece/addpiece/registerpiece/registerpiece-common.css
  45. +30 −32 apphovenAlpha/app/pages/piece/addpiece/registerpiece/registerpiece.component.html
  46. +16 −14 apphovenAlpha/app/pages/piece/addpiece/registerpiece/registerpiece.component.ts
  47. +28 −8 apphovenAlpha/app/pages/piece/piece-dashboard/piece-dashboard-common.css
  48. +12 −11 apphovenAlpha/app/pages/piece/piece-dashboard/piece-dashboard.component.html
  49. +31 −4 apphovenAlpha/app/pages/piece/piece-dashboard/piece-dashboard.component.ts
  50. +33 −6 apphovenAlpha/app/pages/piece/piece-list/piece-list-common.css
  51. +24 −9 apphovenAlpha/app/pages/piece/piece-list/piece-list.component.html
  52. +129 −47 apphovenAlpha/app/pages/piece/piece-list/piece-list.component.ts
  53. +56 −12 apphovenAlpha/app/pages/piece/piece-recorder/piece-recorder-common.css
  54. +65 −57 apphovenAlpha/app/pages/piece/piece-recorder/piece-recorder.component.html
  55. +267 −129 apphovenAlpha/app/pages/piece/piece-recorder/piece-recorder.component.ts
  56. +3 −3 apphovenAlpha/app/pages/practice-session/practice-session.component.html
  57. +8 −2 apphovenAlpha/app/pages/practice-session/practice-session.component.ts
  58. +3 −3 apphovenAlpha/app/pages/settings/settings.component.html
  59. +30 −2 apphovenAlpha/app/pages/settings/settings.component.ts
  60. +9 −0 apphovenAlpha/app/shared/firebase/backend.service.ts
  61. +2 −1 apphovenAlpha/app/shared/firebase/index.ts
  62. +138 −0 apphovenAlpha/app/shared/firebase/level.service.ts
  63. +74 −15 apphovenAlpha/app/shared/firebase/login.service.ts
  64. +37 −5 apphovenAlpha/app/shared/firebase/piece.service.ts
  65. +1 −1 apphovenAlpha/app/shared/model/Piece.ts
  66. +2 −1 apphovenAlpha/package.json
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="__PACKAGE__"
android:versionCode="4"
android:versionName="1.2.0">
android:versionCode="5"
android:versionName="2.0.0">

<supports-screens
android:smallScreens="true"
@@ -19,23 +19,15 @@
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.VIBRATE" />

<application
android:name="com.tns.NativeScriptApplication"
android:allowBackup="true"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:theme="@style/ApphovenTheme">
<service android:name="org.nativescript.plugins.firebase.MyFirebaseInstanceIDService">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>
<service android:name="org.nativescript.plugins.firebase.MyFirebaseMessagingService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
</service>

<activity
android:name="com.tns.NativeScriptActivity"
@@ -52,5 +44,16 @@
</intent-filter>
</activity>
<activity android:name="com.tns.ErrorReportActivity"/>

<service android:name="org.nativescript.plugins.firebase.MyFirebaseInstanceIDService">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>
<service android:name="org.nativescript.plugins.firebase.MyFirebaseMessagingService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
</service>
</application>
</manifest>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -7,7 +7,7 @@

<!-- Primary RED 600 (instead of 500 / Therefore, all other also +100) -->
<color name="ah_primary">#F44336</color>
<color name="ah_primaryDark">#D32F2F</color>
<color name="ah_primaryDark">#D04F4F</color>
<color name="ah_primaryColorLight">#FFCDD2</color>
<!-- <color name="ah_accent">#FFC107</color> -->
<color name="ah_accent">#F44336</color>
@@ -12,6 +12,32 @@
* CONTAINER COLORS
*/

.primary-color {
color: #FFFFFF;
background-color: #E95D59;
}

.primary-color-dark {
color: #FFFFFF;
background-color: #D04F4F;
}

.secondary-color {
color: #FFFFFF;
background-color: #555555;
}

.secondary-color-light {
color: #FFFFFF;
background-color: #858585;
}







.ah-c-primary {
background-color: #E53935;
}
@@ -28,6 +54,14 @@
* TEXT COLORS
*/

.font-dark {
color: #3E3E3E;
}





.ah-text-primary {
color: white;
opacity: 0.87;
@@ -82,6 +116,53 @@ Label {
}



/*
* Elements
*/

button {
font-family: "Vision-Bold";
/*margin: 5%;
padding: 2%;*/
font-size: 19;

color: #FFFFFF;
background-color: #555555;
border-radius: 8;
}

textview {
font-family: "Vision";
}

.hr-dark {
border-width: 0.5;
border-color: #D04F4F;
}

/* ACHIVEMENT UI */

.achievement {
color: white;
width: 80%;
border-radius: 50;
border-color: #D04F4F;
border-width: 3;
margin-bottom: 75;
padding: 20;
horizontal-alignement: center;
background-color: #E95D59;
}









.ah-main-container {
/* background-image: url("res://bg"); #982528 */
/* background-color: #FAFAFA; */
@@ -113,12 +194,12 @@ Label {
color: #F9F9F9;
}

.font-dark {
/*.font-dark {
color: #757575;
}
}*/

.beethoven-container {
background-color: #F44336;
/*background-color: #F44336;*/
padding: 20 10 20 10;
}

@@ -152,19 +233,24 @@ Label {
}

.title-italic {
font-family: 'Lato-Italic';
font-family: 'Vision-Regular italic';
}

.title-regular {
font-size: 18;
font-family: 'Lato-Regular';
font-family: 'Vision';
}

.title-bold {
font-size: 18;
font-family: 'Lato-Bold';
font-family: 'Vision-Bold';
text-transform: uppercase;
}

.subtitle {
font-size: 12;
}

.hugetitle {
font-size: 25;
}
@@ -14,7 +14,7 @@ import { routes, navigatableComponents } from "./app.routing";

// Providers
import { authProviders } from "./app.routing";
import { setStatusBarColors, BackendService, LoginService, PieceService, HttpService } from "./shared";
import { setStatusBarColors, BackendService, LoginService, PieceService, HttpService, LevelService } from "./shared";
import { PerformanceTestService } from "./pages/metronome/performance-test.service";

// Modules
@@ -31,7 +31,8 @@ import { SettingsModule } from "./pages/settings/settings.module";
authProviders,
PerformanceTestService,
HttpService,
PieceService
PieceService,
LevelService
],
imports: [
NativeScriptModule,
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -13,7 +13,7 @@ firebase.initializeApp({
// if your server passed a custom property called 'foo', then do this:
// console.log(`Value of 'foo': ${message.data.foo}`);
},
persist: true
persist: true
});

platformNativeScriptDynamic().bootstrapModule(AppModule);
@@ -10,7 +10,6 @@ button {

.meta-info-container {
padding: 20%;
background-color: #F44336;
color: white;
}

@@ -26,8 +25,8 @@ button {

.time-slider-container {
background-color: #FAFAFA;
color: #D04F4F;
padding: 10;
color: #F44336;
}

.add-marker-icon {
@@ -38,6 +37,7 @@ button {
}

.mark-label {
border-radius: 4;
padding: 3;
margin: 0 3 0 3;
background-color: #BDBDBD;
@@ -46,7 +46,7 @@ button {

.mark-label-highlight {
color: white;
background-color: #F44336;
background-color: #D04F4F;
}

.mark-info-label {
@@ -1,4 +1,4 @@
<StackLayout class="meta-info-container">
<StackLayout class="meta-info-container primary-color">
<ScrollView #scrlView orientation="horizontal">
<Label class="h2" text="{{ displayTitle }}"></Label>
</ScrollView>
@@ -25,8 +25,8 @@
<Label (tap)="addMark()" text="{{ addIcon }}" class="icon-font add-marker-icon"></Label>
<ScrollView orientation="horizontal">
<StackLayout orientation="horizontal">
<Label *ngIf="noMarks" text="Tap on the pin to add a marker" class="mark-info-label"></Label>
<Label *ngFor="let mark of fbRecordingMarks" text="{{ mark.time | mstransformer }}" class="{{ mark.class }}" (tap)="onMarkTap(mark.position)"></Label>
<Label *ngIf="noMarks" text="Tap on the pin to add a marker" class="mark-info-label font-dark"></Label>
<Label *ngFor="let mark of fbRecordingMarks" text="{{ mark.time | mstransformer }}" class="{{ mark.class }} font-light" (tap)="onMarkTap(mark.position)"></Label>
</StackLayout>
</ScrollView>

@@ -159,8 +159,10 @@ export class AudioAnalyzerComponent implements OnInit, OnDestroy {
// Set MeterLine Color (RED if played / WHITE if not played)
for (let i = 0; i < this.audioMeterLine.length; i++) {
if(time > (this.duration / this.audioMeterLine.length * i)){
this.audioMeterLine[i].color = "#d33b30";
// Played
this.audioMeterLine[i].color = "#D04F4F";
} else {
// Ahead
this.audioMeterLine[i].color = "#f7f7f7";
}
}
@@ -1,6 +1,6 @@
<ActionBar class="ah-action-bar">
<ActionBar class="ah-action-bar primary-color">
<GridLayout columns="*">
<Label col="0" text="APPHOVEN" style="font-size: 20; vertical-align: center;"></Label>
<Label col="0" text="YOUR RECORDINGS" class="title-regular"></Label>
</GridLayout>
</ActionBar>
<StackLayout class="ah-main-container">
@@ -14,15 +14,15 @@
<Label row="1" text="No recordings found" class="text-center p-5 m-10"></Label>
</GridLayout>
<ListView class="list-group clear-background" [items]="fbRecordingArray" separatorColor="transparent" (itemTap)="onRecordingTap($event)">
<template let-recording="item">
<ng-template let-recording="item">
<StackLayout class="list-group-item clear-background">
<GridLayout rows="auto, auto"columns="*, auto">
<Label row="0" col="0" class="list-group-item-heading" [text]="recording.displayTitle"></Label>
<Label row="1" col="0" class="list-group-item-text" textWrap="true" text="{{ recording.recordingDate | date:'medium' }}" visibility="{{recording.recordingDate ? 'visible' : 'collapsed' }}"></Label>
<Label row="0" col="1" class="icon-font icon-container" [text]="iconSettings" (tap)="showRecordingOptions(recording.fileName)"></Label>
</GridLayout>
</StackLayout>
</template>
</ng-template>
</ListView>
</StackLayout>
</StackLayout>

0 comments on commit 125ad41

Please sign in to comment.
You can’t perform that action at this time.