edb/android-app
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed opening hours and added Glassbaren.

Browse Source
This commit is contained in:
Lars Jansn Engvik committed 2011-12-05 16:29:32 +01:00
1 parent 25fccee09f
commit 71c3da79b4
3 files changed
+22 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

project.properties
-11
View File
@@ -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
src/com/studentersamfundet/app/ui/BaseDnsActivity.java
+2 -5
View File
@@ -4,7 +4,6 @@ import com.studentersamfundet.app.R;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Handler;
import android.view.View;
@@ -24,13 +23,11 @@ public abstract class BaseDnsActivity extends Activity {
/* Join button was pushed: */
} else if (v.getId() == R.id.bli_med_button) {
/*intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY
intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY
| Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.setClass(this, JoinUsActivity.class);
startActivity(intent);*/
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://studentersamfundet.no/bliaktiv.php"));
startActivity(browserIntent);
startActivity(intent);
/* The header was pushed: */
} else if (v.getId() == R.id.header) {
src/com/studentersamfundet/app/ui/DnsActivity.java
+20 -9
View File
@@ -17,22 +17,31 @@ 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 = {
"Stengt",
"19.00 - 00.00",
"19.00 - 00.00",
"19.00 - 00.00",
"19.00 - 03.00",
"19.00 - 03.00",
"20.00 - 03.00"};
"20.00 - 03.00",
"Stengt"};
/** Called when the activity is first created. */
@Override
@@ -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();
}