Skip to content

Commit

Permalink
Update home template to have more examples
Browse files Browse the repository at this point in the history
Improve windows appbar
  • Loading branch information
CKGrafico committed Nov 4, 2015
1 parent 7bea1d3 commit f8315ac
Show file tree
Hide file tree
Showing 23 changed files with 99 additions and 60 deletions.
16 changes: 10 additions & 6 deletions App/Cordova_App.vstemplate
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
<TemplateContent>
<Project TargetFileName="App.jsproj" File="App.jsproj" ReplaceParameters="true">
<Folder Name="constants" TargetFolderName="constants">
<Folder Name="interfaces" TargetFolderName="interfaces">
<ProjectItem ReplaceParameters="true" TargetFileName="IPaths.ts">IPaths.ts</ProjectItem>
</Folder>
<ProjectItem ReplaceParameters="true" TargetFileName="paths.ts">paths.ts</ProjectItem>
</Folder>
<Folder Name="merges" TargetFolderName="merges">
Expand All @@ -30,6 +27,11 @@
<ProjectItem ReplaceParameters="true" TargetFileName="wrapper.html">wrapper.html</ProjectItem>
</Folder>
</Folder>
<Folder Name="home" TargetFolderName="home">
<Folder Name="views" TargetFolderName="views">
<ProjectItem ReplaceParameters="true" TargetFileName="home.html">home.html</ProjectItem>
</Folder>
</Folder>
</Folder>
<ProjectItem ReplaceParameters="true" TargetFileName="platform.css">platform.css</ProjectItem>
<ProjectItem ReplaceParameters="true" TargetFileName="platformOverrides.js">platformOverrides.js</ProjectItem>
Expand All @@ -42,6 +44,11 @@
<ProjectItem ReplaceParameters="true" TargetFileName="wrapper.html">wrapper.html</ProjectItem>
</Folder>
</Folder>
<Folder Name="home" TargetFolderName="home">
<Folder Name="views" TargetFolderName="views">
<ProjectItem ReplaceParameters="true" TargetFileName="home.html">home.html</ProjectItem>
</Folder>
</Folder>
</Folder>
<ProjectItem ReplaceParameters="true" TargetFileName="platform.css">platform.css</ProjectItem>
<ProjectItem ReplaceParameters="true" TargetFileName="platformOverrides.js">platformOverrides.js</ProjectItem>
Expand Down Expand Up @@ -97,9 +104,6 @@
<ProjectItem ReplaceParameters="true" TargetFileName="tabs-module.ts">tabs-module.ts</ProjectItem>
</Folder>
</Folder>
<Folder Name="plugins" TargetFolderName="plugins">
<ProjectItem ReplaceParameters="false" TargetFileName="fetch.json">fetch.json</ProjectItem>
</Folder>
<Folder Name="res" TargetFolderName="res">
<Folder Name="icons" TargetFolderName="icons">
<Folder Name="android" TargetFolderName="android">
Expand Down
24 changes: 0 additions & 24 deletions App/constants/interfaces/IPaths.ts

This file was deleted.

