diff --git a/.gitignore b/.gitignore index 0aee8900..7f8bd2fd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ SepiaFW-P4-bck-old Thumbs.db Desktop.ini *.DS_Store +node_modules +tmp diff --git a/create-android-project.sh b/create-android-project.sh old mode 100644 new mode 100755 index 301efc0b..663aa48f --- a/create-android-project.sh +++ b/create-android-project.sh @@ -2,75 +2,45 @@ # APP_NAME="SepiaFW-P4" # create project -sleep 2 echo "#Creating '$APP_NAME' ..." -cordova create $APP_NAME de.bytemind.sepia.app.web $APP_NAME +npx cordova create $APP_NAME de.bytemind.sepia.app.web $APP_NAME # # copy folders -sleep 2 echo "#Transfering code ..." cp -r www $APP_NAME cp -r plugin_mods $APP_NAME cp -r resources $APP_NAME cp -r hooks $APP_NAME cp config.xml $APP_NAME/config.xml +cp package.app.json $APP_NAME/package.json cd $APP_NAME + # # add plugins -sleep 2 echo "#Adding plugins ..." -cordova plugin add cordova-plugin-device -cordova plugin add cordova-plugin-geolocation -cordova plugin add cordova-plugin-inappbrowser -cordova plugin add cordova-plugin-tts -cordova plugin add cordova-plugin-whitelist -cordova plugin add cordova-universal-links-plugin -cordova plugin add cordova-plugin-statusbar -cordova plugin add cordova-plugin-splashscreen -#cordova plugin add https://github.com/apache/cordova-plugin-splashscreen.git -- NOTE: use this in case releases are too old -cordova plugin add cordova-plugin-cache-clear -cordova plugin add cordova-custom-config -cordova plugin add plugin_mods/speechrecognition/org.apache.cordova.speech.speechrecognition -#cordova plugin add de.appplant.cordova.plugin.local-notification -#cordova plugin add plugin_mods/localnotifications/de.appplant.cordova.plugin.local-notification -#cordova plugin add cordova-plugin-local-notification@0.9.0-beta.2 -cordova plugin add cordova-plugin-local-notification -cordova plugin add cordova-plugin-file -cordova plugin add cordova-plugin-nativestorage -cordova plugin add cordova-android-support-gradle-release -cordova plugin add phonegap-plugin-media-stream -cordova plugin add https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin.git -cordova plugin add cordova-plugin-eddystone -cordova plugin add cordova-plugin-navigationbar-color -#NOTE: add before intent plugin if you use: plugin add cordova-plugin-camera -cordova plugin add com-darryncampbell-cordova-plugin-intent -# -# overwrite plugin mods -sleep 2 +npm i +# NEW better one +npx cordova prepare echo "#Updating plugins ..." cp -f "plugin_mods/inappbrowser/android/InAppBrowser.java" "plugins/cordova-plugin-inappbrowser/src/android/" cp -r -f "plugin_mods/inappbrowser/plugin.xml" "plugins/cordova-plugin-inappbrowser/plugin.xml" -cp -r -f "plugin_mods/inappbrowser/android/res/" "plugins/cordova-plugin-inappbrowser/src/android/res/" +cp -r -f "plugin_mods/inappbrowser/android/res" "plugins/cordova-plugin-inappbrowser/src/android/" #cp -r -f "resources/icons/android/notifications/res/" "plugins/de.appplant.cordova.plugin.local-notification/src/android/res/" # # add android platform -sleep 2 -echo "#Adding platform ..." -cordova platform add android@6.4.0 -# -# prepare build -echo "#Preparing build ..." -cordova prepare android +# sleep 2 # overwrite icons (this will be replaced with a proper implementation) -sleep 2 -echo "#Adding or overwriting resources, e.g. icons, themes, xml ..." -cp -r -f "resources/icons/android/notifications/res/" "platforms/android/res/" + +# Fix a bug +[[ ! -d platforms/android/res/drawable ]] && cp platforms/android/res/drawable-port-hdpi platforms/android/res/drawable -recho "#Adding or overwriting resources, e.g. icons, themes, xml ..." + +cp -r -f "resources/icons/android/notifications/res" "platforms/android/" cp -r "resources/themes/android/background_splash.xml" "platforms/android/res/drawable/background_splash.xml" cp -r "resources/themes/android/launch_screen.png" "platforms/android/res/drawable/launch_screen.png" -#cp -r "resources/themes/android/styles.xml" "platforms/android/res/values/styles.xml" -cp -r "resources/themes/android/values/" "platforms/android/res/values/" +# NEW +cp -r "resources/themes/android/values" "platforms/android/res/" mkdir -p "platforms/android/res/values-v21" -cp -r "resources/themes/android/values-v21/" "platforms/android/res/values-v21/" -cp -r "resources/config/android/xml/" "platforms/android/res/xml/" +cp -r "resources/themes/android/values-v21" "platforms/android/res/" +cp -r "resources/config/android/xml" "platforms/android/res/" echo "#DONE" echo "If everything worked out fine the next step would be to build the app from the %APP_NAME% folder: cordova build android" diff --git a/install-environment.sh b/install-environment.sh old mode 100644 new mode 100755 diff --git a/package.app.json b/package.app.json new file mode 100644 index 00000000..53c030f1 --- /dev/null +++ b/package.app.json @@ -0,0 +1,42 @@ +{ + "devDependencies": { + "cordova-plugin-whitelist": "^1.3.4" + }, + "cordova": { + "plugins": { + "cordova-plugin-whitelist": {} + }, + "platforms": [ + "browser" + ] + }, + "dependencies": { + "cordova": "^7.1.0", + "com-darryncampbell-cordova-plugin-intent": "^1.1.6", + "cordova-android": "^6.4.0", + "cordova-android-support-gradle-release": "^3.0.0", + "cordova-custom-config": "^5.1.0", + "cordova-plugin-badge": "^0.8.8", + "cordova-plugin-ble": "^2.0.1", + "cordova-plugin-cache-clear": "^1.3.8", + "cordova-plugin-compat": "^1.2.0", + "cordova-plugin-device": "^2.0.2", + "cordova-plugin-eddystone": "^1.3.0", + "cordova-plugin-file": "^6.0.1", + "cordova-plugin-geolocation": "^4.0.1", + "cordova-plugin-inappbrowser": "^3.0.0", + "cordova-plugin-insomnia": "git+https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin.git", + "cordova-plugin-local-notification": "^0.9.0-beta.2", + "cordova-plugin-nativestorage": "^2.3.2", + "cordova-plugin-navigationbar-color": "0.0.8", + "cordova-plugin-splashscreen": "^5.0.2", + "cordova-plugin-statusbar": "^2.4.2", + "cordova-plugin-tts": "^0.2.3", + "cordova-plugin-whitelist": "^1.3.3", + "cordova-universal-links-plugin": "^1.2.1", + "es6-promise-plugin": "^4.2.2", + "phonegap-plugin-media-stream": "^1.2.1", + "speechrecognition": "file:plugin_mods\\speechrecognition\\org.apache.cordova.speech.speechrecognition", + "org.apache.cordova.speech.speechrecognition": "plugin_mods/speechrecognition/org.apache.cordova.speech.speechrecognition" + } +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..baf7e077 --- /dev/null +++ b/package.json @@ -0,0 +1,17 @@ +{ + "devDependencies": { + "cordova-plugin-whitelist": "^1.3.4" + }, + "cordova": { + "plugins": { + "cordova-plugin-whitelist": {} + }, + "platforms": [ + "browser" + ] + }, + "dependencies": { + "cordova": "^7.1.0", + "cordova-plugin-whitelist": "1" + } +} \ No newline at end of file diff --git a/serve-via-python.sh b/serve-via-python.sh old mode 100644 new mode 100755 index 17246cf6..a41950ee --- a/serve-via-python.sh +++ b/serve-via-python.sh @@ -1,4 +1,4 @@ #!/bin/sh cd www -start "http://localhost:20728" -python -m http.server 20728 \ No newline at end of file +google-chrome "http://localhost:20728" +python -m http.server 20728