From 4af9e77693e07b35d937b6059fe48e6a4506ef6c Mon Sep 17 00:00:00 2001 From: ARC Date: Sun, 26 Apr 2015 16:53:18 -0400 Subject: added application icons and used ngCordova for splash control --- LICENSE.TXT | 11 +++++++++++ resources/icon.png | Bin 60857 -> 78522 bytes resources/ios/icon/icon-40.png | Bin 1248 -> 1739 bytes resources/ios/icon/icon-40@2x.png | Bin 3564 -> 4529 bytes resources/ios/icon/icon-50.png | Bin 1902 -> 2745 bytes resources/ios/icon/icon-50@2x.png | Bin 4691 -> 5880 bytes resources/ios/icon/icon-60.png | Bin 2452 -> 3315 bytes resources/ios/icon/icon-60@2x.png | Bin 6042 -> 7226 bytes resources/ios/icon/icon-60@3x.png | Bin 10875 -> 11499 bytes resources/ios/icon/icon-72.png | Bin 2866 -> 4053 bytes resources/ios/icon/icon-72@2x.png | Bin 7793 -> 8870 bytes resources/ios/icon/icon-76.png | Bin 3319 -> 4239 bytes resources/ios/icon/icon-76@2x.png | Bin 8305 -> 9422 bytes resources/ios/icon/icon-small.png | Bin 818 -> 1346 bytes resources/ios/icon/icon-small@2x.png | Bin 2287 -> 3230 bytes resources/ios/icon/icon-small@3x.png | Bin 3856 -> 5002 bytes resources/ios/icon/icon.png | Bin 2112 -> 3171 bytes resources/ios/icon/icon@2x.png | Bin 5718 -> 6782 bytes resources/ios/splash/Default-568h@2x~iphone.png | Bin 31992 -> 109002 bytes resources/ios/splash/Default-667h.png | Bin 40444 -> 133762 bytes resources/ios/splash/Default-736h.png | Bin 45098 -> 220550 bytes resources/ios/splash/Default-Landscape-736h.png | Bin 44906 -> 270286 bytes resources/ios/splash/Default-Landscape@2x~ipad.png | Bin 102289 -> 330365 bytes resources/ios/splash/Default-Landscape~ipad.png | Bin 22655 -> 131430 bytes resources/ios/splash/Default-Portrait@2x~ipad.png | Bin 99461 -> 311120 bytes resources/ios/splash/Default-Portrait~ipad.png | Bin 22692 -> 124030 bytes resources/ios/splash/Default@2x~iphone.png | Bin 18852 -> 107309 bytes resources/ios/splash/Default~iphone.png | Bin 7214 -> 44533 bytes resources/splash.png | Bin 62210 -> 234859 bytes www/index.html | 1 + www/js/app.js | 6 +++++- www/js/controllers.js | 4 ++-- 32 files changed, 19 insertions(+), 3 deletions(-) diff --git a/LICENSE.TXT b/LICENSE.TXT index 7dafdbb5..4ac9596e 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -5,4 +5,15 @@ Be nice, please If you have any questions on licensing and if GPL doesn't suit you, feel free to contact me +The application icon and splash image uses the ninja drawing by Hector Gomez +and a burglar image by tzunghaor +https://openclipart.org/detail/63727/ninja +https://openclipart.org/detail/165656/burglar +License: https://openclipart.org/share + +The font used in the icon and splash is Kaneiwa +http://www.fontspace.com/family-font-mart/kaneiwa + + + -thanks diff --git a/resources/icon.png b/resources/icon.png index bee77667..70e36a8b 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png index 76cc53c3..9ccac7b2 100644 Binary files a/resources/ios/icon/icon-40.png and b/resources/ios/icon/icon-40.png differ diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png index 64b49069..24c6be93 100644 Binary files a/resources/ios/icon/icon-40@2x.png and b/resources/ios/icon/icon-40@2x.png differ diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png index 8bd51dfd..034cd840 100644 Binary files a/resources/ios/icon/icon-50.png and b/resources/ios/icon/icon-50.png differ diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png index 2676f8f6..8a75566e 100644 Binary files a/resources/ios/icon/icon-50@2x.png and b/resources/ios/icon/icon-50@2x.png differ diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png index 11f39124..597f6bba 100644 Binary files a/resources/ios/icon/icon-60.png and b/resources/ios/icon/icon-60.png differ diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png index b5210482..5a1a750c 100644 Binary files a/resources/ios/icon/icon-60@2x.png and b/resources/ios/icon/icon-60@2x.png differ diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png index dbc83030..87f28d48 100644 Binary files a/resources/ios/icon/icon-60@3x.png and b/resources/ios/icon/icon-60@3x.png differ diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png index 4e5a8276..969249df 100644 Binary files a/resources/ios/icon/icon-72.png and b/resources/ios/icon/icon-72.png differ diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png index 56fb29e6..09d57a96 100644 Binary files a/resources/ios/icon/icon-72@2x.png and b/resources/ios/icon/icon-72@2x.png differ diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png index e66a90ed..50a55222 100644 Binary files a/resources/ios/icon/icon-76.png and b/resources/ios/icon/icon-76.png differ diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png index 3f5c942f..81c525fb 100644 Binary files a/resources/ios/icon/icon-76@2x.png and b/resources/ios/icon/icon-76@2x.png differ diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png index de3146dc..6b63410e 100644 Binary files a/resources/ios/icon/icon-small.png and b/resources/ios/icon/icon-small.png differ diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png index 916a02ec..3422acb5 100644 Binary files a/resources/ios/icon/icon-small@2x.png and b/resources/ios/icon/icon-small@2x.png differ diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png index 0efa99d8..3222baba 100644 Binary files a/resources/ios/icon/icon-small@3x.png and b/resources/ios/icon/icon-small@3x.png differ diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png index 89f8c00f..29f2c922 100644 Binary files a/resources/ios/icon/icon.png and b/resources/ios/icon/icon.png differ diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png index a6687a10..e229cb3e 100644 Binary files a/resources/ios/icon/icon@2x.png and b/resources/ios/icon/icon@2x.png differ diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png index d2128a63..50d867ab 100644 Binary files a/resources/ios/splash/Default-568h@2x~iphone.png and b/resources/ios/splash/Default-568h@2x~iphone.png differ diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png index fc23e64c..eace699c 100644 Binary files a/resources/ios/splash/Default-667h.png and b/resources/ios/splash/Default-667h.png differ diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png index 71b16ca4..4022dcfc 100644 Binary files a/resources/ios/splash/Default-736h.png and b/resources/ios/splash/Default-736h.png differ diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png index aaff74ad..2b312025 100644 Binary files a/resources/ios/splash/Default-Landscape-736h.png and b/resources/ios/splash/Default-Landscape-736h.png differ diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png index 19770a2c..fdafe077 100644 Binary files a/resources/ios/splash/Default-Landscape@2x~ipad.png and b/resources/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png index 6fe89255..dbd20f6e 100644 Binary files a/resources/ios/splash/Default-Landscape~ipad.png and b/resources/ios/splash/Default-Landscape~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png index 3d06d86d..f0523931 100644 Binary files a/resources/ios/splash/Default-Portrait@2x~ipad.png and b/resources/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png index 53ad4c4c..5d6290d2 100644 Binary files a/resources/ios/splash/Default-Portrait~ipad.png and b/resources/ios/splash/Default-Portrait~ipad.png differ diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png index 6a133168..6a071195 100644 Binary files a/resources/ios/splash/Default@2x~iphone.png and b/resources/ios/splash/Default@2x~iphone.png differ diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png index 0aaad62b..11001285 100644 Binary files a/resources/ios/splash/Default~iphone.png and b/resources/ios/splash/Default~iphone.png differ diff --git a/resources/splash.png b/resources/splash.png index cbddba06..4074aeed 100644 Binary files a/resources/splash.png and b/resources/splash.png differ diff --git a/www/index.html b/www/index.html index 30f5225e..a1036a84 100644 --- a/www/index.html +++ b/www/index.html @@ -20,6 +20,7 @@ + diff --git a/www/js/app.js b/www/js/app.js index e72dd33a..b89dcb78 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -5,7 +5,11 @@ angular.module('zmApp', [ ]) -.run(function ($ionicPlatform, $ionicPopup, $rootScope, $state, ZMDataModel) { +.run(function ($ionicPlatform, $ionicPopup, $rootScope, $state, ZMDataModel,$cordovaSplashscreen) { + + setTimeout(function() { + $cordovaSplashscreen.hide() + }, 5000) ZMDataModel.init(); var loginData = ZMDataModel.getLogin(); diff --git a/www/js/controllers.js b/www/js/controllers.js index 8e4c9e69..b590d436 100644 --- a/www/js/controllers.js +++ b/www/js/controllers.js @@ -1,8 +1,8 @@ -angular.module('zmApp.controllers', ['ionic', 'googlechart' ]) + +angular.module('zmApp.controllers', ['ionic', 'googlechart', 'ngCordova' ]) .controller('zmApp.AppCtrl', function($scope, $ionicSideMenuDelegate) { $scope.openMenu = function () { $ionicSideMenuDelegate.toggleLeft(); } }); -//test \ No newline at end of file -- cgit v1.2.3