00f1f80d1a 
					 
					
						
						
							
							Add methods to be used by both button presses and gesture detection  
						
						 
						
						
						
						
					 
					
						2014-03-24 10:07:09 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cef01d01e0 
					 
					
						
						
							
							Initial layout and code skeleton for ImageViewer  
						
						 
						
						
						
						
					 
					
						2014-03-24 10:02:07 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e4dd5249b2 
					 
					
						
						
							
							Add the ImageViewer Activity  
						
						 
						
						
						
						
					 
					
						2014-03-24 09:48:19 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d6b5f86f66 
					 
					
						
						
							
							Fix cast from int to Integer  
						
						 
						
						
						
						
					 
					
						2014-03-24 09:46:15 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cc1f93e693 
					 
					
						
						
							
							Fix the menu so that Bradlee can compile... :)  
						
						 
						
						
						
						
					 
					
						2014-03-24 01:46:32 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e43da5178d 
					 
					
						
						
							
							Ignore .settings/  
						
						 
						
						
						
						
					 
					
						2014-03-23 22:30:33 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9c0f4425a6 
					 
					
						
						
							
							Remove some more files from the bin/ folder  
						
						 
						
						
						
						
					 
					
						2014-03-23 22:27:16 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9366630de6 
					 
					
						
						
							
							Remove resources from the bin/ folder  
						
						 
						
						
						
						
					 
					
						2014-03-23 22:15:36 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a8acb0131f 
					 
					
						
						
							
							Ignore the bin/ directory  
						
						 
						
						
						
						
					 
					
						2014-03-23 22:07:52 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7d937009e8 
					 
					
						
						
							
							Fixed main activity errors and added click function to start  
						
						 
						
						... 
						
						
						
						GalleryActivity. Started working on GalleryActivity. 
						
						
					 
					
						2014-03-23 20:56:39 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5e66a9d27a 
					 
					
						
						
							
							Add the extra string resources we need  
						
						 
						
						
						
						
					 
					
						2014-03-23 16:15:35 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fe5f72d35c 
					 
					
						
						
							
							Ignore the autogen directories  
						
						 
						
						
						
						
					 
					
						2014-03-18 20:37:00 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c9941fd0e4 
					 
					
						
						
							
							Switch the PhotoActivity to the MainActivity  
						
						 
						
						
						
						
					 
					
						2014-03-18 20:36:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0e90b852c9 
					 
					
						
						
							
							Commit initial Homework 4  
						
						 
						
						
						
						
					 
					
						2014-03-18 20:33:51 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d23208c55f 
					 
					
						
						
							
							Fix up the threaded section of the layout  
						
						 
						
						... 
						
						
						
						Also, minor tweaks to the asynctask portion. 
						
						
					 
					
						2014-03-10 18:24:50 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						467d7eb9a7 
					 
					
						
						
							
							Minor formatting and code cleaning  
						
						 
						
						
						
						
					 
					
						2014-03-10 08:57:43 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f0c626dcaf 
					 
					
						
						
							
							Added comments, string and integer values, and text view for Async.  
						
						 
						
						... 
						
						
						
						Trouble connecting to host to download images now. Don't know if it is
my network problem or not. Made no changes to downloading code. 
						
						
					 
					
						2014-03-10 00:07:57 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a7b8f196a2 
					 
					
						
						
							
							Now working with text label. Just have to format and put in the right  
						
						 
						
						... 
						
						
						
						text. 
						
						
					 
					
						2014-03-09 21:56:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2f59a35d5e 
					 
					
						
						
							
							Added header comments with team and project information.  
						
						 
						
						
						
						
					 
					
						2014-03-09 17:58:47 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						61c9379b05 
					 
					
						
						
							
							Added Async functionality and grid display. Still need to fix sizes and  
						
						 
						
						... 
						
						
						
						display text  under pictures. 
						
						
					 
					
						2014-03-09 17:55:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d41468fc6f 
					 
					
						
						
							
							Downloading images from threads works. They aren't laid out correctly...  
						
						 
						
						
						
						
					 
					
						2014-03-01 00:23:47 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ecb13bc4ed 
					 
					
						
						
							
							Buttons now launch the correct activities  
						
						 
						
						... 
						
						
						
						Only thing left to do is the photo activities themselves. 
						
						
					 
					
						2014-02-28 20:34:01 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						53b7016846 
					 
					
						
						
							
							Create the AsyncTask and Thread Photograph activities  
						
						 
						
						
						
						
					 
					
						2014-02-28 20:04:17 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d31debf986 
					 
					
						
						
							
							And ignore the bin/ and gen/ folders  
						
						 
						
						
						
						
					 
					
						2014-02-28 19:51:23 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3f11766f5f 
					 
					
						
						
							
							Initial skeleton commit for InClass assignment 3  
						
						 
						
						
						
						
					 
					
						2014-02-28 19:50:35 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						463ac371c2 
					 
					
						
						
							
							Resizing cover.jpg fixes some of the issues  
						
						 
						
						
						
						
					 
					
						2014-02-24 23:00:18 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						065991d3cc 
					 
					
						
						
							
							Change the comment of Tile.java  
						
						 
						
						
						
						
					 
					
						2014-02-24 22:33:51 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2d1c48324a 
					 
					
						
						
							
							Kill the application when the Exit button of the ResultActivity is  
						
						 
						
						... 
						
						
						
						pressed. 
						
						
					 
					
						2014-02-24 22:30:44 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0a80acace1 
					 
					
						
						
							
							Functionality for HW3. Tried to seperate Tile class and MainActivity.  
						
						 
						
						... 
						
						
						
						Has 2 issues. First is that a completed row has the Tile ImageViews
