Merge branch 'development' - Version 1.6.0

Author: mleroi

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.6.0 (2020-10-27)
+
+### Fixes
+- End of PhoneGap Build: allow to build apps with raw Cordova tools or VoltBuilder online service ([@mleroi](https://github.com/mleroi))
+
 ## 1.5.6 (2020-05-05)
 
 ### Fixes

README.md

@@ -33,7 +33,7 @@ WP-AppKit adds a menu to the WordPress admin.
 * Use Chrome to simulate your app in the browser
 * Set your secure key to support WordPress authentication in your app
 * Set the custom URL scheme for deeplinks
-* Export the app's sources ready to be compiled with [PhoneGap Build](https://build.phonegap.com/)
+* Export app's sources ready to be compiled with raw Cordova tools or VoltBuilder online service
 
 ![WP-AppKit Edit Application Panel](https://cloud.githubusercontent.com/assets/6179747/16171841/36a01202-357a-11e6-888e-e38f046fdf39.jpg)
 
@@ -51,7 +51,7 @@ Developing app themes are at the heart of the WP-AppKit project. If you're ready
 ![Edit WP-AppKit Theme in Bracket](https://cloud.githubusercontent.com/assets/6179747/16171843/3d4ea686-357a-11e6-91de-2f2ea82a513b.jpg)
 
 ## Who's Behind This Project?
-This project is done the [Uncategorized Creations](http://uncategorized-creations.com/) team. UncatCrea is a group of web professionals working with WordPress and Cordova/PhoneGap. facing the challenges to build content based mobile apps connected to WordPress, we've decided to create WP-AppKit.
+This project is done the [Uncategorized Creations](http://uncategorized-creations.com/) team. UncatCrea is a group of web professionals working with WordPress and Cordova. facing the challenges to build content based mobile apps connected to WordPress, we've decided to create WP-AppKit.
 
 ### Meet the team
 * Mathieu Le Roi: _Quiet and mystic_ developer

wp-appkit.php

@@ -3,7 +3,7 @@
 Plugin Name: WP-AppKit
 Plugin URI:  https://github.com/uncatcrea/wp-appkit
 Description: Build mobile apps and PWA based on your WordPress content.
-Version:     1.5.6
+Version:     1.6.0
 Author:      Uncategorized Creations
 Author URI:  http://getwpappkit.com
 Text Domain: wp-appkit

wp-appkit/images/icons-splashscreens/android-cordova/res/android/icons/icon-wp-appkit-hdpi.png

@@ -17,7 +17,7 @@ class WpakAddon {
 	protected $app_dynamic_data_callback = null;
 	protected $app_dynamic_data = null;
 
-	public function __construct( $name, $slug = '', $platforms = ['ios','android'] ) {
+	public function __construct( $name, $slug = '', $platforms = ['ios','android','android-cordova','android-voltbuilder'] ) {
 		$this->name = $name;
 		$this->slug = sanitize_title_with_dashes( remove_accents( empty($slug) ? $name : $slug ) );
 		$this->platforms = is_array( $platforms ) ? $platforms : [];
@@ -36,18 +36,18 @@ public function set_location( $addon_file ) {
 	}
 
 	public function add_js( $js_file, $type = 'module', $position = '', $platforms = [] ) {
-		
+
 		$file_type = pathinfo( $js_file, PATHINFO_EXTENSION );
 		if( $file_type !== 'js' ){
 			return;
 		}
-		
+
 		$full_js_file = '';
-		
+
 		if( $type == 'theme' && $position === '' ){
 			$position = 'after';
 		}
-		
+
 		if( $type == 'init' ){
 			$position = 'before'; //for now, only init+before is handled
 		}
@@ -62,11 +62,11 @@ public function add_js( $js_file, $type = 'module', $position = '', $platforms =
 
 		if ( file_exists( $full_js_file ) ) {
 			if ( !in_array( $js_file, $this->js_files ) ) {
-				$this->js_files[] = array( 
-					'file' => $js_file, 
-					'type' => $type, 
+				$this->js_files[] = array(
+					'file' => $js_file,
+					'type' => $type,
 					'position' => $position,
-					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : ['android', 'ios', 'pwa']
+					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : $this->platforms
 				);
 			}
 		}
@@ -78,7 +78,7 @@ public function add_css( $css_file, $position = 'after', $platforms = [] ) {
 		if( $file_type !== 'css' ){
 			return;
 		}
-		
+
 		$full_css_file = '';
 
 		if ( strpos( $css_file, $this->directory ) !== false ) {
@@ -91,23 +91,23 @@ public function add_css( $css_file, $position = 'after', $platforms = [] ) {
 
 		if ( file_exists( $full_css_file ) ) {
 			if ( !in_array( $css_file, $this->css_files ) ) {
-				$this->css_files[] = array( 
-					'file' => $css_file, 
+				$this->css_files[] = array(
+					'file' => $css_file,
 					'type' => 'theme',
 					'position' => $position,
-					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : ['android', 'ios', 'pwa']
+					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : $this->platforms
 				);
 			}
 		}
 	}
-	
+
 	public function add_html( $html_file, $type = 'layout', $position = 'after', $data = array(), $platforms = [] ) {
 
 		$file_type = pathinfo( $html_file, PATHINFO_EXTENSION );
 		if( $file_type !== 'html' ){
 			return;
 		}
-		
+
 		$full_html_file = '';
 
 		if ( strpos( $html_file, $this->directory ) !== false ) {
@@ -120,24 +120,24 @@ public function add_html( $html_file, $type = 'layout', $position = 'after', $da
 
 		if ( file_exists( $full_html_file ) ) {
 			if ( !in_array( $html_file, $this->html_files ) ) {
-				$this->html_files[] = array( 
-					'file' => $html_file, 
+				$this->html_files[] = array(
+					'file' => $html_file,
 					'type' => $type ,
 					'position' => $position,
 					'data' => $data,
-					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : ['android', 'ios', 'pwa']
+					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : $this->platforms
 				);
 			}
 		}
 	}
-	
+
 	public function add_template( $template_file, $platforms = [] ) {
 
 		$file_type = pathinfo( $template_file, PATHINFO_EXTENSION );
 		if( $file_type !== 'html' ){
 			return;
 		}
-		
+
 		$full_template_file = '';
 
 		if ( strpos( $template_file, $this->directory ) !== false ) {
@@ -150,14 +150,14 @@ public function add_template( $template_file, $platforms = [] ) {
 
 		if ( file_exists( $full_template_file ) ) {
 			if ( !in_array( $template_file, $this->template_files ) ) {
-				$this->template_files[] = array( 
+				$this->template_files[] = array(
 					'file' => $template_file,
-					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : ['android', 'ios', 'pwa']
+					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : $this->platforms
 				);
 			}
 		}
 	}
-	
+
 	/**
 	 * PHP files that are included only if the addon is activated
 	 * for a given app.
@@ -167,7 +167,7 @@ public function require_php( $php_file, $platforms = [] ) {
 		if( $file_type !== 'php' ){
 			return;
 		}
-		
+
 		$full_php_file = '';
 
 		if ( strpos( $php_file, $this->directory ) !== false ) {
@@ -177,17 +177,17 @@ public function require_php( $php_file, $platforms = [] ) {
 			$php_file = ltrim( $php_file, '/\\' );
 			$full_php_file = $this->directory . '/' . $php_file;
 		}
-		
+
 		if ( file_exists( $full_php_file ) ) {
 			if ( !in_array( $php_file, $this->php_files ) ) {
-				$this->php_files[] = array( 
+				$this->php_files[] = array(
 					'file' => $php_file,
-					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : ['android', 'ios', 'pwa']
+					'platforms' => !empty( $platforms ) && is_array( $platforms ) ? $platforms : $this->platforms
 				);
 			}
 		}
 	}
-	
+
 	public function require_php_files( $app_id ) {
 		$app_platform = WpakApps::get_app_info( $app_id, 'platform' );
 		foreach ( $this->php_files as $php_file ) {
@@ -202,14 +202,14 @@ public function require_php_files( $app_id ) {
 	}
 
 	/**
-	 * Set the addon callback that will retrieve additionnal addon static data 
+	 * Set the addon callback that will retrieve additionnal addon static data
 	 * (added to config.js) specific to a given app.
 	 * @param type $callback Should be a function that takes $app_id as argument and returns an associative array
 	 */
 	public function add_app_static_data( $callback ){
 		$this->app_static_data_callback = $callback;
 	}
-	
+
 	public function set_app_static_data( $app_id ){
 		if( $this->app_static_data_callback !== null && is_callable($this->app_static_data_callback) ){
 			$app_data = call_user_func( $this->app_static_data_callback, $app_id );
@@ -218,16 +218,16 @@ public function set_app_static_data( $app_id ){
 			}
 		}
 	}
-	
+
 	/**
-	 * Set the addon callback that will retrieve additionnal addon dynamic data 
+	 * Set the addon callback that will retrieve additionnal addon dynamic data
 	 * (added to the synchronization web service) specific to a given app.
 	 * @param type $callback Should be a function that takes $app_id as argument and returns an associative array
 	 */
 	public function add_app_dynamic_data( $callback ){
 		$this->app_dynamic_data_callback = $callback;
 	}
-	
+
 	public function set_app_dynamic_data( $app_id ){
 		if( $this->app_dynamic_data_callback !== null && is_callable($this->app_dynamic_data_callback) ){
 			$app_data = call_user_func( $this->app_dynamic_data_callback, $app_id );
@@ -240,7 +240,7 @@ public function set_app_dynamic_data( $app_id ){
 	public function get_asset_file( $file_relative_to_addon ) {
 
 		$found = false;
-				
+
 		$file_type = pathinfo( $file_relative_to_addon, PATHINFO_EXTENSION );
 		if ( isset( $this->{$file_type . '_files'} ) ) {
 			foreach ( $this->{$file_type . '_files'} as $file ) {
@@ -260,7 +260,7 @@ public function get_asset_file( $file_relative_to_addon ) {
 				}
 			}
 		}
-		
+
 		$file_full_path = $this->directory . '/' . $file_relative_to_addon;
 
 		return $found && file_exists( $file_full_path ) ? $file_full_path : false;
@@ -299,7 +299,7 @@ protected function filter_files_by_platform( $files, $app_id ) {
 
 		return $filtered_files;
 	}
-	
+
 	public function get_all_files( $app_id, $indexed_by_type = false ) {
 		$all_files = array();
 

wp-appkit/images/icons-splashscreens/android-cordova/res/android/icons/icon-wp-appkit-ldpi.png

@@ -24,7 +24,7 @@
     vertical-align:middle;
 }
 
-#wpak_export_link, .wpak_export_link_pwa {
+.button.wpak_export_link, .wpak_export_link_pwa {
     margin-left:10px;
     vertical-align:middle;
 }
@@ -1094,7 +1094,7 @@ a.list-group-item-danger.active:focus {
     line-height:28px;
 }
 
-.wpak_phonegap_export {
+.wpak_phonegap_export, .wpak_cordova_template_export, .wpak_voltbuilder_export {
     float:right;
 }
 
@@ -1145,4 +1145,4 @@ a.list-group-item-danger.active:focus {
 }
 .wpak_settings .wp-picker-container {
     display:block;
-}
+}