diff --git a/source/bin/classes/me/caesar2011/vpherder/MainActivity$SectionFragment.class b/source/bin/classes/me/caesar2011/vpherder/MainActivity$SectionFragment.class index ad98034..2a85b09 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/MainActivity$SectionFragment.class and b/source/bin/classes/me/caesar2011/vpherder/MainActivity$SectionFragment.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/MainActivity.class b/source/bin/classes/me/caesar2011/vpherder/MainActivity.class index a5c058c..03f8ac5 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/MainActivity.class and b/source/bin/classes/me/caesar2011/vpherder/MainActivity.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/R$color.class b/source/bin/classes/me/caesar2011/vpherder/R$color.class index 8cf3ee9..9cbbd21 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/R$color.class and b/source/bin/classes/me/caesar2011/vpherder/R$color.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/R$dimen.class b/source/bin/classes/me/caesar2011/vpherder/R$dimen.class index 1522d03..4968d6e 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/R$dimen.class and b/source/bin/classes/me/caesar2011/vpherder/R$dimen.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/R$drawable.class b/source/bin/classes/me/caesar2011/vpherder/R$drawable.class index b380481..11cd409 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/R$drawable.class and b/source/bin/classes/me/caesar2011/vpherder/R$drawable.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/R$id.class b/source/bin/classes/me/caesar2011/vpherder/R$id.class index 9707764..7582d8b 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/R$id.class and b/source/bin/classes/me/caesar2011/vpherder/R$id.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/R$layout.class b/source/bin/classes/me/caesar2011/vpherder/R$layout.class index 1dbd815..235c711 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/R$layout.class and b/source/bin/classes/me/caesar2011/vpherder/R$layout.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/R$menu.class b/source/bin/classes/me/caesar2011/vpherder/R$menu.class deleted file mode 100644 index e99514f..0000000 Binary files a/source/bin/classes/me/caesar2011/vpherder/R$menu.class and /dev/null differ diff --git a/source/bin/classes/me/caesar2011/vpherder/R$string.class b/source/bin/classes/me/caesar2011/vpherder/R$string.class index 455fa8d..e42de36 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/R$string.class and b/source/bin/classes/me/caesar2011/vpherder/R$string.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/R$style.class b/source/bin/classes/me/caesar2011/vpherder/R$style.class index 890bad9..1fa8510 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/R$style.class and b/source/bin/classes/me/caesar2011/vpherder/R$style.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/R.class b/source/bin/classes/me/caesar2011/vpherder/R.class index f2e1078..a3e93de 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/R.class and b/source/bin/classes/me/caesar2011/vpherder/R.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$AnnounceType.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$AnnounceType.class index c2cc01f..d39b40c 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$AnnounceType.class and b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$AnnounceType.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolder.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolder.class index 011ece9..9ff2f80 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolder.class and b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolder.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolderALTERATION.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolderALTERATION.class index c55d2a0..d457fb5 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolderALTERATION.class and b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolderALTERATION.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolderREMARK.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolderREMARK.class index bac51f9..f7343f5 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolderREMARK.class and b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter$ViewHolderREMARK.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter.class index f267e77..12aa9f0 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter.class and b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSCreate.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSCreate.class index c992ef4..d107fd2 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSCreate.class and b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSCreate.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.class index a98c5e8..60e1553 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.class and b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementRemark.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementRemark.class index b22f49d..7a6c00d 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementRemark.class and b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementRemark.class differ diff --git a/source/bin/classes/me/caesar2011/vpherder/views/PullToRefreshListView$HeaderViewHolder.class b/source/bin/classes/me/caesar2011/vpherder/views/PullToRefreshListView$HeaderViewHolder.class index 5cc5381..0268da3 100644 Binary files a/source/bin/classes/me/caesar2011/vpherder/views/PullToRefreshListView$HeaderViewHolder.class and b/source/bin/classes/me/caesar2011/vpherder/views/PullToRefreshListView$HeaderViewHolder.class differ diff --git a/source/gen/me/caesar2011/vpherder/R.java b/source/gen/me/caesar2011/vpherder/R.java index 26ce69e..d4b3f54 100644 --- a/source/gen/me/caesar2011/vpherder/R.java +++ b/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=0x7f090008; - public static final int changes=0x7f090007; - public static final int listview=0x7f090003; - public static final int main=0x7f090005; - public static final int pager=0x7f090000; - public static final int pager_title_strip=0x7f090001; - public static final int remark=0x7f09000e; - public static final int section_label=0x7f090002; - public static final int subject=0x7f090009; - public static final int subject_subinfo=0x7f09000a; - public static final int teacher=0x7f090006; - public static final int text=0x7f090004; - public static final int textview_from=0x7f09000b; - public static final int textview_to=0x7f09000d; - public static final int to_arrow=0x7f09000c; + public static final int box_subject=0x7f080008; + public static final int cancelbar=0x7f08000f; + public static final int changes=0x7f080007; + public static final int listview=0x7f080003; + public static final int main=0x7f080005; + public static final int pager=0x7f080000; + public static final int pager_title_strip=0x7f080001; + public static final int remark=0x7f08000e; + public static final int section_label=0x7f080002; + public static final int subject=0x7f080009; + public static final int subject_subinfo=0x7f08000a; + public static final int teacher=0x7f080006; + public static final int text=0x7f080004; + public static final int textview_from=0x7f08000b; + public static final int textview_to=0x7f08000d; + 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; diff --git a/source/res/layout/teacher_substitution_row_alteration.xml b/source/res/layout/teacher_substitution_row_alteration.xml index 5191c44..20e69ff 100644 --- a/source/res/layout/teacher_substitution_row_alteration.xml +++ b/source/res/layout/teacher_substitution_row_alteration.xml @@ -91,4 +91,20 @@ style="@android:style/TextAppearance.Medium" android:textStyle="italic" android:padding="6sp" /> + + + \ No newline at end of file diff --git a/source/res/menu/main.xml b/source/res/menu/main.xml deleted file mode 100644 index c002028..0000000 --- a/source/res/menu/main.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/source/res/values/colors.xml b/source/res/values/colors.xml index 2cb856e..f0bf918 100644 --- a/source/res/values/colors.xml +++ b/source/res/values/colors.xml @@ -4,4 +4,5 @@ #000 #888 #fff + #f00 diff --git a/source/src/me/caesar2011/vpherder/teachersubstitution/TSAdapter.java b/source/src/me/caesar2011/vpherder/teachersubstitution/TSAdapter.java index 1310780..9d0cabb 100644 --- a/source/src/me/caesar2011/vpherder/teachersubstitution/TSAdapter.java +++ b/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 { public TextView changes_from; public TextView changes_to; public TextView remark; + public View cancelbar; + public RelativeLayout changes; } } diff --git a/source/src/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.java b/source/src/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.java index 145b538..50a0806 100644 --- a/source/src/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.java +++ b/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; }