Permalink
Browse files

Version 1.03

- revamp title bar (as ActionBar)
- fix issue with Fahrplan update
- fix rendering of lecture tiles
  • Loading branch information...
1 parent 3e713d0 commit 7493cec39e9daabc7753ab97c3452f37dfeaa65a @tuxmobil committed Jul 26, 2011
View
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="src" path="com_markupartist_android_widget_actionbar_src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -0,0 +1,3 @@
+[submodule "libs/ActionBar"]
+ path = libs/ActionBar
+ url = git@github.com:tuxmobil/android-actionbar.git
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>CCC_Fahrplan</name>
+ <name>CampFahrplan</name>
<comment></comment>
<projects>
</projects>
@@ -30,4 +30,11 @@
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>com_markupartist_android_widget_actionbar_src</name>
+ <type>2</type>
+ <locationURI>_android_com_markupartist_android_widget_actionbar_3506d044/src</locationURI>
+ </link>
+ </linkedResources>
</projectDescription>
View
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="nerd.tuxmobil.fahrplan.camp11" android:versionCode="3" android:versionName="1.02">
+ package="nerd.tuxmobil.fahrplan.camp11" android:versionName="1.03" android:versionCode="4">
<uses-sdk android:targetSdkVersion="8" android:minSdkVersion="7"/>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"></uses-permission>
<application android:icon="@drawable/icon" android:label="@string/app_name" android:name="MyApp">
- <activity android:label="@string/app_name" android:name="Fahrplan">
+ <activity android:label="@string/app_name" android:name="Fahrplan" android:theme="@android:style/Theme.NoTitleBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
View
@@ -9,3 +9,4 @@
# Project target.
target=android-8
+android.library.reference.1=libs/ActionBar/actionbar
Submodule ActionBar added at a6249b
@@ -3,22 +3,39 @@
android:layout_width="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:padding="10dp"
android:background="@drawable/event_border">
- <RelativeLayout android:layout_height="wrap_content" android:layout_width="match_parent" android:id="@+id/relativeLayout1" android:gravity="bottom" android:layout_gravity="bottom">
- <TextView android:text="TextView" android:id="@+id/event_title"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:textStyle="bold" android:textColor="#000000" android:textSize="12sp" android:layout_alignParentLeft="true" android:layout_toLeftOf="@+id/bell"></TextView>
- <ImageView android:src="@drawable/bell" android:id="@+id/bell" android:layout_alignParentRight="true" android:scaleType="fitEnd" android:layout_alignParentTop="true" android:paddingTop="6dp" android:layout_height="14dp" android:layout_width="17dp"></ImageView>
+ <RelativeLayout android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:id="@+id/relativeLayout1"
+ android:gravity="bottom" android:layout_gravity="bottom">
+ <TextView android:text="TextView" android:id="@+id/event_title"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:textStyle="bold" android:textColor="#000000"
+ android:textSize="12sp" android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@+id/bell"></TextView>
+ <ImageView android:src="@drawable/bell" android:id="@+id/bell"
+ android:layout_alignParentRight="true" android:scaleType="fitEnd"
+ android:layout_alignParentTop="true" android:paddingTop="6dp"
+ android:layout_height="14dp" android:layout_width="17dp"></ImageView>
</RelativeLayout>
<TextView android:text="TextView" android:id="@+id/event_subtitle"
android:layout_width="wrap_content" android:layout_height="fill_parent"
- android:layout_weight="1" android:textColor="#000000" android:textSize="9sp"></TextView>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="wrap_content"
- android:orientation="horizontal" android:layout_width="match_parent">
- <TextView android:id="@+id/event_speakers"
- android:layout_height="wrap_content"
- android:layout_weight="0" android:layout_width="wrap_content" android:maxWidth="200dp" android:layout_gravity="bottom|left" android:textColor="#000000" android:textSize="8sp"></TextView>
+ android:layout_weight="1" android:textColor="#000000"
+ android:textSize="9sp"></TextView>
+ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent" android:gravity="bottom" android:layout_height="wrap_content">
<TextView android:text="TextView" android:id="@+id/event_track"
- android:layout_width="fill_parent" android:lines="1" android:layout_weight="1" android:ellipsize="end" android:layout_gravity="bottom|right" android:textColor="#000000" android:layout_height="match_parent" android:gravity="bottom|right" android:textSize="8sp"></TextView>
- </LinearLayout>
+ android:layout_width="wrap_content" android:textSize="8sp"
+ android:singleLine="true"
+ android:textColor="#000000"
+ android:layout_alignParentRight="true"
+ android:layout_height="wrap_content"></TextView>
+ <TextView android:id="@+id/event_speakers"
+ android:text="speakers"
+ android:layout_height="wrap_content" android:textSize="8sp"
+ android:singleLine="true" android:layout_width="wrap_content"
+ android:textColor="#000000"
+ android:ellipsize="end" android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@id/event_track"
+ android:paddingRight="10dp"
+ ></TextView>
+ </RelativeLayout>
</LinearLayout>
View
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout android:layout_width="match_parent"
android:layout_height="match_parent" android:orientation="vertical"
- android:background="#000000" xmlns:android="http://schemas.android.com/apk/res/android">
+ android:background="#000000" xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/nerd.tuxmobil.fahrplan.camp11">
+
+ <com.markupartist.android.widget.ActionBar
+ android:id="@+id/actionbar"
+ app:title="@string/app_name"
+ style="@style/ActionBar"
+ android:layout_alignParentTop="true"
+ />
<LinearLayout android:id="@+id/roomNameLandscape"
android:orientation="horizontal" android:layout_width="match_parent"
- android:layout_height="wrap_content" android:layout_alignParentTop="true">
+ android:layout_height="wrap_content" android:layout_below="@id/actionbar">
<TextView android:layout_height="wrap_content"
android:layout_width="25dp" android:text=""></TextView>
<TextView android:textColor="#ffffff" android:layout_height="wrap_content"
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/screen" android:layout_width="match_parent"
android:layout_height="match_parent" android:orientation="vertical"
android:gravity="center_vertical">
@@ -22,4 +22,11 @@
style="?android:attr/progressBarStyleSmall" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_centerVertical="true"
android:paddingLeft="3dip" android:layout_alignParentRight="true"></ProgressBar>
-</RelativeLayout>
+</RelativeLayout>-->
+<com.markupartist.android.widget.ActionBar
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/nerd.tuxmobil.fahrplan.camp11"
+ android:id="@+id/actionbar"
+ app:title="@string/app_name"
+ style="@style/ActionBar"
+/>
@@ -1,24 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="wrap_content"
- android:orientation="vertical" android:padding="10dp"
- android:background="@drawable/event_border" android:layout_width="match_parent">
- <RelativeLayout android:layout_height="wrap_content" android:layout_width="match_parent" android:id="@+id/relativeLayout1" android:gravity="bottom" android:layout_gravity="bottom">
- <TextView android:text="TextView" android:id="@+id/event_title"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:textSize="16sp" android:textStyle="bold" android:textColor="#000000" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_toLeftOf="@+id/bell"></TextView>
- <ImageView android:src="@drawable/bell" android:id="@+id/bell" android:layout_alignParentRight="true" android:scaleType="fitEnd" android:layout_alignParentTop="true" android:paddingTop="6dp" android:layout_height="18dp" android:layout_width="22dp"></ImageView>
+ android:layout_height="wrap_content" android:orientation="vertical"
+ android:padding="10dp" android:background="@drawable/event_border"
+ android:layout_width="match_parent">
+ <RelativeLayout android:layout_height="wrap_content"
+ android:layout_width="match_parent" android:id="@+id/relativeLayout1"
+ android:gravity="bottom" android:layout_gravity="bottom">
+ <TextView android:text="TextView" android:id="@+id/event_title"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:textSize="16sp" android:textStyle="bold" android:textColor="#000000"
+ android:layout_alignParentLeft="true" android:layout_alignParentTop="true"
+ android:layout_toLeftOf="@+id/bell"></TextView>
+ <ImageView android:src="@drawable/bell" android:id="@+id/bell"
+ android:layout_alignParentRight="true" android:scaleType="fitEnd"
+ android:layout_alignParentTop="true" android:paddingTop="6dp"
+ android:layout_height="18dp" android:layout_width="22dp"></ImageView>
</RelativeLayout>
<TextView android:text="TextView" android:id="@+id/event_subtitle"
android:layout_width="wrap_content" android:layout_height="fill_parent"
android:textSize="12sp" android:layout_weight="1" android:textColor="#000000"></TextView>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="wrap_content"
- android:orientation="horizontal" android:layout_width="match_parent">
- <TextView android:id="@+id/event_speakers"
- android:layout_height="wrap_content"
- android:textSize="10sp" android:layout_weight="0" android:layout_width="wrap_content" android:maxWidth="200dp" android:layout_gravity="bottom|left" android:textColor="#000000"></TextView>
+ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent" android:gravity="bottom" android:layout_height="wrap_content">
<TextView android:text="TextView" android:id="@+id/event_track"
- android:layout_width="fill_parent" android:textSize="10sp" android:lines="1" android:layout_weight="1" android:ellipsize="end" android:layout_gravity="bottom|right" android:textColor="#000000" android:layout_height="match_parent" android:gravity="bottom|right"></TextView>
- </LinearLayout>
+ android:layout_width="wrap_content" android:textSize="10sp"
+ android:singleLine="true"
+ android:textColor="#000000"
+ android:layout_alignParentRight="true"
+ android:layout_height="wrap_content"></TextView>
+ <TextView android:id="@+id/event_speakers"
+ android:text="speakers"
+ android:layout_height="wrap_content" android:textSize="10sp"
+ android:singleLine="true" android:layout_width="wrap_content"
+ android:textColor="#000000"
+ android:ellipsize="end" android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@id/event_track"
+ android:paddingRight="10dp"
+ ></TextView>
+ </RelativeLayout>
</LinearLayout>
View
@@ -1,11 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout android:layout_width="match_parent"
android:layout_height="match_parent" android:orientation="vertical"
- android:background="#000000" xmlns:android="http://schemas.android.com/apk/res/android">
+ android:background="#000000" xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/nerd.tuxmobil.fahrplan.camp11"
+ >
+
+ <com.markupartist.android.widget.ActionBar
+ android:id="@+id/actionbar"
+ app:title="@string/app_name"
+ style="@style/ActionBar"
+ android:layout_alignParentTop="true"
+ />
<TextView android:textColor="#ffffff" android:id="@+id/roomName"
android:layout_height="wrap_content" android:layout_gravity="center"
android:text=""
- android:textStyle="bold" android:textSize="11sp" android:layout_alignParentTop="true" android:gravity="center" android:layout_width="match_parent"></TextView>
+ android:textStyle="bold" android:textSize="11sp" android:gravity="center" android:layout_width="match_parent"
+ android:layout_below="@id/actionbar"></TextView>
<nerd.tuxmobil.fahrplan.camp11.CustomScrollView
android:id="@+id/scrollView1" android:layout_width="fill_parent"
android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android"
@@ -52,6 +52,7 @@
<string name="usage">Hinweis:\n\nLange auf Vortrag tippen um Erinnerung einzustellen.</string>
<string name="toggle_highlight">Markierung an/aus</string>
<string name="set_alarm">Alarm setzen</string>
- <string name="copyright_notes">Copyright 2011 Daniel Dorau. Portions Copyright 2008-2011 The K-9 Dog Walkers and 2006-2011 the Android Open Source Project.</string>
+ <string name="copyright_notes">Copyright 2011 Daniel Dorau. Portions Copyright 2008-2011 The K-9 Dog Walkers, 2010 Johan Nilsson and 2006-2011 the Android Open Source Project.</string>
<string name="delete_alarm">Alarm löschen</string>
+ <string name="today">heute</string>
</resources>
View
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Johan Nilsson <http://markupartist.com>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <color name="actionbar_separator">#274667</color>
+ <color name="actionbar_title">#FFFFFF</color>
+ <color name="actionbar_background_start">#274667</color>
+ <color name="actionbar_background_end">#4577a9</color>
+ <color name="actionbar_background_item_pressed_start">#447ab4</color>
+ <color name="actionbar_background_item_pressed_end">#60a6eb</color>
+</resources>
View
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 Johan Nilsson <http://markupartist.com>
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <dimen name="actionbar_height">35dip</dimen>
+ <dimen name="actionbar_item_height">35dip</dimen>
+ <dimen name="actionbar_item_width">35dip</dimen>
+</resources>
View
@@ -51,6 +51,7 @@
<string name="usage">Note:\n\nLong-Press on a Lecture to set an alarm.</string>
<string name="toggle_highlight">Marker on/off</string>
<string name="set_alarm">Set alarm</string>
- <string name="copyright_notes">Copyright 2011 Daniel Dorau. Portions Copyright 2008-2011 The K-9 Dog Walkers and 2006-2011 the Android Open Source Project.</string>
+ <string name="copyright_notes">Copyright 2011 Daniel Dorau. Portions Copyright 2008-2011 The K-9 Dog Walkers, 2010 Johan Nilsson and 2006-2011 the Android Open Source Project.</string>
<string name="delete_alarm">Clear alarm</string>
+ <string name="today">today</string>
</resources>
@@ -0,0 +1,20 @@
+package nerd.tuxmobil.fahrplan.camp11;
+
+import java.util.ArrayList;
+
+public class DateList {
+ public int dayIdx;
+ public String date;
+
+ public DateList(int dayIdx, String date) {
+ this.dayIdx = dayIdx;
+ this.date = date;
+ }
+
+ public static boolean dateInList(ArrayList<DateList> list, int dayIdx) {
+ for (DateList date : list) {
+ if (date.dayIdx == dayIdx) return true;
+ }
+ return false;
+ }
+}
Oops, something went wrong.

0 comments on commit 7493cec

Please sign in to comment.