Teacher substitution layout completed

source/gen/me/caesar2011/vpherder/R.java

@@ -12,6 +12,7 @@ public final class R {
     }
     public static final class color {
         public static final int block=0x7f040002;
+        public static final int cancelled=0x7f040004;
         public static final int fragment_background=0x7f040003;
         public static final int subject=0x7f040000;
         public static final int teacher=0x7f040001;
@@ -30,22 +31,22 @@ public final class R {
         public static final int ic_launcher=0x7f020000;
     }
     public static final class id {
-        public static final int action_settings=0x7f09000f;
+        public static final int box_subject=0x7f080008;
-        public static final int box_subject=0x7f090008;
+        public static final int cancelbar=0x7f08000f;
-        public static final int changes=0x7f090007;
+        public static final int changes=0x7f080007;
-        public static final int listview=0x7f090003;
+        public static final int listview=0x7f080003;
-        public static final int main=0x7f090005;
+        public static final int main=0x7f080005;
-        public static final int pager=0x7f090000;
+        public static final int pager=0x7f080000;
-        public static final int pager_title_strip=0x7f090001;
+        public static final int pager_title_strip=0x7f080001;
-        public static final int remark=0x7f09000e;
+        public static final int remark=0x7f08000e;
-        public static final int section_label=0x7f090002;
+        public static final int section_label=0x7f080002;
-        public static final int subject=0x7f090009;
+        public static final int subject=0x7f080009;
-        public static final int subject_subinfo=0x7f09000a;
+        public static final int subject_subinfo=0x7f08000a;
-        public static final int teacher=0x7f090006;
+        public static final int teacher=0x7f080006;
-        public static final int text=0x7f090004;
+        public static final int text=0x7f080004;
-        public static final int textview_from=0x7f09000b;
+        public static final int textview_from=0x7f08000b;
-        public static final int textview_to=0x7f09000d;
+        public static final int textview_to=0x7f08000d;
-        public static final int to_arrow=0x7f09000c;
+        public static final int to_arrow=0x7f08000c;
     }
     public static final class layout {
         public static final int activity_main=0x7f030000;
@@ -56,9 +57,6 @@ public final class R {
         public static final int teacher_substitution_row_alteration=0x7f030005;
         public static final int teacher_substitution_row_remark=0x7f030006;
     }
-    public static final class menu {
-        public static final int main=0x7f080000;
-    }
     public static final class string {
         public static final int action_settings=0x7f060007;
         public static final int app_name=0x7f060004;

source/res/layout/teacher_substitution_row_alteration.xml

@@ -91,4 +91,20 @@
             style="@android:style/TextAppearance.Medium"
             android:textStyle="italic"
             android:padding="6sp" />
+    <RelativeLayout 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/cancelbar"
+        android:layout_alignLeft="@+id/main"
+        android:layout_alignTop="@+id/main"
+        android:layout_alignRight="@+id/main"
+        android:layout_alignBottom="@+id/main">
+        <View
+            android:background="@color/cancelled"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginLeft="15sp"
+            android:layout_marginRight="15sp"
+            android:layout_centerInParent="true" />
+    </RelativeLayout>
 </RelativeLayout>

source/res/menu/main.xml

@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>

source/res/values/colors.xml

@@ -4,4 +4,5 @@
     <color name="teacher">#000</color>
     <color name="block">#888</color>
     <color name="fragment_background">#fff</color>
+    <color name="cancelled">#f00</color>
 </resources>

source/src/me/caesar2011/vpherder/teachersubstitution/TSAdapter.java

@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 /**
@@ -103,5 +104,7 @@ public class TSAdapter extends ArrayAdapter<TSjsonAnnouncement> {
 		public TextView changes_from;
 		public TextView changes_to;
 		public TextView remark;
+		public View cancelbar;
+		public RelativeLayout changes;
 	}
 }

source/src/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.java

@@ -14,6 +14,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.view.View;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 /**
@@ -85,8 +86,21 @@ public class TSjsonAnnouncementAlteration extends TSjsonAnnouncement {
 		if (remark.equals("false")) {
 			holdAlteration.remark.setVisibility(View.GONE);
 		} else {
+			holdAlteration.remark.setVisibility(View.VISIBLE);
 			holdAlteration.remark.setText(remark);
 		}
+		
+		if (sFrom.equals("")) {
+			holdAlteration.changes.setVisibility(View.GONE);
+		} else {
+			holdAlteration.changes.setVisibility(View.VISIBLE);
+		}
+		
+		if (cancelled) {
+			holdAlteration.cancelbar.setVisibility(View.VISIBLE);
+		} else {
+			holdAlteration.cancelbar.setVisibility(View.GONE);
+		}
 	}
 
 	@Override
@@ -98,6 +112,8 @@ public class TSjsonAnnouncementAlteration extends TSjsonAnnouncement {
         holder.changes_from = (TextView)convertView.findViewById(R.id.textview_from);
         holder.changes_to = (TextView)convertView.findViewById(R.id.textview_to);
         holder.remark = (TextView)convertView.findViewById(R.id.remark);
+        holder.cancelbar = (View)convertView.findViewById(R.id.cancelbar);
+        holder.changes = (RelativeLayout)convertView.findViewById(R.id.changes);
         return holder;
 	}