diff --git a/config.xml b/config.xml index 272aab0..5f7f8f2 100644 --- a/config.xml +++ b/config.xml @@ -1,84 +1,84 @@ - + - Pokedex Helper - - Pokedex Helper - Das Trainertool Deluxe + Pokedex Helper + + Pokedex Helper - Das Trainertool Deluxe - - Ionic Up Team + + Ionic Up Team - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index 903da5e..edb5383 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index 4bf8624..5205b02 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index 735e992..d6b4153 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index e27f533..4a03ab9 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index d6f8f73..9016ad5 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index 14014d8..098bf52 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/android/icon/icon.psd b/resources/android/icon/icon.psd new file mode 100644 index 0000000..1ee932f Binary files /dev/null and b/resources/android/icon/icon.psd differ diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png index ab6c8d7..9e90081 100644 Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png index c4dde3c..9709846 100644 Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png index 0511749..12ab35b 100644 Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png index 93040f4..fc85a75 100644 Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png index 27bada0..d0a802a 100644 Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png index b4c3236..3a2ec63 100644 Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png index dd86159..946b0e6 100644 Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png index 2f1bce5..521a9bb 100644 Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png index daf7802..d2bcff1 100644 Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png index c533fd8..ee8918b 100644 Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png index 3518506..7941903 100644 Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png index ccdd6e1..81b3be9 100644 Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/resources/icon.psd b/resources/icon.psd new file mode 100644 index 0000000..08c213c Binary files /dev/null and b/resources/icon.psd differ diff --git a/resources/splash.psd b/resources/splash.psd new file mode 100644 index 0000000..cd00518 Binary files /dev/null and b/resources/splash.psd differ diff --git a/www/css/style.css b/www/css/style.css index 7385be9..3d6f159 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -484,29 +484,29 @@ md-sidenav { overflow-x: hidden; text-overflow: ellipsis; } -#contract-list-content { +#pokemon-list-content { margin-top: 84px; } - #contract-list-content .contract-list-item { + #pokemon-list-content .pokemon-list-item { padding: 14px 5px 14px 5px; } - #contract-list-content .contract-list-item .col-25.icon-user { + #pokemon-list-content .pokemon-list-item .col-25.icon-user { text-align: center; margin-left: -2px; } - #contract-list-content .contract-list-item .col-25.icon-user i { + #pokemon-list-content .pokemon-list-item .col-25.icon-user i { font-size: 22px; color: gray; } - #contract-list-content .contract-list-item .col-50 { + #pokemon-list-content .pokemon-list-item .col-50 { margin-left: -5px; font-size: 15px; white-space: nowrap; overflow-x: hidden; text-overflow: ellipsis; } - #contract-list-content .contract-list-item .col-25.status-button md-menu { + #pokemon-list-content .pokemon-list-item .col-25.status-button md-menu { padding: 0 20px 0 0; float: right; } - #contract-list-content .contract-list-item .col-25.status-button md-menu p { + #pokemon-list-content .pokemon-list-item .col-25.status-button md-menu p { margin: 0; } -#contract-list-loading-progress { +#pokemon-list-loading-progress { top: 56% !important; } #contract-details-content { @@ -784,7 +784,7 @@ md-sidenav { #product-detail-tab-product div.pin a { width: 92%; } -#mobile-contract-list-content { +#mobile-pokemon-list-content { margin-top: 164px; } #mobile-contract-detail-content { diff --git a/www/img/icons/action.png b/www/img/icons/action.png new file mode 100644 index 0000000..4ac4aee Binary files /dev/null and b/www/img/icons/action.png differ diff --git a/www/img/icons/action.svg b/www/img/icons/action.svg index 5a72701..263b3e1 100644 --- a/www/img/icons/action.svg +++ b/www/img/icons/action.svg @@ -12,12 +12,12 @@ width="210mm" height="297mm" viewBox="0 0 744.09448819 1052.3622047" - id="svg9591" + id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="action.svg"> + id="defs4" /> + id="metadata7"> @@ -53,339 +53,366 @@ inkscape:groupmode="layer" id="layer1"> + id="layer1-8" + inkscape:label="Ebene 1" + transform="matrix(1.3271031,0,0,1.3981022,-94.486153,-42.612342)"> + transform="translate(42.857143,8.5714286)" + id="g11245"> + id="g3532" + inkscape:export-xdpi="3.1858134" + inkscape:export-ydpi="3.1858134"> + id="g4443" + transform="matrix(1.8255092,0,0,1.949149,-478.52913,-33.514928)"> + id="g9338" + transform="matrix(0.39116815,0,0,0.29510598,249.05408,7.43675)"> - + transform="matrix(8.0238236,0,0,8.5196074,-554.8861,-1.1236718)" + id="g4139"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="text3628" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:261.0692749px;line-height:125%;font-family:'Bauhaus 93';-inkscape-font-specification:'Bauhaus 93, ';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + transform="scale(0.94317084,1.0602533)"> + + + + + + id="g5751"> + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + id="g5783"> + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + id="g5801" /> - - - - - - - + id="g5803" /> - - - - - - - - - - - - - - - - - + id="g5805" /> + + + + + + + + + + + + - Mehr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/www/img/icons/action1.png b/www/img/icons/action1.png new file mode 100644 index 0000000..d6a2104 Binary files /dev/null and b/www/img/icons/action1.png differ diff --git a/www/index.html b/www/index.html index b30fcf2..45b1f6f 100644 --- a/www/index.html +++ b/www/index.html @@ -56,8 +56,8 @@ - - + + diff --git a/www/js/app.js b/www/js/app.js index 23ed510..05458c3 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -22,8 +22,8 @@ window.globalVariable = { wordpressColor: "#0087BE" },// End custom color style variable startPage: { - url: "/app/contractlist",//Url of start page. - state: "app.contractlist"//State name of start page. + url: "/app/pokemonlist",//Url of start page. + state: "app.pokemonlist"//State name of start page. }, message: { errorMessage: "Technical error please try again later." //Default error message. @@ -265,7 +265,7 @@ angular.module('starter', ['ionic','ngIOS9UIWebViewPatch','starter.controllers', .icon('mail', 'img/icons/mail.svg') .icon('message', 'img/icons/message.svg') .icon('share-arrow', 'img/icons/share-arrow.svg') - .icon('pokemenu', 'img/icons/action.svg',64) + .icon('pokemenu', 'img/icons/action.svg',24) .icon('more', 'img/icons/more_vert.svg'); //mdThemingProvider use for change theme color of Ionic Material Design Application. @@ -339,39 +339,39 @@ angular.module('starter', ['ionic','ngIOS9UIWebViewPatch','starter.controllers', } } }) - .state('app.contractlist', { - url: "/contractlist", + .state('app.pokemonlist', { + url: "/pokemonlist", cache: false, params:{ isAnimated:(ionic.Platform.isAndroid()==false) }, views: { 'menuContent': { - templateUrl: "templates/application-storage/sqLite/html/contract-list.html", - controller: 'contractListCtrl' + templateUrl: "templates/pokemonliste/html/pokemon-list.html", + controller: 'pokemonListCtrl' } } }) - .state('app.contractdetail', { - url: "/contractdetail", + .state('app.pokemondetail', { + url: "/pokemondetail", params: { contractdetail: null, actionDelete: false }, views: { 'menuContent': { - templateUrl: "templates/application-storage/sqLite/html/contract-detail.html", - controller: 'contractDetailCtrl' + templateUrl: "templates/pokemonliste/html/pokemon-detail.html", + controller: 'pokemonDetailCtrl' } } }) - .state('app.contractsetting', { - url: "/contractsetting", + .state('app.pokemonsetting', { + url: "/pokemontsetting", cache: false, views: { 'menuContent': { - templateUrl: "templates/application-storage/sqLite/html/contract-setting.html", - controller: 'contractSettingCtrl' + templateUrl: "templates/pokemonliste/html/pokemon-setting.html", + controller: 'pokemonSettingCtrl' } } }) diff --git a/www/pokedex.db b/www/pokedex.db index 650097e..e15da0f 100644 Binary files a/www/pokedex.db and b/www/pokedex.db differ diff --git a/www/templates/menu/html/menu.html b/www/templates/menu/html/menu.html index d0ad6df..997228e 100644 --- a/www/templates/menu/html/menu.html +++ b/www/templates/menu/html/menu.html @@ -34,8 +34,8 @@
- Application Storage -
+ Pokemon-Index +
diff --git a/www/templates/application-storage/sqLite/html/contract-detail.html b/www/templates/pokemonliste/html/pokemon-detail.html similarity index 98% rename from www/templates/application-storage/sqLite/html/contract-detail.html rename to www/templates/pokemonliste/html/pokemon-detail.html index a5f3d53..bad3d6e 100644 --- a/www/templates/application-storage/sqLite/html/contract-detail.html +++ b/www/templates/pokemonliste/html/pokemon-detail.html @@ -5,7 +5,7 @@ - + diff --git a/www/templates/application-storage/sqLite/html/contract-list.html b/www/templates/pokemonliste/html/pokemon-list.html similarity index 82% rename from www/templates/application-storage/sqLite/html/contract-list.html rename to www/templates/pokemonliste/html/pokemon-list.html index 83c8b11..41d0547 100644 --- a/www/templates/application-storage/sqLite/html/contract-list.html +++ b/www/templates/pokemonliste/html/pokemon-list.html @@ -1,14 +1,14 @@ - - + + - - + + - @@ -25,69 +25,69 @@
- - + + -
- +

