From b09a73a581d4bcfb241c6caabc9919a0a5ac67ff Mon Sep 17 00:00:00 2001
From: walljm <none@none>
Date: Sat, 31 Dec 2016 18:12:50 -0500
Subject: [PATCH] FEATURE: added font resizing

  * removed test that didnt work
  * refactored user and user profile classes to better contain user logic
---
 DynamicBibleIonic/config.xml                  |  6 +-
 DynamicBibleIonic/src/Helpers.ts              | 24 -------
 DynamicBibleIonic/src/UserProfile.ts          | 65 +++++++++++++++++++
 DynamicBibleIonic/src/bible-service.spec.ts   |  1 -
 .../src/pages/search/search.html              | 10 +--
 .../src/pages/search/search.scss              |  8 +--
 DynamicBibleIonic/src/pages/search/search.ts  | 64 ++++++++----------
 .../src/pages/settings/settings.html          | 24 +++++--
 .../src/pages/settings/settings.ts            | 41 +++++-------
 DynamicBibleIonic/src/types.ts                |  3 +-
 10 files changed, 139 insertions(+), 107 deletions(-)
 delete mode 100644 DynamicBibleIonic/src/Helpers.ts
 create mode 100644 DynamicBibleIonic/src/UserProfile.ts
 delete mode 100644 DynamicBibleIonic/src/bible-service.spec.ts

diff --git a/DynamicBibleIonic/config.xml b/DynamicBibleIonic/config.xml
index b1de5ee8..8262d106 100644
--- a/DynamicBibleIonic/config.xml
+++ b/DynamicBibleIonic/config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.ionicframework.db572483" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-  <name>db</name>
-  <description>An awesome Ionic/Cordova app.</description>
-  <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
+  <name>Dynamic Bible</name>
+  <description>A bible app designed for bible study</description>
+  <author email="jason@walljm.com" href="http://dynamicbible.com/">Dynamic Bible</author>
   <content src="index.html"/>
   <access origin="*"/>
   <allow-intent href="http://*/*"/>
diff --git a/DynamicBibleIonic/src/Helpers.ts b/DynamicBibleIonic/src/Helpers.ts
deleted file mode 100644
index 7d0082ef..00000000
--- a/DynamicBibleIonic/src/Helpers.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Storage } from '@ionic/storage';
-
-export class UserHelpers
-{
-    constructor(public local: Storage)
-    {
-    }
-
-    public validate(u: User, t: User)
-    {
-        let updated = false;
-        for (var k in u)
-        {
-            if (t[k] === undefined)
-            {
-                t[k] = u[k];
-                updated = true;
-            }
-        }
-        if (updated)
-            this.local.set('profile', JSON.stringify(t));
-    }
-
-}
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/UserProfile.ts b/DynamicBibleIonic/src/UserProfile.ts
new file mode 100644
index 00000000..2c903468
--- /dev/null
+++ b/DynamicBibleIonic/src/UserProfile.ts
@@ -0,0 +1,65 @@
+import { Storage } from '@ionic/storage';
+
+export class UserProfile
+{
+    user: User;
+    
+    constructor(u: User)
+    {
+        this.user = u;
+    }
+
+    public textSizeChanged()
+    {
+        $("html").css("font-size", this.user.font_size + "px");
+    }
+
+    public update(t: UserProfile, local: Storage)
+    {
+        let updated = false;
+        for (var k in this.user)
+        {
+            if (t[k] === undefined)
+            {
+                t[k] = this.user[k];
+                updated = true;
+            }
+        }
+
+        for (var k in this.user)
+            this.user[k] = t[k];
+
+        if (updated)
+            this.save(local);
+
+        this.textSizeChanged();
+    }
+
+    save(local: Storage)
+    {
+        local.set('profile', JSON.stringify(this.user));
+    }
+
+    reset(local: Storage)
+    {
+        this.user.strongs_modal = true;
+        this.user.clear_search_after_query = true;
+        this.user.items = [];
+        this.user.append_to_bottom = false;
+        this.user.insert_next_to_item = false;
+        this.user.font_size = 10;
+        this.save(local);
+    }
+
+    public static createDefaultUser(): User
+    {
+        return {
+            strongs_modal: true,
+            clear_search_after_query: true,
+            items: [],
+            append_to_bottom: false,
+            insert_next_to_item: false,
+            font_size: 10
+        };
+    }
+}
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/bible-service.spec.ts b/DynamicBibleIonic/src/bible-service.spec.ts
deleted file mode 100644
index 5f282702..00000000
--- a/DynamicBibleIonic/src/bible-service.spec.ts
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/pages/search/search.html b/DynamicBibleIonic/src/pages/search/search.html
index 25a408a2..a330c65c 100644
--- a/DynamicBibleIonic/src/pages/search/search.html
+++ b/DynamicBibleIonic/src/pages/search/search.html
@@ -1,13 +1,13 @@
 <ion-header>
     <ion-navbar>
