Merge branch 'buttonsrefactor' into sprint5

johanbrook · Oct 22, 2012 · 1b18d8b · 1b18d8b
2 parents b96140e + 54c09bd
commit 1b18d8b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/res/layout/activity_movie_details.xml b/res/layout/activity_movie_details.xml
@@ -44,7 +44,8 @@
 		    	android:text="@string/release_date_button"
 		    	android:layout_alignBaseline="@+id/releaseDate"
 		    	android:visibility="gone"
-		        android:onClick="onDatePickerButtonClick" />
+		        android:onClick="onDatePickerButtonClick"
+		        android:textSize="11sp" />
 
 		    <TextView
 		        android:id="@+id/genres"

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="title_activity_add_movie">Add Movie</string>
     <string name="input_movie_hint">Movie title</string>
     <string name="input_note_hint">Personal note</string>
-    <string name="release_date_button">Pick</string>
+    <string name="release_date_button">Date</string>
     <string name="release_date_hint">Release date</string>
     <string name="rating_hint">How badly do you want to see this movie?</string>
     <string name="input_tag_hint">Add tags</string>

diff --git a/src/se/chalmers/watchme/utils/DateTimeUtils.java b/src/se/chalmers/watchme/utils/DateTimeUtils.java
@@ -1,7 +1,7 @@
 /**
  *	DateTimeUtils.java
  *
- *  A utility class for converting date's to common formats
+ *  A utility class for converting dates to common formats
  *
  *	@author Robin Andersson, Johan Brook
  *	@copyright (c) 2012 Robin Andersson, Johan Brook, Mattias Henriksson, Lisa Stenberg

diff --git a/src/se/chalmers/watchme/utils/MenuUtils.java b/src/se/chalmers/watchme/utils/MenuUtils.java
@@ -1,6 +1,8 @@
 /**
 *	MenuUtils.java
-*
+*	
+*	A utility class with common menu methods
+*	
 *	@author Robin Andersson
 *	@copyright (c) 2012 Robin Andersson
 *	@license MIT
@@ -11,7 +13,8 @@
 import android.view.MenuItem;
 
 public class MenuUtils {
-
+
+	// TODO Make more general, for instance, receive icon instead of MenuItem
 	/**
 	 * Changes the menu item's icon to reflect enabled or disabled state.
 	 *