- +

- + Details anzeigen - + {{pokemon.pokemonname}} zu deinen Lesezeichen hinzufügen - + {{pokemon.pokemonname}} zu deinen Favoriten hinzufügen - + {{pokemon.pokemonname}} mit anderem Pokemon vergleichen - + Pokemon vom gleichen Typ anzeigen - + Pokemon vom gleichen Typ {{ pokemon.pokemontypaString }} anzeigen - + Pokemon vom gleichen Typ {{ pokemon.pokemontypbString }} anzeigen - + Welche Pokemon sind stärker als {{pokemon.pokemonname}} - + Welche Pokemon sind schwächer als {{pokemon.pokemonname}} @@ -113,7 +113,7 @@ @@ -121,7 +121,7 @@

{{ pokemon.pokemonname }} {{ pokemon.pokemonimage }}

+ ng-change="updatePokemon(pokemon)"> @@ -131,10 +131,10 @@ - + -
+
diff --git a/www/templates/application-storage/sqLite/html/contract-setting.html b/www/templates/pokemonliste/html/pokemon-setting.html similarity index 100% rename from www/templates/application-storage/sqLite/html/contract-setting.html rename to www/templates/pokemonliste/html/pokemon-setting.html diff --git a/www/templates/application-storage/sqLite/js/controllers.js b/www/templates/pokemonliste/js/controllers.js similarity index 81% rename from www/templates/application-storage/sqLite/js/controllers.js rename to www/templates/pokemonliste/js/controllers.js index cc7e55f..8d82bd2 100644 --- a/www/templates/application-storage/sqLite/js/controllers.js +++ b/www/templates/pokemonliste/js/controllers.js @@ -12,8 +12,8 @@ // Learn more about $cordovaSQLite : // http://ngcordova.com/docs/plugins/sqlite/ // -// Controller of Contract List Page. -appControllers.controller('contractListCtrl', function ($scope, $stateParams,$filter, $mdDialog, $timeout, $ionicModal, $state, $mdBottomSheet, pokedexDB) { +// Controller of Pokemon List Page. +appControllers.controller('pokemonListCtrl', function ($scope, $stateParams,$filter, $mdDialog, $timeout, $ionicModal, $state, $mdBottomSheet, pokedexDB) { // initialForm is the first activity in the controller. // It will initial all variable data and let the function works when page load. @@ -35,20 +35,20 @@ appControllers.controller('contractListCtrl', function ($scope, $stateParams,$fi // The function for show/hide loading progress. $timeout(function () { if ($scope.isAndroid) { - jQuery('#contract-list-loading-progress').show(); + jQuery('#pokemon-list-loading-progress').show(); } else { - jQuery('#contract-list-loading-progress').fadeIn(700); + jQuery('#pokemon-list-loading-progress').fadeIn(700); } }, 400); $timeout(function () { - //Get all contracts. + //Get all pokemns. $scope.getPokemonList(); - jQuery('#contract-list-loading-progress').hide(); - jQuery('#contract-list-content').fadeIn(); + jQuery('#pokemon-list-loading-progress').hide(); + jQuery('#pokemon-list-content').fadeIn(); $scope.isLoading = false; }, 3000);// End loading progress. @@ -61,19 +61,19 @@ appControllers.controller('contractListCtrl', function ($scope, $stateParams,$fi $scope.numberOfItemsToDisplay += 20; // load number of more items $scope.$broadcast('scroll.infiniteScrollComplete') } - // getPokemonList is for get all contracts. + // getPokemonList is for get all pokemons. // By calling pokedexDB.all() service. $scope.getPokemonList = function () { $scope.pokemons = pokedexDB.all(); };//End getPokemonList. - // updateContract is for update contracts. - // By sending contract to pokedexDB.update(contract) service. + // updatePokemon is for update pokemons. + // By sending pokemon to pokedexDB.update(pokemon) service. // Parameter : - // contract = contract that user select from view. - $scope.updateContract = function (pokemon) { + // pokemon = pokemon that user select from view. + $scope.updatePokemon = function (pokemon) { pokedexDB.update(pokemon); - };// End updateContract. + };// End updatePokemon. // navigateTo is for navigate to other page // by using targetPage to be the destination page @@ -84,7 +84,7 @@ appControllers.controller('contractListCtrl', function ($scope, $stateParams,$fi $scope.navigateTo = function (targetPage, objectData) { $timeout(function(){ $state.go(targetPage, { - contractdetail: objectData, + pokemondetail: objectData, actionDelete: (objectData == null ? false : true) }); },400); @@ -100,10 +100,10 @@ appControllers.controller('contractListCtrl', function ($scope, $stateParams,$fi $scope.initialForm(); -});// End of Contract List Page Controller. +});// End of Pokemon List Page Controller. -// Controller of Contract Detail Page. -appControllers.controller('contractDetailCtrl', function ($mdBottomSheet, $mdToast, $scope, $stateParams, $filter, $mdDialog, $ionicHistory, pokedexDB, $ionicHistory) { +// Controller of pokemon Detail Page. +appControllers.controller('pokemonDetailCtrl', function ($mdBottomSheet, $mdToast, $scope, $stateParams, $filter, $mdDialog, $ionicHistory, pokedexDB, $ionicHistory) { // initialForm is the first activity in the controller. // It will initial all variable data and let the function works when page load. @@ -112,38 +112,40 @@ appControllers.controller('contractDetailCtrl', function ($mdBottomSheet, $mdToa // $scope.disableSaveBtn is the variable for setting disable or enable the save button. $scope.disableSaveBtn = false; - // $scope.pokemon is the variable that store contract detail data that receive form contract list page. + // $scope.pokemon is the variable that store pokemon detail data that receive form pokemon list page. // Parameter : - // $stateParams.actionDelete(bool) = status that pass from contract list page. - // $stateParams.contractdetail(object) = contract that user select from contract list page. - $scope.pokemon = $scope.getContractData($stateParams.actionDelete, $stateParams.contractdetail); + // $stateParams.actionDelete(bool) = status that pass from pokemon list page. + // $stateParams.pokemondetail(object) = pokemon that user select from pokemon list page. + $scope.pokemon = $scope.getPokemonData($stateParams.actionDelete, $stateParams.pokemondetail); //$scope.actionDelete is the variable for allow or not allow to delete data. // It will allow to delete data when have data in the database. $scope.actionDelete = $stateParams.actionDelete; }; //End initialForm. - // getContractData is for get contract detail data. - $scope.getContractData = function (actionDelete, contractDetail) { - // tempContract is temporary contract data detail. - var tempContract = { + // getPokemonData is for get pokemon detail data. + $scope.getPokemonData = function (actionDelete, pokemonDetail) { + // tempPokemon is temporary pokemon data detail. + var tempPokemon = { id: null, - firstName: '', - lastName: '', - telephone: '', - email: '', - createDate: $filter('date')(new Date(), 'MMM dd yyyy'), - age: null, - isEnable: false + pokedexid: '', + pokedexidString: '', + pokemonname: '', + pokemontypa: '', + pokemontypb: '', + pokemontypaString: '', + pokemontypbString: '', + pokemonimage: '' } - // If actionDelete is true Contract Detail Page will show contract detail that receive form contract list page. - // else it will show tempContract for user to add new data. - return (actionDelete ? angular.copy(contractDetail) : tempContract); - };//End get contract detail data. - // saveContract is for save contract. + // If actionDelete is true pokemon Detail Page will show pokemon detail that receive form pokemon list page. + // else it will show pokemon for user to add new data. + return (actionDelete ? angular.copy(pokemonDetail) : tempPokemon); + };//End get pokemon detail data. + + // savePokemon is for save pokemon. // Parameter : - // contract(object) = contract object that presenting on the view. + // pokemon(object) = pokemon object that presenting on the view. // $event(object) = position of control that user tap. $scope.saveContract = function (pokemon, $event) { //$mdBottomSheet.hide() use for hide bottom sheet. @@ -165,15 +167,15 @@ appControllers.controller('contractDetailCtrl', function ($mdBottomSheet, $mdToa // For confirm button to save data. try { - // To update data by calling pokedexDB.update(contract) service. + // To update data by calling pokedexDB.update(pokemon) service. if ($scope.actionDelete) { if ($scope.pokemon.id == null) { $scope.pokemon.id = $scope.pokemonList[$scope.pokemonList.length - 1].id; } - pokedexDB.update(contract); + pokedexDB.update(pokemon); } // End update data. - // To add new data by calling pokedexDB.add(contract) service. + // To add new data by calling pokedexDB.add(pokemon) service. else { pokedexDB.add(pokemon); $scope.pokemonList = pokedexDB.all(); @@ -210,13 +212,13 @@ appControllers.controller('contractDetailCtrl', function ($mdBottomSheet, $mdToa }, function () { // For cancel button to save data. });// End alert box. - };// End save contract. + };// End save pokemon. - // deleteContract is for remove contract. + // deletePokemon is for remove pokemon. // Parameter : - // contract(object) = contract object that presenting on the view. + // pokemon(object) = pokemon object that presenting on the view. // $event(object) = position of control that user tap. - $scope.deleteContract = function (pokemon, $event) { + $scope.deletePokemon= function (pokemon, $event) { //$mdBottomSheet.hide() use for hide bottom sheet. $mdBottomSheet.hide(); //mdDialog.show use for show alert box for Confirm to delete data. @@ -288,7 +290,7 @@ appControllers.controller('contractDetailCtrl', function ($mdBottomSheet, $mdToa });// End Contract Detail page Controller. // Controller of Contract Setting Page. -appControllers.controller('contractSettingCtrl', function ($scope,$ionicViewSwitcher,$state, $timeout, $stateParams, $mdDialog, $mdBottomSheet, $mdToast, $ionicHistory, pokedexDB) { +appControllers.controller('pokemonSettingCtrl', function ($scope,$ionicViewSwitcher,$state, $timeout, $stateParams, $mdDialog, $mdBottomSheet, $mdToast, $ionicHistory, pokedexDB) { // initialForm is the first activity in the controller. // It will initial all variable data and let the function works when page load. diff --git a/www/templates/application-storage/sqLite/js/services.js b/www/templates/pokemonliste/js/services.js similarity index 100% rename from www/templates/application-storage/sqLite/js/services.js rename to www/templates/pokemonliste/js/services.js