-        <button menuToggle large>
-            <ion-icon name="menu"></ion-icon>
+        <button ion-button icon-only menuToggle left>
+            <ion-icon name="menu" large></ion-icon>
         </button>
         <ion-searchbar (search)="getQuery($event)" (input)="setQuery($event)" [showCancelButton]="true"></ion-searchbar>
     </ion-navbar>
 </ion-header>
 <ion-content padding class="search-card">
-    <ion-card *ngFor="let item of user.items">
+    <ion-card *ngFor="let item of userProfile.user.items">
         <passage *ngIf="isPassage(item.type)" [cardItem]="item" [item]="item.data" (onClose)="removeItem($event)" [dict]="item.dict" (onStrongsClicked)="getItemsNextToCard($event)"></passage>
         <strongs *ngIf="isStrongs(item.type)" [cardItem]="item" [item]="item.data" (onClose)="removeItem($event)" (onPassageClicked)="getItemsNextToCard($event)"></strongs>
         <words   *ngIf="isWords(item.type)"   [cardItem]="item" [item]="item.data" (onClose)="removeItem($event)" (onPassageClicked)="getItemsNextToCard($event)"></words>
@@ -15,13 +15,13 @@
             <ion-icon name="close-circle"></ion-icon>
             <div>Close</div>
         </button>
-        <button ion-button icon-left clear small>
+        <!--<button ion-button icon-left clear small>
             <ion-icon name="text"></ion-icon>
             <div>4 Notes</div>
         </button>
         <button ion-button icon-left clear small>
             <ion-icon name="text"></ion-icon>
             <div>8 Tags</div>
