From 56d7bc93ff80cc97804955c56cfd584905079ec5 Mon Sep 17 00:00:00 2001 From: Mahdi Dibaiee Date: Thu, 6 Nov 2014 13:28:24 +0330 Subject: [PATCH] no zip --- .gitignore | 1 + Android/js/diff.js | 136 ---- Android/res/icons/android/icon.png | Bin 3810 -> 0 bytes Gruntfile.js | 27 - Mobile/index.html | 14 +- Mobile/js/diff.js | 5 - Mobile/manifest.webapp | 5 +- Web/js/main.js | 53 +- build/mobile/index.html | 14 +- build/mobile/js/diff.js | 2 +- build/mobile/manifest.webapp | 5 +- build/web/js/main.js | 2 +- deploy-android | 6 - out/css/fonts/MozTT-Bold.ttf | Bin 0 -> 79388 bytes out/css/fonts/MozTT-Light.ttf | Bin 0 -> 93724 bytes out/css/fonts/MozTT-Medium.ttf | Bin 0 -> 93372 bytes out/css/fonts/MozTT-Regular.ttf | Bin 0 -> 93124 bytes out/css/imgs/bg_overlay_pressed_1.png | Bin 0 -> 93 bytes out/css/imgs/bg_overlay_pressed_2.png | Bin 0 -> 94 bytes out/css/imgs/clear.png | Bin 0 -> 1781 bytes out/css/imgs/div_line_lg_black.png | Bin 0 -> 1051 bytes out/css/imgs/div_line_sm_black.png | Bin 0 -> 1067 bytes out/css/imgs/download.png | Bin 0 -> 1302 bytes out/css/imgs/header_bg_black.png | Bin 0 -> 1160 bytes out/css/imgs/load.png | Bin 0 -> 413 bytes out/css/imgs/menu.png | Bin 0 -> 182 bytes out/css/imgs/redo.png | Bin 0 -> 1330 bytes out/css/imgs/settings.png | Bin 0 -> 1815 bytes out/css/imgs/undo.png | Bin 0 -> 1416 bytes out/css/main.css | 650 ++++++++++++++++++ out/css/seekbars/images/ui/handler.png | Bin 0 -> 636 bytes out/css/seekbars/images/ui/handler@1.5x.png | Bin 0 -> 960 bytes out/css/seekbars/images/ui/handler@2x.png | Bin 0 -> 938 bytes out/css/seekbars/seekbars.css | 79 +++ out/css/switches/images/check/danger.png | Bin 0 -> 583 bytes out/css/switches/images/check/danger@1.5x.png | Bin 0 -> 946 bytes out/css/switches/images/check/danger@2x.png | Bin 0 -> 1119 bytes out/css/switches/images/check/default.png | Bin 0 -> 583 bytes .../switches/images/check/default@1.5x.png | Bin 0 -> 946 bytes out/css/switches/images/check/default@2x.png | Bin 0 -> 1119 bytes out/css/switches/images/radio/danger.png | Bin 0 -> 578 bytes out/css/switches/images/radio/danger@1.5x.png | Bin 0 -> 893 bytes out/css/switches/images/radio/danger@2x.png | Bin 0 -> 1089 bytes out/css/switches/images/radio/default.png | Bin 0 -> 575 bytes .../switches/images/radio/default@1.5x.png | Bin 0 -> 889 bytes out/css/switches/images/radio/default@2x.png | Bin 0 -> 1251 bytes out/css/switches/images/switch/background.png | Bin 0 -> 755 bytes .../images/switch/background@1.5x.png | Bin 0 -> 1047 bytes .../switches/images/switch/background_off.png | Bin 0 -> 475 bytes .../images/switch/background_off@1.5x.png | Bin 0 -> 616 bytes .../value_selector/images/icons/checked.png | Bin 0 -> 177 bytes .../images/icons/checked@1.5x.png | Bin 0 -> 392 bytes .../images/icons/checked@2x.png | Bin 0 -> 601 bytes .../value_selector/images/ui/affirmative.png | Bin 0 -> 101 bytes out/css/value_selector/images/ui/default.png | Bin 0 -> 82 bytes out/css/value_selector/images/ui/gradient.png | Bin 0 -> 3524 bytes .../images/ui/gradient@1.5x.png | Bin 0 -> 7864 bytes out/css/value_selector/images/ui/pattern.png | Bin 0 -> 6851 bytes .../images/ui/shadow-invert.png | Bin 0 -> 83 bytes .../images/ui/shadow-invert@1.5x.png | Bin 0 -> 154 bytes .../images/ui/shadow-invert@2x.png | Bin 0 -> 86 bytes out/css/value_selector/images/ui/shadow.png | Bin 0 -> 82 bytes .../value_selector/images/ui/shadow@1.5x.png | Bin 0 -> 154 bytes .../value_selector/images/ui/shadow@2x.png | Bin 0 -> 87 bytes .../MozillaFXOSIconTemplate1_overlay.png | Bin 0 -> 4429 bytes out/img/icons/icon120.png | Bin 0 -> 8166 bytes out/img/icons/icon128.png | Bin 0 -> 9136 bytes out/img/icons/icon16.png | Bin 0 -> 738 bytes out/img/icons/icon2.png | Bin 0 -> 7371 bytes out/img/icons/icon2.svg | 102 +++ out/img/icons/icon32.png | Bin 0 -> 1630 bytes .../img/icons/icon48.png | Bin .../img/icons/icon60.png | Bin out/img/icons/icon64.png | Bin 0 -> 4075 bytes out/img/icons/icon90.png | Bin 0 -> 6142 bytes {Android => out}/index.html | 17 +- out/js/diff.js | 1 + out/js/events.js | 1 + out/js/functions.js | 1 + out/js/libs/color-picker-touch.js | 1 + out/js/libs/color-picker.js | 1 + out/js/libs/mobilebrowsers.js | 1 + out/js/libs/stack.js | 1 + out/js/libs/touch.js | 1 + out/js/libs/yepnope.min.js | 1 + out/js/libs/zepto.min.js | 1 + out/js/main.js | 1 + out/js/shared.js | 1 + out/manifest.webapp | 42 ++ out/sketchy.apk | Bin 0 -> 331245 bytes package.json | 2 +- sketchy-mobile-1.2.1.zip | Bin 557279 -> 0 bytes sketchy-web-1.2.1.zip | Bin 555096 -> 0 bytes 93 files changed, 914 insertions(+), 260 deletions(-) delete mode 100644 Android/js/diff.js delete mode 100644 Android/res/icons/android/icon.png delete mode 100755 deploy-android create mode 100644 out/css/fonts/MozTT-Bold.ttf create mode 100644 out/css/fonts/MozTT-Light.ttf create mode 100644 out/css/fonts/MozTT-Medium.ttf create mode 100644 out/css/fonts/MozTT-Regular.ttf create mode 100644 out/css/imgs/bg_overlay_pressed_1.png create mode 100644 out/css/imgs/bg_overlay_pressed_2.png create mode 100644 out/css/imgs/clear.png create mode 100644 out/css/imgs/div_line_lg_black.png create mode 100644 out/css/imgs/div_line_sm_black.png create mode 100644 out/css/imgs/download.png create mode 100644 out/css/imgs/header_bg_black.png create mode 100644 out/css/imgs/load.png create mode 100644 out/css/imgs/menu.png create mode 100644 out/css/imgs/redo.png create mode 100644 out/css/imgs/settings.png create mode 100644 out/css/imgs/undo.png create mode 100644 out/css/main.css create mode 100644 out/css/seekbars/images/ui/handler.png create mode 100644 out/css/seekbars/images/ui/handler@1.5x.png create mode 100644 out/css/seekbars/images/ui/handler@2x.png create mode 100644 out/css/seekbars/seekbars.css create mode 100644 out/css/switches/images/check/danger.png create mode 100644 out/css/switches/images/check/danger@1.5x.png create mode 100644 out/css/switches/images/check/danger@2x.png create mode 100644 out/css/switches/images/check/default.png create mode 100644 out/css/switches/images/check/default@1.5x.png create mode 100644 out/css/switches/images/check/default@2x.png create mode 100644 out/css/switches/images/radio/danger.png create mode 100644 out/css/switches/images/radio/danger@1.5x.png create mode 100644 out/css/switches/images/radio/danger@2x.png create mode 100644 out/css/switches/images/radio/default.png create mode 100644 out/css/switches/images/radio/default@1.5x.png create mode 100644 out/css/switches/images/radio/default@2x.png create mode 100644 out/css/switches/images/switch/background.png create mode 100644 out/css/switches/images/switch/background@1.5x.png create mode 100644 out/css/switches/images/switch/background_off.png create mode 100644 out/css/switches/images/switch/background_off@1.5x.png create mode 100644 out/css/value_selector/images/icons/checked.png create mode 100644 out/css/value_selector/images/icons/checked@1.5x.png create mode 100644 out/css/value_selector/images/icons/checked@2x.png create mode 100644 out/css/value_selector/images/ui/affirmative.png create mode 100644 out/css/value_selector/images/ui/default.png create mode 100644 out/css/value_selector/images/ui/gradient.png create mode 100644 out/css/value_selector/images/ui/gradient@1.5x.png create mode 100644 out/css/value_selector/images/ui/pattern.png create mode 100644 out/css/value_selector/images/ui/shadow-invert.png create mode 100644 out/css/value_selector/images/ui/shadow-invert@1.5x.png create mode 100644 out/css/value_selector/images/ui/shadow-invert@2x.png create mode 100644 out/css/value_selector/images/ui/shadow.png create mode 100644 out/css/value_selector/images/ui/shadow@1.5x.png create mode 100644 out/css/value_selector/images/ui/shadow@2x.png create mode 100644 out/img/icons/MozillaFXOSIconTemplate1_overlay.png create mode 100644 out/img/icons/icon120.png create mode 100644 out/img/icons/icon128.png create mode 100644 out/img/icons/icon16.png create mode 100644 out/img/icons/icon2.png create mode 100644 out/img/icons/icon2.svg create mode 100644 out/img/icons/icon32.png rename Android/res/icons/android/icon-48-mdpi.png => out/img/icons/icon48.png (100%) rename Android/res/icons/android/icon-60-hdpi.png => out/img/icons/icon60.png (100%) create mode 100644 out/img/icons/icon64.png create mode 100644 out/img/icons/icon90.png rename {Android => out}/index.html (91%) create mode 100644 out/js/diff.js create mode 100644 out/js/events.js create mode 100644 out/js/functions.js create mode 100644 out/js/libs/color-picker-touch.js create mode 100644 out/js/libs/color-picker.js create mode 100644 out/js/libs/mobilebrowsers.js create mode 100644 out/js/libs/stack.js create mode 100644 out/js/libs/touch.js create mode 100644 out/js/libs/yepnope.min.js create mode 100644 out/js/libs/zepto.min.js create mode 100644 out/js/main.js create mode 100644 out/js/shared.js create mode 100644 out/manifest.webapp create mode 100644 out/sketchy.apk delete mode 100644 sketchy-mobile-1.2.1.zip delete mode 100644 sketchy-web-1.2.1.zip diff --git a/.gitignore b/.gitignore index b462f3d..98a0b0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.swp *.swo *~ +*.zip node_modules diff --git a/Android/js/diff.js b/Android/js/diff.js deleted file mode 100644 index da656fe..0000000 --- a/Android/js/diff.js +++ /dev/null @@ -1,136 +0,0 @@ -$(document).ready(function() { - - $(document).on('resume', function() { - sizeAndPos(); - }) - document.addEventListener('deviceready', function() { - sizeAndPos(); - - $('*').off('click mousemove mousedown mouseup mouseleave').on('click mousemove mousedown mouseup mouseleave', function(e) { - e.preventDefault; - }) - - /*$('a[href^="http"]').tap(function(e) { - e.preventDefault(); - var href = $(this).attr('href'); - var view = new MozActivity({ - name: 'view', - data: { - type: 'url', - url: href - } - }) - - return false; - }).click(function(e) { - e.preventDefault(); - return false; - })*/ - - /*$('a[href^="mailto"]').tap(function(e) { - e.preventDefault(); - var mail = new MozActivity({ - name: 'new', - data: { - type: 'mail', - url: $(this).attr('href') - } - }) - return false; - }).click(function(e) { - e.preventDefault(); - return false; - })*/ - - - - window.save = function() { - var f = c.getImageData(0, 0, width(), height()); - switch(save.background) { - case 'white': { - c.fillStyle = 'white'; - c.globalCompositeOperation = 'destination-over'; - c.fillRect(0, 0, width(), height()); - c.fillStyle = settings.color; - c.globalCompositeOperation = settings.composite; - break; - } - case 'current color': { - c.fillStyle = settings.bg; - c.globalCompositeOperation = 'destination-over'; - c.fillRect(0, 0, width(), height()); - c.globalCompositeOperation = settings.composite; - break; - } - } - var data = $c[0].toDataURL(); - if( save.type == 'sketchy project' ) { - var list = JSON.parse(localStorage.getItem('projects')); - var index; - if( list && list.some(function(a, i) { if( a.name == save['file name'] ) {index = i; return true} return false }) ) { - if( confirm('A sketch with this name already exists. Do you want to overwrite ' + save['file name'] + '?') ) { - console.log(index); - list[index] = { - name: save['file name'], - data: data, - points: window.points, - settings: settings - } - localStorage.setItem('projects', JSON.stringify(list)); - } - } - else { - list ? list.push({ - name: save['file name'], - data: data, - points: window.points, - settings: settings - }) : list = [{ - name: save['file name'], - data: data, - points: window.points, - settings: settings - }]; - localStorage.setItem('projects', JSON.stringify(list)); - } - } else { - var img = dataToBlob(data); - var sd = window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function(fs) { - window.alert('SD'); - /*var req = fs.root.getFile(save['file name'] + '.png', {create: true}, function(entry) { - alert('Entry'); - entry.createWriter(function(writer) { - writer.write(img); - alert('Your Sketch was saved successfuly'); - }, function() { - alert('Something bad happened trying to save your sketch ' + save['file name'] + '\n Possible reasons:\n Duplicate Name \n Not enough permission') - }) - })*/ - }, function(e) { - alert('SD Error') - //alert('Couldn\'t access filesystem\nERR: ' + e.code); - }); - } - c.putImageData(f, 0, 0); - } - window.load = function() { - var file = JSON.parse(localStorage.getItem('projects')).filter(function(a) { return a.name == load.file })[0]; - var img = document.createElement('img'); - img.src = file.data; - img.onload = function() { - c.clearRect(0, 0, width(), height()); - c.drawImage(img, 0, 0); - window.points = file.points; - window.points.history = [{ data: c.createImageData($c.width(), $c.height()), points: []}, { data: c.getImageData(0, 0, width(), height()), points: file.points}]; - $c.first().css('background', file.settings.bg); - window.settings.bg = file.settings.bg; - } - } - - if( !localStorage.getItem('sawVote') ) { - $('.vote').removeClass('hidden'); - localStorage.setItem('sawVote', true); - } - }, false) - -}) diff --git a/Android/res/icons/android/icon.png b/Android/res/icons/android/icon.png deleted file mode 100644 index bac55b3360234a70c49e91370b68f294f02c9a17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3810 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 Y0a`&-tuDhprvLx|07*qoM6N<$f=*mJQ2+n{ diff --git a/Gruntfile.js b/Gruntfile.js index f5735ec..dc0e553 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -21,13 +21,6 @@ module.exports = function(grunt) { dest: 'build/web/js', filter: 'isFile' }, - { - expand: true, - cwd: 'Shared/js', - src: '**', - dest: 'build/android/js', - filter: 'isFile' - }, { expand: true, cwd: 'Mobile/js/', @@ -35,13 +28,6 @@ module.exports = function(grunt) { dest: 'build/mobile/js', filter: 'isFile' }, - { - expand: true, - cwd: 'Android/js/', - src: '*', - dest: 'build/android/js', - filter: 'isFile' - }, { expand: true, cwd: 'Web/js/', @@ -56,7 +42,6 @@ module.exports = function(grunt) { production: { files: { 'build/mobile/css/main.css': 'Shared/css/main.less', - 'build/android/css/main.css': 'Shared/css/main.less', 'build/web/css/main.css': 'Shared/css/main.less' }, compress: true @@ -83,12 +68,6 @@ module.exports = function(grunt) { src: ['index.html', 'manifest.webapp'], dest: 'build/mobile' }, - { - expand: true, - cwd: 'Android', - src: ['index.html', 'config.xml', 'AndroidManifest.xml', 'res/**', 'icon.png'], - dest: 'build/android' - }, { expand: true, cwd: 'Web', @@ -105,12 +84,6 @@ module.exports = function(grunt) { src: '*/**', dest: 'build/mobile/css' }, - { - expand: true, - cwd: 'Shared/css', - src: '*/**', - dest: 'build/android/css' - }, { expand: true, cwd: 'Shared/css', diff --git a/Mobile/index.html b/Mobile/index.html index abc9887..64be561 100644 --- a/Mobile/index.html +++ b/Mobile/index.html @@ -4,6 +4,7 @@ Sketchy + @@ -238,19 +239,6 @@ - - - - - -