Merge pull request #73 from quelcom/master

Aligning layout screen and initial version of about text
AndroidAalto · Sep 17, 2011 · c37372b · c37372b
2 parents 1aa5b06 + 616b99d
commit c37372b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/res/layout/about.xml b/res/layout/about.xml
@@ -10,6 +10,7 @@
         android:src="@drawable/androidaalto_logo"
         android:layout_marginBottom="10dip"
         android:gravity="center_vertical|center_horizontal"
+        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
     </ImageView>

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -35,7 +35,10 @@
 
     <!-- About -->
     <string name="aboutTxt">
-(C) AndroidAalto 2011\n\n\
-<b>TODO</b> some text in here\n\
+(C) AndroidAalto 2011\n\
+<b>http://androidaalto.org/bookingroom/</b>\n\n\
+<b>Authors: </b>@j_u_s_h @hleinone @josepmariaroca @gellevi\n\n\
+<b>Source code: </b>https://github.com/AndroidAalto/BookingRoom\n\
+Released under GNU General Public License version 3\n\
 </string>
 </resources>
diff --git a/src/org/androidaalto/bookingroom/logic/MeetingInfoValidator.java b/src/org/androidaalto/bookingroom/logic/MeetingInfoValidator.java
@@ -78,6 +78,11 @@ public ValidationResult fullValidate(MeetingInfo meetingInfo) {
 
     public ValidationResult minimumValidate(MeetingInfo meetingInfo) {
         final ValidationResult errors = new ValidationResult();
+
+        if ( meetingInfo.getTitle().trim().length() == 0 ) {
+            errors.addError(new FieldError(meetingInfo, "title", "empty", "Meeting title is required"));
+        }
+
         final Time now = new Time();
         now.setToNow();
         if (meetingInfo.getStart().before(now))