change size and second is that finish()does not properly close the
entire application. 
						
						
					 
					
						2014-02-24 19:20:43 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						05dfaa8ebf 
					 
					
						
						
							
							Add header comments to the activities  
						
						 
						
						
						
						
					 
					
						2014-02-23 08:46:24 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d7980f9108 
					 
					
						
						
							
							Add the behavior for the ResultActivity  
						
						 
						
						
						
						
					 
					
						2014-02-23 08:38:23 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9cad32bb14 
					 
					
						
						
							
							Finished UI for the ResultActivity  
						
						 
						
						
						
						
					 
					
						2014-02-22 17:01:48 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bc464e5c6d 
					 
					
						
						
							
							Add the initial result activity  
						
						 
						
						
						
						
					 
					
						2014-02-22 16:39:00 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9535b43df6 
					 
					
						
						
							
							Commit the main game activity layout  
						
						 
						
						
						
						
					 
					
						2014-02-22 16:38:45 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a7ff7d6ae7 
					 
					
						
						
							
							Ignore the assets/, bin/, and gen/ folders  
						
						 
						
						
						
						
					 
					
						2014-02-22 16:01:16 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a06433af75 
					 
					
						
						
							
							Switch the app theme to Holo Dark  
						
						 
						
						
						
						
					 
					
						2014-02-22 16:00:42 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ef5d376910 
					 
					
						
						
							
							Add support files for HW3  
						
						 
						
						
						
						
					 
					
						2014-02-22 15:55:57 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5c30084521 
					 
					
						
						
							
							Add initial skeleton for HW3  
						
						 
						
						
						
						
					 
					
						2014-02-22 15:54:21 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						34b77955ff 
					 
					
						
						
							
							Minor tweaks before submit homework 2  
						
						 
						
						
						
						
					 
					
						2014-02-10 23:34:50 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						44524c7f70 
					 
					
						
						
							
							Added default checked to 10% radio button  
						
						 
						
						
						
						
					 
					
						2014-02-09 20:46:17 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						421bf4e1e8 
					 
					
						
						
							
							Added fullfunctionality to the interface.  
						
						 
						
						
						
						
					 
					
						2014-02-09 20:38:55 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a3de9394f0 
					 
					
						
						
							
							User interface for Discount Calculator is complete  
						
						 
						
						
						
						
					 
					
						2014-02-08 19:42:32 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6a42740848 
					 
					
						
						
							
							Ignore the gen/ and bin/ folders  
						
						 
						
						
						
						
					 
					
						2014-02-08 17:51:24 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						42a0e3293c 
					 
					
						
						
							
							Add the project skeleton for HW2.  
						
						 
						
						
						
						
					 
					
						2014-02-08 17:48:45 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						88ee1b4a3f 
					 
					
						
						
							
							Refactor PartOne.java  
						
						 
						
						
						
						
					 
					
						2014-01-28 17:09:38 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fcbd74a5e4 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/DjBushido/itcs4180.git  
						
						 
						
						
						
						
					 
					
						2014-01-25 15:55:04 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c3def78187 
					 
					
						
						
							
							Finish debugging, everything now working correctly.  
						
						 
						
						
						
						
					 
					
						2014-01-25 15:53:57 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1d66bba2cc 
					 
					
						
						
							
							Functioning Homework 1 Part 1. Creates a treelist of all new users and  
						
						 
						
						... 
						
						
						
						removes all users that were in old users, leaving only the unique,
non-duplicated new users not in old users. 
						
						
					 
					
						2014-01-24 12:07:59 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8b893cd06a 
					 
					
						
						
							
							Fix the equals and hashCode methods so that sets work as expected  
						
						 
						
						
						
						
					 
					
						2014-01-22 15:17:45 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						57dfd938fa 
					 
					
						
						
							
							Commit the (untested) implementation of all assignments in part two.  
						
						 
						
						
						
						
					 
					
						2014-01-22 14:56:19 -05:00