Merge branch 'master' of github.com:neuf/DNSapp

project.properties

@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-8

res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Det Norske Studentersamfund</string>
+    <string name="app_name">Studentersamfundet</string>
     <string name="program_button">PROGRAM</string>
     <string name="bli_med_button">BLI MED</string>
     <string name="event_link_button">Gå til nettsiden</string>

src/com/studentersamfundet/app/ui/DnsActivity.java

@@ -17,13 +17,22 @@ import com.studentersamfundet.app.R;
 
 public class DnsActivity extends BaseDnsActivity {
 	String[] openingHoursHouse = {
-		"13.00 - 01.00",
-		"13.00 - 01.00",
-		"      - 01.30",
-		"      - 03.00",
-		"      - 03.00",
-		"15.00 - 03.00",
-		"      - 19.00"};
+		"10.00 - 01.00",
+		"10.00 - 01.00",
+		"10.00 - 01.00",
+		"10.00 - 03.00",
+		"10.00 - 03.00",
+		"12.00 - 03.00",
+		"12.00 - 20.00"};
+	
+	String[] openingHoursGB = {
+			"13.00 - 01.00",
+			"13.00 - 01.00",
+			"13.00 - 01.00",
+			"13.00 - 03.00",
+			"13.00 - 03.00",
+			"16.00 - 03.00",
+			"Stengt"};	
 	
 	String[] openingHoursBC = {
 		"19.00 - 00.00",
@@ -43,10 +52,12 @@ public class DnsActivity extends BaseDnsActivity {
 		/* Set opening hours: */
 		TextView tvNeuf = (TextView)findViewById(R.id.main_menu_hours_neuf);
 		TextView tvBC = (TextView)findViewById(R.id.main_menu_hours_bc);
+		// TextView tvGB = (TextView)findViewById(R.id.main_menu_hours_gb);
 		int day = (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) + 5) % 7;
 		
 		tvNeuf.setText(openingHoursHouse[day]);
 		tvBC.setText(openingHoursBC[day]);
+		// 		tvGB.setText(openingHoursBC[day]);
 		
 		setupFocus();
 	}