-        </button>
+        </button>-->
     </ion-card>
 </ion-content>
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/pages/search/search.scss b/DynamicBibleIonic/src/pages/search/search.scss
index f097f209..787eba97 100644
--- a/DynamicBibleIonic/src/pages/search/search.scss
+++ b/DynamicBibleIonic/src/pages/search/search.scss
@@ -1,15 +1,15 @@
 .search-card {
     p {
-        margin: 20px 0;
-        line-height: 22px;
-        font-size: 16px;
+        margin: 1rem 0;
+        line-height: 1rem;
+        font-size: 1rem;
     }
 }
 
 .search-card {
     .title {
         background-color: gainsboro;
-        font-size: 1.4em;
+        font-size: 2rem;
     }
 
     a {
diff --git a/DynamicBibleIonic/src/pages/search/search.ts b/DynamicBibleIonic/src/pages/search/search.ts
index 5a1d9621..0eea77f1 100644
--- a/DynamicBibleIonic/src/pages/search/search.ts
+++ b/DynamicBibleIonic/src/pages/search/search.ts
@@ -7,7 +7,7 @@ import {StrongsService} from "../../strongs-service";
 import {WordService} from "../../word-service";
 import {StrongsModal} from "../../components/strongs-modal/strongs-modal.ts";
 import {Storage} from '@ionic/storage';
-import {UserHelpers} from '../../Helpers';
+import {UserProfile} from '../../UserProfile';
 
 class Item
 {
@@ -24,13 +24,7 @@ class Item
 export class SearchPage
 {
     searchQuery: string = "";
-    user: User = {
-        strongs_modal: true,
-        clear_search_after_query: true,
-        items: [],
-        append_to_bottom: false,
-        insert_next_to_item: false
-    };
+    userProfile: UserProfile;
     last: CardItem;
 
     constructor(
@@ -41,27 +35,28 @@ export class SearchPage
         , public modalCtrl: ModalController
         , public local: Storage)
     {
+        this.userProfile = new UserProfile(UserProfile.createDefaultUser());
+
         // Check if there is a profile saved in local storage
         this.local.get('profile').then(profile =>
         {
-            let t = this.user;
-            if (profile === null)
-                this.local.set('profile', JSON.stringify(this.user));
-            else
+            let t = this.userProfile;
+
+            if (profile !== null)
                 t = JSON.parse(profile);
 
-            new UserHelpers(local).validate(this.user, t);
+            this.userProfile.update(t, local);
 
-            this.initializeItems(t);
+            this.initializeItems(this.userProfile);
         }).catch(error =>
         {
             console.log(error);
         });
     }
 
-    initializeItems(u: User)
+    initializeItems(u: UserProfile)
     {
-        this.user = u;
+        this.userProfile = u;
     }
 
     presentStrongsModal(strongs: StrongsResult)
@@ -81,11 +76,11 @@ export class SearchPage
 
     removeItem(item)
     {
-        let idx = this.user.items.indexOf(item);
-        this.user.items.splice(idx, 1);
+        let idx = this.userProfile.user.items.indexOf(item);
+        this.userProfile.user.items.splice(idx, 1);
 
         // save the users settings.
-        this.saveSettings();
+        this.userProfile.save(this.local);
     }
 
     isPassage(t: string)
@@ -102,33 +97,28 @@ export class SearchPage
     {
         return t === "Words";
     }
-
-    saveSettings()
-    {
-        this.local.set('profile', JSON.stringify(this.user));
-    }
-
+    
     addItemToList(item)
     {
-        if (this.user.append_to_bottom)
+        if (this.userProfile.user.append_to_bottom)
         {
-            if (this.last != null && this.user.insert_next_to_item)
+            if (this.last != null && this.userProfile.user.insert_next_to_item)
             {
-                let idx = this.user.items.indexOf(this.last);
-                this.user.items.splice(idx + 1, 0, item);
+                let idx = this.userProfile.user.items.indexOf(this.last);
+                this.userProfile.user.items.splice(idx + 1, 0, item);
             }
             else
-                this.user.items.push(item);
+                this.userProfile.user.items.push(item);
         }
         else
         {
-            if (this.last != null && this.user.insert_next_to_item)
+            if (this.last != null && this.userProfile.user.insert_next_to_item)
             {
-                let idx = this.user.items.indexOf(this.last);
-                this.user.items.splice(idx, 0, item);
+                let idx = this.userProfile.user.items.indexOf(this.last);
+                this.userProfile.user.items.splice(idx, 0, item);
             }
             else
-                this.user.items.unshift(item);
+                this.userProfile.user.items.unshift(item);
         }
         this.last = null;
     }
@@ -171,7 +161,7 @@ export class SearchPage
                             }
                             q = q.substring(1, q.length);
                             let result = this.strongsService.getResult(parseInt(q), dict);
-                            if (this.user.strongs_modal)
+                            if (this.userProfile.user.strongs_modal)
                                 this.presentStrongsModal(result);
                             else
                                 this.addItemToList({ data: result, type: "Strongs", dict: "na" });
@@ -190,10 +180,10 @@ export class SearchPage
                     }
                 }
             }
-            if (this.user.clear_search_after_query)
+            if (this.userProfile.user.clear_search_after_query)
                 $(".searchbar-input").val("");
 
