Permalink
Browse files

Bugfixes:

- Packager updates
- Increased timeout for key combinations
- Fix for "Refresh devices" feature
- Updated Readme.md
- Updated demo image
  • Loading branch information...
alwx committed Jan 27, 2016
1 parent e0f0186 commit d2f5df43daa1c318ad46aba0754f30b7103ed6ab
Showing with 21 additions and 33 deletions.
  1. +9 −16 Readme.md
  2. +1 −1 builder.json
  3. BIN media/demo.png
  4. BIN media/milkshake.png
  5. +5 −4 package.json
  6. +6 −12 src/main.js
View
@@ -1,15 +1,10 @@
# Milkshake
Based on Frappé by [@niftylettuce](https://github.com/niftylettuce)
# Frappé
[![MIT License][license-image]][license-url]
![Demo][demo]
The reason why I decided to fork [Frappé](https://github.com/niftylettuce/frappe) is simple — I'm a React Native developer, and I'm tired of clicking "Reload JS" or "Debug JS" in React Native context menu manually.
**Milkshake** allows you to shake Android devices (including emulators), and perform some additional actions automatically, for example, start JS debugging and reload JS.
**Frappé** allows you to shake Android devices (including emulators), and perform some additional actions automatically, for example, start JS debugging and reload JS.
I've also refactored Frappé a bit, and I hope code is more simple and understandable now. Unfortunately, I've removed auto-update feature (but I will probably add it later).
![Demo][demo]
## Download
@@ -19,15 +14,12 @@ The latest release can be found on the [release page][release-page].
If you have questions or find a bug, please report it under [Issues][issues].
If you want to send a donation, please send it to [@niftylettuce](https://github.com/niftylettuce) — he is the developer of original Frappé, and he deserves your money :)
**[Donate Now][donate-now]**
## Contributors
* Alexander Pantyukhov <alwxndr@gmail.com>
* Nick Baugh <niftylettuce@gmail.com>
* Alexander Pantyukhov <alwxndr@gmail.com>
## Credits
@@ -40,13 +32,14 @@ If you want to send a donation, please send it to [@niftylettuce](https://github
[MIT][license-url]
[demo]: https://cdn.rawgit.com/alwx/frappe/master/media/milkshake.png
[frappe]: https://github.com/niftylettuce/frappe
[demo]: https://cdn.rawgit.com/niftylettuce/frappe/master/media/demo.png
[donate-now]: https://goo.gl/I1JFTX
[issues]: https://github.com/alwx/milkshake/issues
[release-page]: https://github.com/alwx/milkshake/releases
[issues]: https://github.com/niftylettuce/frappe/issues
[release-page]: https://github.com/niftylettuce/frappe/releases
[cafe-frappe]: http://www.colourlovers.com/palette/157431/Caf%C3%A9_Frapp%C3%A9
[coffee-drink]: https://thenounproject.com/term/coffee-drink/291679
[earthquake]: https://thenounproject.com/term/earthquake/21862
[license-image]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat
[license-url]: LICENSE
[frappe-logo]: https://cdn.rawgit.com/alwx/milkshake/master/media/logo.svg
[frappe-logo]: https://cdn.rawgit.com/niftylettuce/frappe/master/media/logo.svg
View
@@ -1,6 +1,6 @@
{
"osx" : {
"title": "Milkshake",
"title": "Frappé",
"background": "media/install.png",
"icon": "media/Icon.icns",
"icon-size": 80,
View
Binary file not shown.
View
Binary file not shown.
View
@@ -1,17 +1,18 @@
{
"name": "milkshake",
"version": "0.9.1",
"name": "frappe",
"version": "0.1.1",
"main": "dist/main.js",
"author": "Nick Baugh <niftylettuce@gmail.com>, Alexander Pantyukhov <alwxndr@gmail.com>",
"description": "Remotely shake your Android devices (including emulators)",
"scripts": {
"start": "NODE_ENV=development electron-compile ./src/ ./media/ && NODE_ENV=development electron src/main.js",
"dist": "rm -rf .cache && rm -rf dist && rm -rf build && babel src -d dist/ && electron-compile ./dist",
"build": "npm run dist && electron-packager . Milkshake --platform=darwin --arch=x64 --version=0.36.2 --icon=media/Icon.icns --app-version=0.0.1 --app-category-type=public.app-category.developer-tools --build-version=1 --app-bundle-id=com.alwxdev.milkshake --out=build --ignore=/*.sketch/ --ignore=/*.gif/ --ignore=/*.DS_Store/ --ignore=/*.cache/",
"package": "NODE_ENV=production npm run build && electron-builder \"build/Milkshake-darwin-x64/Milkshake.app\" --platform=osx --out=\"dist/osx\" --config=builder.json"
"build": "npm run dist && electron-packager . Frappe --platform=darwin --arch=x64 --version=0.36.2 --icon=media/Icon.icns --app-version=0.0.1 --app-category-type=public.app-category.developer-tools --build-version=1 --app-bundle-id=com.niftylettuce.frappe --out=build --ignore=/*.sketch/ --ignore=/*.gif/ --ignore=/*.DS_Store/ --ignore=/*.cache/",
"package": "NODE_ENV=production npm run build && electron-builder \"build/Frappe-darwin-x64/Frappe.app\" --platform=osx --out=\"dist/osx\" --config=builder.json"
},
"dependencies": {
"adbkit": "^2.3.1",
"electron-gh-releases": "^2.0.2",
"prfun": "^2.1.3"
},
"devDependencies": {
View
@@ -19,18 +19,17 @@ const iconPathPressed = path.join(mediaPath, 'IconPressedTemplate.png');
const client = adb.createClient();
const version = require('../package.json').version;
const versionStr = `Milkshake v${version} by @alwx`;
const versionAdditionalStr = `Based on Frappé by @niftylettuce`
const gitHubURL = 'https://github.com/alwx/milkshake';
const versionStr = `Frappé v${version} by @niftylettuce && @alwx`;
const gitHubURL = 'https://github.com/niftylettuce/frappe';
const commands = {
shake: {shortcut: 'cmd+shift+s',
operations: ['input keyevent 82']},
reloadJs: {shortcut: 'cmd+ctrl+shift+r',
reloadJs: {shortcut: 'cmd+shift+r',
operations: ['input keyevent 82',
'input keyevent 19',
'input keyevent 23']},
debugJs: {shortcut: 'cmd+ctrl+shift+d',
debugJs: {shortcut: 'cmd+shift+d',
operations: ['input keyevent 82',
'input keyevent 19',
'input keyevent 20',
@@ -148,11 +147,6 @@ function menuTemplate() {
role: 'help',
enabled: false
},
{
label: versionAdditionalStr,
role: 'help',
enabled: false
},
{
type: 'separator'
}
@@ -228,11 +222,11 @@ function listDevices() {
function refreshDevices() {
let contextMenu = Menu.buildFromTemplate(menuTemplate());
tray.setContextMenu(contextMenu);
if (deviceIds.length === 0) {
tray.setImage(iconPath);
} else {
tray.setImage(iconPathPressed);
tray.setContextMenu(contextMenu);
}
}
@@ -243,7 +237,7 @@ function deviceCallChain(id, commands, finally_fn) {
return shellCommand.then(() => {
setTimeout(() => {
deviceCallChain(id, commands.slice(1), finally_fn);
}, 200)
}, 500)
});
} else {
return shellCommand.then(finally_fn);

0 comments on commit d2f5df4

Please sign in to comment.