Merge branch 'devAPI' into API
Merge remote-tracking branch 'origin/API' into develop
Adds some documentation
removed Consumptionfragment
Fixed status display on sockets.
Merge branch 'develop' of https://github.com/Soetnowzen/SmartPower into develop
fixed userfragment onclickListener to toggle on response
Merge branch 'develop' of github.com:Soetnowzen/SmartPower into develop
Changed layout system a bit to enable backwards compatibility.
Merge branch 'develop' of https://github.com/Soetnowzen/SmartPower into develop
Created an addFavorite method that hasn't been tested.
Added a complareTo method in PowerStrip.
onclicklistener to userfragment that only toggle on reply
Merge branch 'develop' of github.com:Soetnowzen/SmartPower into develop
Started working on the removeFavorite method.
Finished the removeFavorites and did a getFavorite method, but both arent tested.
Updated design decisions.
Merge branch 'develop' of https://github.com/Soetnowzen/SmartPower into develop
Updated documentation and removed some unused code.
Added thumbnails in drawable for some reason