{"push_id":1909563921,"size":10,"distinct_size":1,"ref":"refs/heads/dev-Max","head":"116893aad15c32475882fb60d6c2592cc3cd496d","before":"798cddd7cdcafdfdcc66522f89ddf2abcd916ac4","commits":[{"sha":"752046d4181c904151dba42b6244fd5f04ded13d","author":{"name":"TurboAddict","email":"7978d919bd3fe004310c0e4841d756f287f155e7@calstatela.edu"},"message":"Dev max (#12) - Fixed dialog bug\n\n* working BAC\r\n\r\n* fixed negative bac\r\n\r\n* added time to sober function\r\n\r\n* animation added\r\n\r\n* fixed bac 0.000\r\n\r\n* added scrollable landscape, fixed dialog","distinct":false,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/752046d4181c904151dba42b6244fd5f04ded13d"},{"sha":"9e52983fc671bf2d6155a73e202df49967e54fbb","author":{"name":"Leonard Velazquez","email":"b20f92cf3b51e185930f8e298a385666d111ccd1@yahoo.com"},"message":"Dev leo (#13) - detail activity\n\nAdded color, rating, and skill level to detail activity. Will get input to decide what changes need to be made in terms of font size and positioning.\r\n\r\n* added app icon launcher, pictures to the drinks, and manifest access to picasso\r\n\r\n* deleted mixr button\r\n\r\n* change the theme colors\r\n\r\n* fixed the image error\r\n\r\n* change the image url to work with all drinks and retrieve images\r\n\r\n* re added the divider again\r\n\r\n* added the star but no functionality to it\r\n\r\n* added the star checkbox, when you press it a toast appears in the bottom informing the user that the '(drink name) has been added to wishlist' and when clicked again it is removed from wishlist no implementation to showing on wish list has been added\r\n\r\n* added clickable functionality to the drink info, sends a serializable drinkItem object, added detailDrink to manifest\r\n\r\n* added list type string for ingredients in the model class, parsed the json array for ingredients, displaying in a linear layout in the detail for ingredients, using a relative layout in detail view\r\n\r\n* added the ingredients, occasions, and tastes\r\n\r\n* added rating, color, skill.","distinct":false,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/9e52983fc671bf2d6155a73e202df49967e54fbb"},{"sha":"31ef7eff587e9ce9ad4c88ea0d58a99b1bbeca69","author":{"name":"Melanie Kwon","email":"afdcfb3f3fba679b546c479fbba485089bd4818f@gmail.com"},"message":"Dev melanie - Wishlist (#10)\n\n* Update mainactivity to constraint layout. Add search icon to menu.\r\n\r\n* Implement Material Design tab layout for cocktails, cabinet, wishlist, and bac calc\r\n\r\n* Can't work on moving recyclerview until asynctask update to AsyncTaskLoader.\r\n\r\n* Clicking search menu icon brings up a fragment dialogue\r\n\r\n* Continue work on FragSearch.java\r\n\r\n* Add logging for debugging. Initialize the AsyncTaskLoader.\r\n\r\n* Recyclerview now showing results frmo query. AsyncTaskLoader working now.\r\n\r\n* Refactor AsynTaskLoader GET request into loadDrinkData method\r\n\r\n* Minor clean up\r\n\r\n* Migrated all of asynctaskloader to FragCocktails. Now recyclerview is displaying in correct tab.\r\n\r\n* Cleaning up the old recyclerview.\r\n\r\n* Testing out CardView.\r\n\r\n* Setup recyclerview and adapter for FragWishlist\r\n\r\n* Remove extraneous linearlayout\r\n\r\n* Modify display_list_view.xml to show drink items in CardView.\r\n\r\n* Add WishlistContract for db\r\n\r\n* Create WishlistDbHelper.\r\n\r\n* Before making changes to AdapterDrink additional constructor to accept integer for count\r\n\r\n* Implement AdapterWishlist. Add picture url to database.\r\n\r\n* Correct pic URL\r\n\r\n* Remove checkbox from wishlist to differentiate UI from cocktails fragment\r\n\r\n* Make id in Wishlist db not autoincrement. Create addToWishlist method in FragCocktails\r\n\r\n* Before changing checkbox click.\r\n\r\n* Refactor addToWishlist method to AdapterDrink instaed where click listener for checkbox currently is.\r\n\r\n* Turns out id is actually text. Updated Wishlist db from integer id pk to String id pk\r\n\r\n* Create separate layout xml for displaying wishlist items\r\n\r\n* Style shopping cart button.'\r\n\r\n* Comment out all asynctaskloader stuff in FraghWishlist.\r\n\r\n* Function for removewishlistitem\r\n\r\n* Add share icon\r\n\r\n* Pics now display on wishlist recyclerview.\r\n\r\n* Some minor cleanup.\r\n\r\n* Added popupMenu for selecting dot button. Now need to implement delete.\r\n\r\n* Icons added to menu items but won't display next to text. Will deal with that later..\r\n\r\n* Implement thumbsup thumbsdown rating buttons.\r\n\r\n* Thumbsup and Thumbsdown voting works. But need to update on either/or logic.\r\n\r\n* Adjust hitbox of thumbs buttons\r\n\r\n* logic for rating works correctly now.","distinct":false,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/31ef7eff587e9ce9ad4c88ea0d58a99b1bbeca69"},{"sha":"b782ec4f73126fcabadb9ba33672d92edd3baa8d","author":{"name":"bdb3","email":"f5c287748744bf14c5195c8346d08f1a959496cb@gmail.com"},"message":"Dev daniel (#15) - Cabinet\n\n* updated gradle build\r\n\r\n* trying to update branch\r\n\r\n* added menu button\r\n\r\n* added upc scanner frag\r\n\r\n* commit before merge\r\n\r\n* working rv\r\n\r\n* last commit of the night\r\n\r\n* color to buttons\r\n\r\n* got rid of refresh button","distinct":false,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/b782ec4f73126fcabadb9ba33672d92edd3baa8d"},{"sha":"484bf40f2d22c9b21551f351639a10d1f477acba","author":{"name":"melaniemkwon","email":"afdcfb3f3fba679b546c479fbba485089bd4818f@gmail.com"},"message":"Remove unnecessary folders.","distinct":false,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/484bf40f2d22c9b21551f351639a10d1f477acba"},{"sha":"808c986052f074195ed3d1423783ffe21e0da9ac","author":{"name":"TurboAddict","email":"7978d919bd3fe004310c0e4841d756f287f155e7@calstatela.edu"},"message":"Dev max (#16) - dialog fix\n\n* working BAC\r\n\r\n* fixed negative bac\r\n\r\n* added time to sober function\r\n\r\n* animation added\r\n\r\n* fixed bac 0.000\r\n\r\n* added scrollable landscape, fixed dialog\r\n\r\n* dialog fix","distinct":false,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/808c986052f074195ed3d1423783ffe21e0da9ac"},{"sha":"627ecb3bd6e3c3675fbd9325b2c21289087dde1a","author":{"name":"bdb3","email":"f5c287748744bf14c5195c8346d08f1a959496cb@gmail.com"},"message":"Dev daniel (#17) - refocusing fixed\n\n* updated gradle build\r\n\r\n* trying to update branch\r\n\r\n* added menu button\r\n\r\n* added upc scanner frag\r\n\r\n* commit before merge\r\n\r\n* working rv\r\n\r\n* last commit of the night\r\n\r\n* color to buttons\r\n\r\n* got rid of refresh button\r\n\r\n* cleaned up a bit\r\n\r\n* deleted rogue files\r\n\r\n* fixed refocusing issue","distinct":false,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/627ecb3bd6e3c3675fbd9325b2c21289087dde1a"},{"sha":"c97dfcb0b049479d56c67761a6f5762f4272f113","author":{"name":"Leonard Velazquez","email":"b20f92cf3b51e185930f8e298a385666d111ccd1@yahoo.com"},"message":"Dev leo (#19) - Detail Page\n\n* added app icon launcher, pictures to the drinks, and manifest access to picasso\r\n\r\n* deleted mixr button\r\n\r\n* change the theme colors\r\n\r\n* fixed the image error\r\n\r\n* change the image url to work with all drinks and retrieve images\r\n\r\n* re added the divider again\r\n\r\n* added the star but no functionality to it\r\n\r\n* added the star checkbox, when you press it a toast appears in the bottom informing the user that the '(drink name) has been added to wishlist' and when clicked again it is removed from wishlist no implementation to showing on wish list has been added\r\n\r\n* added clickable functionality to the drink info, sends a serializable drinkItem object, added detailDrink to manifest\r\n\r\n* added list type string for ingredients in the model class, parsed the json array for ingredients, displaying in a linear layout in the detail for ingredients, using a relative layout in detail view\r\n\r\n* added the ingredients, occasions, and tastes\r\n\r\n* added rating, color, skill.\r\n\r\n* adding a modified file\r\n\r\n* changed the linear layout to a constraint layout\r\n\r\n* made small changes in the detail ui","distinct":false,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/c97dfcb0b049479d56c67761a6f5762f4272f113"},{"sha":"ba1ca03da09aefb701c8ba1e3f9d7c93b5bb8077","author":{"name":"burnie022","email":"0e232b3c5cb9369cc699e70633501f0e8892a2ca@gmail.com"},"message":"Dev jose2 (#18) - Fix search box","distinct":false,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/ba1ca03da09aefb701c8ba1e3f9d7c93b5bb8077"},{"sha":"116893aad15c32475882fb60d6c2592cc3cd496d","author":{"name":"turboaddict","email":"7978d919bd3fe004310c0e4841d756f287f155e7@calstatela.edu"},"message":"minor ui changes","distinct":true,"url":"https://api.github.com/repos/melaniemkwon/Bartender/commits/116893aad15c32475882fb60d6c2592cc3cd496d"}]}
{"actor":{"display_login":"TurboAddict"}}