2 changes: 1 addition & 1 deletion App/constants/paths.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Constants {
'use strict';

export let Paths: IPaths = {
export let Paths = {
Core: 'core',
Modules: 'modules/',
Tabs: 'tabs',
Expand Down
20 changes: 20 additions & 0 deletions App/merges/android/modules/home/views/home.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<ion-view view-title="Home">
<ion-content>
<div class="list">
<label class="item item-input item-floating-label">
<span class="input-label">First Name</span>
<input type="text"
placeholder="First Name">
</label>
<label class="item item-input item-floating-label">
<span class="input-label">Last Name</span>
<input type="text"
placeholder="Last Name">
</label>
</div>

<div class="padding">
<a class="button button-block button-positive icon icon-right ion-chevron-right" ui-sref="tabs.scroll">Submit</a>
</div>
</ion-content>
</ion-view>
2 changes: 2 additions & 0 deletions App/merges/android/modules/tabs/templates/wrapper.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<ion-nav-bar class="bar-calm"
align-title="left">

<ion-nav-back-button class="button-icon icon icon-only ion-arrow-left-c"></ion-nav-back-button>

<ion-nav-buttons side="left">
<button menu-toggle="left"
class="button button-clear icon ion-navicon-round"
ng-hide="$exposeAside.active"></button>
</ion-nav-buttons>

</ion-nav-bar>

<ion-nav-view></ion-nav-view>
18 changes: 18 additions & 0 deletions App/merges/windows/modules/home/views/home.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<ion-view view-title="Home">
<ion-content>
<div class="list">
<label class="item item-input">
<span class="input-label">First Name</span>
<input type="text">
</label>
<label class="item item-input">
<span class="input-label">Last Name</span>
<input type="text">
</label>
</div>

<div class="padding">
<a class="button button-block button-positive icon icon-right ion-chevron-right" ui-sref="tabs.scroll">Submit</a>
</div>
</ion-content>
</ion-view>
5 changes: 5 additions & 0 deletions App/merges/windows/platform.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion App/merges/windows/platformOverrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if (window.Windows && Windows.Phone && Windows.Phone.UI.Input.HardwareButtons &&
var lastScroll = 0;
var frame = 0;
function checkScroll() {
if (frame === 30) {
if (frame === 20) {
frame = 0;
var s = document.querySelectorAll('.overflow-scroll');
var sum = 0;
Expand All @@ -34,6 +34,12 @@ function checkScroll() {
}, false);
}

if (b[i].querySelectorAll('button').length < 1) {
b[i].classList.add('disabled');
} else {
b[i].classList.remove('disabled');
}

if (sum < 15 || b[i].clicked) {
b[i].classList.remove('hidden');
} else {
Expand Down
3 changes: 1 addition & 2 deletions App/modules/actions/controllers/actionsController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

constructor(
private loadingService: Core.ILoadingService
){

) {
this.addTextAsync();
}

Expand Down
3 changes: 1 addition & 2 deletions App/modules/core/services/loadingService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

constructor(
private $ionicLoading: ionic.loading.IonicLoadingService
){
}
){}

public show(): void {
let options: ionic.loading.IonicLoadingOptions = {
Expand Down
16 changes: 13 additions & 3 deletions App/modules/home/views/home.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
<ion-view view-title="Home">
<ion-content class="padding">
<h1>Parent page</h1>

<a class="button icon icon-right ion-chevron-right" href="#/tabs/scroll">Open Scroll page</a>
<div class="list">
<label class="item item-input">
<input type="text"
placeholder="First Name">
</label>
<label class="item item-input">
<input type="text"
placeholder="Last Name">
</label>
</div>

<div class="padding">
<a class="button button-block button-positive icon icon-right ion-chevron-right" ui-sref="tabs.scroll">Submit</a>
</div>
</ion-content>
</ion-view>
13 changes: 6 additions & 7 deletions App/modules/tabs/controllers/navigationController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,17 @@ module Tabs {
private $ionicHistory: ionic.navigation.IonicHistoryService,
private $ionicTabsDelegate: ionic.tabs.IonicTabsDelegate,
private $ionicPlatform: ionic.platform.IonicPlatformService
){

){
$ionicPlatform.registerBackButtonAction(e => this.checkBack(e), 100);
}

public goBack(): void {
this.$ionicHistory.goBack();
}

public checkBack(e: Event) {
public checkBack(e: Event): void {
var page = this.$ionicHistory.currentStateName();
if (page === Constants.Paths.Todos.Base) {
if (page === Constants.Paths.Home.Base) {
let nav: any = navigator;
if (nav.app && nav.app.exitApp) {
nav.app.exitApp();
Expand All @@ -30,16 +29,16 @@ module Tabs {
}
}

private disableSwipe(e: Event) {
private disableSwipe(e: Event): void {
// For example on <ion-list>
e.stopPropagation();
}

public onSwipeLeft() {
public onSwipeLeft(): void {
this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() + 1);
}

public onSwipeRight() {
public onSwipeRight(): void {
let index: number = this.$ionicTabsDelegate.selectedIndex();
if (index > 0) {
this.$ionicTabsDelegate.select(this.$ionicTabsDelegate.selectedIndex() - 1);
Expand Down
5 changes: 2 additions & 3 deletions App/scss/helpers/_overrides.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
////////////////////
// Ionic Overrides
@import "variables";

$calm: #1AA8D0;
$calm: $Color-Brand-main;
$ionicons-font-path: '../fonts/ionic/release/fonts'
7 changes: 2 additions & 5 deletions App/scss/helpers/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
////////////////////
// Global variables

// Colors
$Color-Brand-main: #046dfb;
// Colors
$Color-Brand-main: #1AA8D0;
$Color-Brand-secondary: #DB8718;

$Color-Background-dark: #454545;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="ProjectTemplates\Apache Cordova Apps\MultiplatformCordova_1_0_1.zip">
<Content Include="ProjectTemplates\Apache Cordova Apps\MultiplatformCordova_1_0_2.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011">
<Metadata>
<Identity Id="Cordova_Multiplatform_Template..a4cf3f3f-aa92-4409-9824-bad447a7f6a0" Version="1.0.1" Language="en-US" Publisher="CKGrafico" />
<Identity Id="Cordova_Multiplatform_Template..a4cf3f3f-aa92-4409-9824-bad447a7f6a0" Version="1.0.2" Language="en-US" Publisher="CKGrafico" />
<DisplayName>Cordova Multiplatform Template</DisplayName>
<Description xml:space="preserve">HTML5 Apps for [Windows, IOS, Android] with Apache Cordova more info -&gt; http://cordova-multiplatform-template.js.org</Description>
<MoreInfo>http://cordova-multiplatform-template.js.org/</MoreInfo>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ C:\Projects\Quique\CordovaMultipltform\Visual Studio Template\Visual Studio Temp
C:\Projects\Quique\CordovaMultipltform\Visual Studio Template\Visual Studio Template\obj\Debug\Visual Studio Template.pdb
C:\Projects\Quique\CordovaMultipltform\Visual Studio Template\Visual Studio Template\obj\Debug\extension.vsixmanifest
C:\Projects\Quique\CordovaMultipltform\Visual Studio Template\Visual Studio Template\bin\Debug\ProjectTemplates\Apache Cordova Apps\Cordova-12_9_2015-18_38_6.zip
C:\Datos\Github\Cordova-Multiplatform-Template\Visual Studio Template\Visual Studio Template\bin\Debug\ProjectTemplates\Apache Cordova Apps\MultiplatformCordova_1_0_1.zip
C:\Datos\Github\Cordova-Multiplatform-Template\Visual Studio Template\Visual Studio Template\bin\Debug\ProjectTemplates\Apache Cordova Apps\MultiplatformCordova_1_0_2.zip
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,8 @@ C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico
C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.1\\license.txt
C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.1\\thumbnail.PNG
C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.1\\__TemplateIcon.ico
C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\\extension.vsixmanifest
C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\ProjectTemplates\Apache Cordova Apps\\MultiplatformCordova_1_0_2.zip
C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\\license.txt
C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\\thumbnail.PNG
C:\Users\enriq\AppData\Local\Microsoft\VisualStudio\14.0Exp\Extensions\CKGrafico\Cordova Multiplatform Template\1.0.2\\__TemplateIcon.ico
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011">
<Metadata>
<Identity Id="Cordova_Multiplatform_Template..a4cf3f3f-aa92-4409-9824-bad447a7f6a0" Version="1.0.1" Language="en-US" Publisher="CKGrafico" />
<Identity Id="Cordova_Multiplatform_Template..a4cf3f3f-aa92-4409-9824-bad447a7f6a0" Version="1.0.2" Language="en-US" Publisher="CKGrafico" />
<DisplayName>Cordova Multiplatform Template</DisplayName>
<Description xml:space="preserve">HTML5 Apps for [Windows, IOS, Android] with Apache Cordova more info -&gt; http://cordova-multiplatform-template.js.org</Description>
<MoreInfo>http://cordova-multiplatform-template.js.org/</MoreInfo>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="Cordova_Multiplatform_Template..a4cf3f3f-aa92-4409-9824-bad447a7f6a0" Version="1.0.1" Language="en-US" Publisher="CKGrafico" />
<Identity Id="Cordova_Multiplatform_Template..a4cf3f3f-aa92-4409-9824-bad447a7f6a0" Version="1.0.2" Language="en-US" Publisher="CKGrafico" />
<DisplayName>Cordova Multiplatform Template</DisplayName>
<Description xml:space="preserve">HTML5 Apps for [Windows, IOS, Android] with Apache Cordova more info -&gt; http://cordova-multiplatform-template.js.org</Description>
<MoreInfo>http://cordova-multiplatform-template.js.org/</MoreInfo>
Expand All @@ -18,6 +18,6 @@
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\Apache Cordova Apps\MultiplatformCordova_1_0_1.zip" />
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\Apache Cordova Apps\MultiplatformCordova_1_0_2.zip" />
</Assets>
</PackageManifest>

0 comments on commit f8315ac

Please sign in to comment.