Merge branch 'release/3.0.0-alpha03'

.gitignore

@@ -46,6 +46,7 @@ before_build.md
 www/
 myapp/
 /config/
+/resources/
 src/**/*.js
 src/**/*.js.map
 

CHANGELOG.md

@@ -1,4 +1,9 @@
-<a name="3.0.0.alpha01"></a>
+<a name="3.0.0.alpha03"></a>
+### 3.0.0-alpha03 (2018-01-07)
+
+Adds admobs support
+
+<a name="3.0.0.alpha02"></a>
 ### 3.0.0-alpha02 (2017-12-19)
 
 Fix unvalid version name

README.md

@@ -22,10 +22,10 @@
 - [X] Syntax highlighter
 - [X] Social sharing
 - [X] Docker build
+- [X] Admob support
+- [ ] App rate plugin
 - [ ] Comments
 - [ ] Push Notifications
-- [ ] Admob support
-- [ ] App rate plugin
 - [ ] Login via JWT
 
 ## Sponsors

dist/config/components/template-item/template-item.html

@@ -0,0 +1,3 @@
+<div *ngIf="item" padding>
+  {{item.id}}
+</div>

dist/config/components/template-item/template-item.scss

@@ -0,0 +1,4 @@
+template-item {
+    background-color: red;
+    display: block;
+}

dist/config/components/template-item/template-item.ts

