diff --git a/project.properties b/project.properties deleted file mode 100644 index ea89160..0000000 --- a/project.properties +++ /dev/null @@ -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 diff --git a/res/values/strings.xml b/res/values/strings.xml index ef6240b..35458ba 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,6 +1,6 @@ - Det Norske Studentersamfund + Studentersamfundet PROGRAM BLI MED Gå til nettsiden diff --git a/src/com/studentersamfundet/app/ui/DnsActivity.java b/src/com/studentersamfundet/app/ui/DnsActivity.java index 0f7f9c9..ccf1735 100644 --- a/src/com/studentersamfundet/app/ui/DnsActivity.java +++ b/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(); }