-            this.saveSettings();
+            this.userProfile.save(this.local);
         }
         catch (error)
         {
diff --git a/DynamicBibleIonic/src/pages/settings/settings.html b/DynamicBibleIonic/src/pages/settings/settings.html
index 016a885b..7328773c 100644
--- a/DynamicBibleIonic/src/pages/settings/settings.html
+++ b/DynamicBibleIonic/src/pages/settings/settings.html
@@ -1,29 +1,39 @@
 <ion-header>
     <ion-navbar>
-
-        <button menuToggle item-left large>
+        <button ion-button icon-only menuToggle left>
             <ion-icon name="menu"></ion-icon>
         </button>
         <ion-title>Settings</ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content padding>
-    <template [ngIf]="user">
+    <template [ngIf]="userProfile.user">
+        <ion-list>
+            <ion-list-header>
+                Adjust Text
+            </ion-list-header>
+            <ion-item>
+                <ion-range min="6" max="24" step="2" snaps="true" [(ngModel)]="userProfile.user.font_size" (ionChange)="textSizeChanged()">
+                    <ion-label range-left class="small-text">A</ion-label>
+                    <ion-label range-right>A</ion-label>
+                </ion-range>
+            </ion-item>
+        </ion-list>
         <ion-item>
             <ion-label>Show Strongs as Modal</ion-label>
-            <ion-toggle color="dark" [(ngModel)]="user.strongs_modal" (ionChange)="save()"></ion-toggle>
+            <ion-toggle color="dark" [(ngModel)]="userProfile.user.strong_modal" (ionChange)="save()"></ion-toggle>
         </ion-item>
         <ion-item>
             <ion-label>Clear Search Bar after Query</ion-label>
-            <ion-toggle color="dark" [(ngModel)]="user.clear_search_after_query" (ionChange)="save()"></ion-toggle>
+            <ion-toggle color="dark" [(ngModel)]="userProfile.user.clear_search_after_query" (ionChange)="save()"></ion-toggle>
         </ion-item>
         <ion-item>
             <ion-label>Append Results to the Bottom of List</ion-label>
-            <ion-toggle color="dark" [(ngModel)]="user.append_to_bottom" (ionChange)="save()"></ion-toggle>
+            <ion-toggle color="dark" [(ngModel)]="userProfile.user.append_to_bottom" (ionChange)="save()"></ion-toggle>
         </ion-item>
         <ion-item>
             <ion-label>Insert Results Next To Item</ion-label>
-            <ion-toggle color="dark" [(ngModel)]="user.insert_next_to_item" (ionChange)="save()"></ion-toggle>
+            <ion-toggle color="dark" [(ngModel)]="userProfile.user.insert_next_to_item" (ionChange)="save()"></ion-toggle>
         </ion-item>
         <ion-item>
             <button ion-button (click)="reset()">Reset Settings</button>
diff --git a/DynamicBibleIonic/src/pages/settings/settings.ts b/DynamicBibleIonic/src/pages/settings/settings.ts
index d2588561..e420d219 100644
--- a/DynamicBibleIonic/src/pages/settings/settings.ts
+++ b/DynamicBibleIonic/src/pages/settings/settings.ts
@@ -1,8 +1,9 @@
 /// <reference path="../../types.ts" />
+/// <reference path="../../../typings/browser/ambient/jquery/index.d.ts" />
 import { Component } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { Storage } from '@ionic/storage';
-import {UserHelpers} from '../../Helpers';
+import { UserProfile } from '../../UserProfile';
 
 @Component({
     selector: 'settings',
@@ -10,51 +11,41 @@ import {UserHelpers} from '../../Helpers';
 })
 export class SettingsPage
 {
-    user: User = {
-        strongs_modal: true,
-        clear_search_after_query: true,
-        items: [],
-        append_to_bottom: false,
-        insert_next_to_item: false
-    };
+    textSize: number = 0;
+    userProfile: UserProfile;
 
     constructor(public navCtrl: NavController, public local: Storage)
     {
+        this.userProfile = new UserProfile(UserProfile.createDefaultUser());
+
         // Check if there is a profile saved in local storage
         this.local.get('profile').then(profile =>
         {
-            let t = this.user;
+            let t = this.userProfile;
 
             if (profile !== null)
                 t = JSON.parse(profile);
 
-            new UserHelpers(local).validate(this.user, t);
-            this.user = t;
+            this.userProfile.update(t, local);
         }).catch(error =>
         {
             console.log(error);
         });
     }
 
+    textSizeChanged()
+    {
+        this.userProfile.textSizeChanged();
+        this.save();
+    }
+
     save()
     {
-        this.local.set('profile', JSON.stringify(this.user));
+        this.userProfile.save(this.local);
     }
 
     reset()
     {
-        this.user = {
-            strongs_modal: true,
-            clear_search_after_query: true,
-            items: [],
-            append_to_bottom: false,
-            insert_next_to_item: false
-        };
-        this.save();
-    }
-
-    ionViewDidLoad()
-    {
-        console.log('Hello SettingsPage Page');
+        this.userProfile.reset(this.local);
     }
 }
\ No newline at end of file
diff --git a/DynamicBibleIonic/src/types.ts b/DynamicBibleIonic/src/types.ts
index 40d35583..cb6567d4 100644
--- a/DynamicBibleIonic/src/types.ts
+++ b/DynamicBibleIonic/src/types.ts
@@ -22,7 +22,8 @@ type User = {
     clear_search_after_query: boolean,
     items: CardItem[],
     append_to_bottom: boolean,
-    insert_next_to_item: boolean
+    insert_next_to_item: boolean,
+    font_size: number
 }
 
 type BiblePassage = {