@@ -0,0 +1,20 @@
+import { Component, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
+import { NavController } from 'ionic-angular';
+
+import { ItemParentComponent } from './../../../src/components/ItemParent';
+import { IItemComponent } from './../../../src/components/interfaces';
+
+@Component({
+  selector: 'template-item',
+  templateUrl: 'template-item.html',
+  changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class TemplateItemComponent extends ItemParentComponent implements IItemComponent {
+
+  constructor(
+    public navCtrl: NavController,
+    public cdRef: ChangeDetectorRef,
+  ) {
+    super(navCtrl, cdRef);
+  }
+}

dist/config/components/template-list/template-list.html

@@ -0,0 +1,5 @@
+<ion-card *ngFor="let item of list; trackBy: trackBy">
+  <ion-card-content (click)="openPage($event, item)">
+    {{item.id}}
+  </ion-card-content>
+</ion-card>

dist/config/components/template-list/template-list.scss

@@ -0,0 +1,4 @@
+template-list {
+    background-color: red;
+    display: block;
+}

dist/config/components/template-list/template-list.ts

@@ -0,0 +1,22 @@
+import { Component, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
+import { NavController } from 'ionic-angular';
+
+import { AppearIn } from './../../../src/utils/animations';
+import { IListComponent } from './../../../src/components/interfaces';
+import { ListParentComponent } from './../../../src/components/ListParent';
+
+@Component({
+  selector: 'template-list',
+  templateUrl: 'template-list.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [AppearIn],
+})
+export class TemplateListComponent extends ListParentComponent implements IListComponent {
+
+  constructor(
+    public navCtrl: NavController,
+    public cdRef: ChangeDetectorRef,
+  ) {
+    super(navCtrl, cdRef);
+  }
+}

dist/config/config.cson

@@ -20,4 +20,12 @@ metas:
     ogImageHeight: 400
     # Twitter card
     twitterSite: ''
-    twitterCreator: '' # e.g @julienrenaux
+    twitterCreator: '' # e.g @julienrenaux
+
+admob:
+    bannerEnabled: false
+    interstitialEnabled: false
+    config:
+        publisherId: null
+        interstitialAdId: null
+        isTesting: true

dist/config/index.ts

@@ -10,6 +10,7 @@ import { SplashScreen } from '@ionic-native/splash-screen';
 import { Push } from '@ionic-native/push';
 import { Toast } from '@ionic-native/toast';
 import { SocialSharing } from '@ionic-native/social-sharing';
+import { AdMobFree } from '@ionic-native/admob-free';
 import { Storage } from '@ionic/storage';
 
 import { MomentModule } from 'angular2-moment';
@@ -94,6 +95,7 @@ export function appInitializerTranslateFactory(translate: TranslateService, inje
         Push,
         Toast,
         SocialSharing,
+        AdMobFree,
         { provide: Storage, useFactory: provideStorage },
         // { provide: Settings, useFactory: provideSettings, deps: [ Storage ] },
         // Keep this to enable Ionic's runtime error handling during development

dist/config/manifest.json

@@ -6,34 +6,35 @@
     "start_url": "index.html",
     "display": "standalone",
     "lang": "en-US",
+    "dir": "auto",
     "icons": [
         {
-            "src": "img/icon_48.png",
+            "src": "assets/icons/icon_48.png",
             "sizes": "48x48",
             "type": "image/png"
         },
         {
-            "src": "img/icon_72.png",
+            "src": "assets/icons/icon_72.png",
             "sizes": "72x72",
             "type": "image/png"
         },
         {
-            "src": "img/icon_96.png",
+            "src": "assets/icons/icon_96.png",
             "sizes": "96x96",
             "type": "image/png"
         },
         {
-            "src": "img/icon_144.png",
+            "src": "assets/icons/icon_144.png",
             "sizes": "144x144",
             "type": "image/png"
         },
         {
-            "src": "img/icon_168.png",
+            "src": "assets/icons/icon_168.png",
             "sizes": "168x168",
             "type": "image/png"
         },
         {
-            "src": "img/icon_192.png",
+            "src": "assets/icons/icon_192.png",
             "sizes": "192x192",
             "type": "image/png"
         }

dist/config/pages/list-movie.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { ListPage } from '../../src/pages/list/list';
 
 @Component({
-    selector: 'page-authors-list',
+    selector: 'page-movie-list',
     templateUrl: '../../src/pages/list/list.html'
 })
 export class ListMoviePage extends ListPage {

dist/resources/README.md

@@ -0,0 +1,2 @@
+To generate your own splashscreen and icons you should modify `icon.png` and `splash.png` with your own design (keep the same size!) and run `ionic:resources` to generate custom icons and splash screens for your
+app.

dist/root/config.xml

@@ -9,15 +9,20 @@
     </author>
     <content src="index.html" />
     <access origin="*" />
-    <preference name="orientation" value="portrait" />
-    <preference name="fullscreen" value="false" />
-    <preference name="webviewbounce" value="false" />
-    <preference name="UIWebViewBounce" value="false" />
-    <preference name="DisallowOverscroll" value="true" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
+    <allow-intent href="tel:*" />
+    <allow-intent href="sms:*" />
+    <allow-intent href="mailto:*" />
+    <allow-intent href="geo:*" />
+    <preference name="ScrollEnabled" value="false" />
+    <preference name="android-minSdkVersion" value="16" />
     <preference name="BackupWebStorage" value="none" />
+    <preference name="SplashMaintainAspectRatio" value="true" />
+    <preference name="FadeSplashScreenDuration" value="300" />
+    <preference name="SplashShowOnlyFirstTime" value="false" />
     <preference name="SplashScreen" value="screen" />
-    <preference name="ShowSplashScreenSpinner" value="false" />
-    <preference name="AutoHideSplashScreen" value="false" />
+    <preference name="LoadUrlTimeoutValue" value="60000"/>
     <preference name="android-minSdkVersion" value="17" />
     <preference name="android-targetSdkVersion" value="17" />
     <feature name="StatusBar">
@@ -26,11 +31,65 @@
     <resources>
         <integer name="google_play_services_version">5089000</integer>
     </resources>
-    <plugin name="phonegap-plugin-push" spec="~1.6.0">
-        <param name="SENDER_ID" value="XXXXXXX" />
-    </plugin>
     <hook src="scripts/nativeBeforeBuild.js" type="after_platform_add" />
     <preference name="CrosswalkAnimatable" value="true" />
+    <platform name="android">
+        <allow-intent href="market:*" />
+        <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
+        <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
+        <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
+        <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
+        <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
+        <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
+        <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
+        <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
+        <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
+        <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
+        <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
+        <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
+        <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
+        <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
+        <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
+        <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
+        <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
+        <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
+    </platform>
+    <platform name="ios">
+        <allow-intent href="itms:*" />
+        <allow-intent href="itms-apps:*" />
+        <icon height="57" src="resources/ios/icon/icon.png" width="57" />
+        <icon height="114" src="resources/ios/icon/[email protected]" width="114" />
+        <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
+        <icon height="80" src="resources/ios/icon/[email protected]" width="80" />
+        <icon height="120" src="resources/ios/icon/[email protected]" width="120" />
+        <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
+        <icon height="100" src="resources/ios/icon/[email protected]" width="100" />
+        <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
+        <icon height="120" src="resources/ios/icon/[email protected]" width="120" />
+        <icon height="180" src="resources/ios/icon/[email protected]" width="180" />
+        <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
+        <icon height="144" src="resources/ios/icon/[email protected]" width="144" />
+        <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
+        <icon height="152" src="resources/ios/icon/[email protected]" width="152" />
+        <icon height="167" src="resources/ios/icon/[email protected]" width="167" />
+        <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
+        <icon height="58" src="resources/ios/icon/[email protected]" width="58" />
+        <icon height="87" src="resources/ios/icon/[email protected]" width="87" />
+        <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
+        <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
+        <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
+        <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
+        <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
+        <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
+        <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
+        <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
+        <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
+        <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
+        <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
+        <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
+        <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
+        <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
+    </platform>
     <plugin name="cordova-plugin-crosswalk-webview" spec="^2.3.0">
         <variable name="XWALK_VERSION" value="22+" />
         <variable name="XWALK_LITEVERSION" value="xwalk_core_library_canary:17+" />
@@ -52,6 +111,13 @@
     <plugin name="cordova-plugin-crosswalk-webview" spec="~2.3.0" />
     <plugin name="cordova-plugin-wkwebview-engine" spec="~1.1.2" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
-    <engine name="android" spec="~6.1.2" />
+    <engine name="android" spec="~6.3.0" />
     <plugin name="cordova-plugin-x-socialsharing" spec="~5.2.1" />
+    <plugin name="cordova-plugin-admob-free" spec="~0.13.0" />
+    <plugin name="cordova-android-play-services-gradle-release" spec="~1.1.4">
+        <variable name="PLAY_SERVICES_VERSION" value="11.+" />
+    </plugin>
+    <plugin name="phonegap-plugin-push" spec="~1.6.0">
+        <param name="SENDER_ID" value="XXXXXXX" />
+    </plugin>
 </widget>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wordpress-hybrid-client",
-  "version": "3.0.0-alpha02",
+  "version": "3.0.0-alpha03",
   "description": "Build amazing iOS and Android applications for your WordPress website for free!",
   "repository": {
     "type": "git",
@@ -29,7 +29,13 @@
     "ionic:prepare": "ionic cordova prepare",
     "ionic:run": "ionic cordova run",
     "ionic:start": "ionic serve",
+    "ionic:resources": "ionic cordova resources",
+    "ionic:build": "ionic build",
+    "ionic:requirements": "ionic cordova requirements",
     "clean": "ionic-app-scripts clean",
+    "run:android": "ionic build && npm run ionic:run android --livereload",
+    "run:ios": "ionic build && npm run ionic:run ios --livereload",
+    "build:dev": "./scripts/buildPWA.sh",
     "build:pwa": "./scripts/buildPWA.sh",
     "buildAndRun:pwa": "./scripts/buildPWAAndRun.sh",
     "ionic:serve": "ionic-app-scripts serve",
@@ -50,6 +56,7 @@
     "@angular/platform-browser-dynamic": "4.4.4",
     "@angular/platform-server": "4.4.4",
     "@angular/service-worker": "^1.0.0-beta.15",
+    "@ionic-native/admob-free": "^4.5.2",
     "@ionic-native/core": "^3.4.2",
     "@ionic-native/push": "^3.4.2",
     "@ionic-native/social-sharing": "^4.4.2",
@@ -63,6 +70,7 @@
     "@ngrx/store-devtools": "^3.2.2",
     "@ngx-translate/core": "^6.0.1",
     "@ngx-translate/http-loader": "^0.0.3",
+    "android-versions": "^1.2.1",
     "angular2-moment": "^1.1.0",
     "clipboard": "^1.7.1",
     "debug": "^2.6.8",

scripts/install.js

@@ -13,6 +13,7 @@ console.log("=============================================");
 copy(path.join(DIST, 'config'), path.join(ROOT, 'config'));
 copy(path.join(DIST, 'root', 'config.xml'), path.join(ROOT, 'config.xml'));
 copy(path.join(DIST, 'root', 'ionic.config.json'), path.join(ROOT, 'ionic.config.json'));
+copy(path.join(DIST, 'resources'), path.join(ROOT, 'resources'));
 
 function copy(source, target, overwrite) {
     overwrite = process.env.CI ? true : overwrite;

src/config.default.cson

@@ -119,16 +119,15 @@ statusBar:
     style: 'default' # 'default' | 'light' | 'blackTranslucent' | 'blackOpaque' # http://ionicframework.com/docs/native/status-bar/
 
 admob:
-    enabled: false
-    android:
-        bannerID: null
-        bannerPosition: 'BOTTOM_CENTER'
-        interstitialID: null
-    ios:
-        bannerID: null
-        bannerPosition: 'BOTTOM_CENTER'
-        interstitialID: null
-    windows:
-        bannerID: null
-        bannerPosition: 'BOTTOM_CENTER'
-        interstitialID: null
+    bannerEnabled: false
+    interstitialEnabled: false
+    config:
+        publisherId: null
+        interstitialAdId: null
+        bannerAtTop: false
+        overlap: false
+        offsetTopBar: false
+        isTesting: false
+        autoShow: true
+        forChild: null
+        forFamily: null