From 14d8abc9e83abb8f917102abcb78a1931e05b060 Mon Sep 17 00:00:00 2001 From: Caesar2011 Date: Fri, 24 Jan 2014 18:53:31 +0100 Subject: [PATCH] Teacher substitution layout completed --- .../MainActivity$SectionFragment.class | Bin 1841 -> 1841 bytes .../me/caesar2011/vpherder/MainActivity.class | Bin 1312 -> 1312 bytes .../me/caesar2011/vpherder/R$color.class | Bin 509 -> 542 bytes .../me/caesar2011/vpherder/R$dimen.class | Bin 473 -> 473 bytes .../me/caesar2011/vpherder/R$drawable.class | Bin 419 -> 419 bytes .../classes/me/caesar2011/vpherder/R$id.class | Bin 901 -> 895 bytes .../me/caesar2011/vpherder/R$layout.class | Bin 722 -> 722 bytes .../me/caesar2011/vpherder/R$menu.class | Bin 400 -> 0 bytes .../me/caesar2011/vpherder/R$string.class | Bin 770 -> 770 bytes .../me/caesar2011/vpherder/R$style.class | Bin 600 -> 600 bytes .../classes/me/caesar2011/vpherder/R.class | Bin 765 -> 715 bytes .../TSAdapter$AnnounceType.class | Bin 581 -> 581 bytes .../TSAdapter$ViewHolder.class | Bin 462 -> 462 bytes .../TSAdapter$ViewHolderALTERATION.class | Bin 711 -> 805 bytes .../TSAdapter$ViewHolderREMARK.class | Bin 591 -> 591 bytes .../teachersubstitution/TSAdapter.class | Bin 3453 -> 3453 bytes .../teachersubstitution/TSCreate.class | Bin 3690 -> 3690 bytes .../TSjsonAnnouncementAlteration.class | Bin 4395 -> 4651 bytes .../TSjsonAnnouncementRemark.class | Bin 1783 -> 1783 bytes ...llToRefreshListView$HeaderViewHolder.class | Bin 1341 -> 1341 bytes source/gen/me/caesar2011/vpherder/R.java | 36 +++++++++--------- .../teacher_substitution_row_alteration.xml | 16 ++++++++ source/res/menu/main.xml | 9 ----- source/res/values/colors.xml | 1 + .../teachersubstitution/TSAdapter.java | 3 ++ .../TSjsonAnnouncementAlteration.java | 16 ++++++++ 26 files changed, 53 insertions(+), 28 deletions(-) delete mode 100644 source/bin/classes/me/caesar2011/vpherder/R$menu.class delete mode 100644 source/res/menu/main.xml diff --git a/source/bin/classes/me/caesar2011/vpherder/MainActivity$SectionFragment.class b/source/bin/classes/me/caesar2011/vpherder/MainActivity$SectionFragment.class index ad980349b44db2a0881593034eca2834e911d3b7..2a85b09ea18029a4e50696a36dc25177760b90f0 100644 GIT binary patch delta 14 VcmdnUw~=o{KQkl8<_XLTnE@u71hfDE delta 14 VcmdnUw~=o{KQkle<_XLTnE@uD1hoJF diff --git a/source/bin/classes/me/caesar2011/vpherder/MainActivity.class b/source/bin/classes/me/caesar2011/vpherder/MainActivity.class index a5c058c227024af066ae2bd62e3ac4248f850454..03f8ac57b3ebf35889f8b196d1c729b647c364cc 100644 GIT binary patch delta 14 VcmZ3$wSa5GS|&!0&Fh$om;fc61e5>( delta 14 VcmZ3$wSa5GS|&!$&Fh$om;fcC1eE{) diff --git a/source/bin/classes/me/caesar2011/vpherder/R$color.class b/source/bin/classes/me/caesar2011/vpherder/R$color.class index 8cf3ee9fac77f52231f242cee03460c5b2194eb8..9cbbd21f44c5178b7ddffa395e5d0e166fb9ef45 100644 GIT binary patch delta 183 zcmey%JdcIz)W2Q(7#J9g7!)RQ#qx6|C*~!m=H#TNFxRs%uuM!1W)tOM5M&UVxUYgm zj*&rPqJV@DBLi!4eolT7gCPSW12a%F>*N$h#|%jZeg-z62s==Oi9rC!Vg%^~lEOd{ zeJ~%WR%<(h$VRXdF(3)jz`(%EAPyvXz-(3q2?j~9ycC#}W{?5WTwv|84Dt+;0NW21 AZ2$lO delta 149 zcmbQo@|RiQ)W2Q(7#J9g806R)m>3!4CNnb1P1LiTSP{r3%)`LXATaTK1&a(Lg9K1Q zVsbL0AS27w1ela$kOI{VIL7# diff --git a/source/bin/classes/me/caesar2011/vpherder/R$dimen.class b/source/bin/classes/me/caesar2011/vpherder/R$dimen.class index 1522d035674df5b1a141dea882e86b8ea2aa045d..4968d6e999e7d3be83a92664be7961057af3176d 100644 GIT binary patch delta 13 Ucmcb~e3N;@8b(Hu$!i&P03|5|m;e9( delta 13 Ucmcb~e3N;@8b(Ip$!i&P03{>@mjD0& diff --git a/source/bin/classes/me/caesar2011/vpherder/R$drawable.class b/source/bin/classes/me/caesar2011/vpherder/R$drawable.class index b3804810f297dad35b2c1dff2889c544ff6738fb..11cd409f84ff39f95203bdc96db67466e8b6bef4 100644 GIT binary patch delta 13 UcmZ3?yqI}I86%_I ze%s$`^Ig9!&s`r+CLj78TS34T!gLu!77DT^f8greLW^*1DOmPBB?Y$#jonh%aMsu$ zwBBVoI)2eyA&drcLFX~TcuyO?>;b~;5{x+UY_i-Zx7QjX)QJa5&zf$EMJ_@v2IHw` zukflo{Sz(m9q%4mm=q>VcKdt3E{}yzqV-X^p|eVvrxXW;9YXgHB`TU0d5MNniYouP M!!N}7$78kl0qXBel>h($ delta 276 zcmYk1F>b;@5JhKVurY`@6{12MAh$>xDFp|x*3MuS?A>U066jLVgE$BU_sSKL87qp? z&HwxL{@?HPn4O*;3RAQ7u8hQNT@%kQv*#QNgh}NOWqhx;RCDr~!w4a(H^wy-Rb~jI z)<*uYv{#)V3_4?--a~}pn`tPBIA7=DAVM0bGhwIi_XyJ{SnX|1MXj25!v9y7BNV?< zS6H|9ni@-r$<&)34ym*<9r}R-q3W%R%60Ia<|p!z#h=SPV=B|xmnH@$;+5@03`$jp#T5? delta 13 Ucmcb_dWm(zQYJ>D$;+5@03`nepa1{> 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 e99514f7d4d11f3a603bf0dcfe1cf03eb13d21eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmaJ-yH3ME5S)#jI2eb7@Jb3qLje?+qz$5pgcK(M# zp`% Z!Jy8Y=wZL^_iH@Bp@~+8aD)>Ke*j)nQhERY diff --git a/source/bin/classes/me/caesar2011/vpherder/R$string.class b/source/bin/classes/me/caesar2011/vpherder/R$string.class index 455fa8da6c262e8af7bc171fed21144c2a2738bf..e42de36a0ce0a84e2eb8c35c5de0e402ed8a2ebc 100644 GIT binary patch delta 13 UcmZo-Yhv4Qm5I@2@--$M03X)`YybcN delta 13 UcmZo-Yhv4Qm5I@A@--$M03YE5ZU6uP diff --git a/source/bin/classes/me/caesar2011/vpherder/R$style.class b/source/bin/classes/me/caesar2011/vpherder/R$style.class index 890bad90742347449973d795d88e096d8ee24648..1fa8510f2862bdb02ac83a52afd9dee9fd32d85c 100644 GIT binary patch delta 13 Ucmcb?a)V`qHWQ=!WF00Q03f6T%K!iX delta 13 Ucmcb?a)V`qHWQ=gWF00Q03fad%>V!Z diff --git a/source/bin/classes/me/caesar2011/vpherder/R.class b/source/bin/classes/me/caesar2011/vpherder/R.class index f2e107894df3b16f57ae614d4f1e6dee2e31f2b1..a3e93de91cd85ac695fe3c6fa4e620c4b630b3bf 100644 GIT binary patch delta 42 ycmey%dYYB%)W2Q(7#J9g7&JF>U1VgGpC}+PS&m7FQGK!@QzNqz1IOg8Ob!4jEeq)Y delta 76 zcmX@j`j?gK)W2Q(7#J9g7<4vrU1XeiSxPWBHLsMBfdxddGpI8%$WIiInEZuNh((K$ cK@P-LVoGE7V&I(I&E&wrpvl08Ztx4DxXK^30U<)Dr!m)SSeU%(7IU#LE2A5};Z(o6Nk-5<5l)W)00S zMg|t={FGEK24)5k9tHshK}H6CpUk{eztY^K)S{5Yq?}a7$rg+=7-c74WK3b?m~6&m zoX5k!3v?VK10MrFm}UfN1oDM|JbfU|2&7rHwlfHC1TvTyM1dq5STKb_49MnzC}0q0 gkO0d|f=MX`X&@~GRL{&H!yw1N2~;J+AkV-F0A+JDZU6uP delta 160 zcmZ3=cAS;#)W2Q(7#J9g7-S}L{gq?0$;`_vv14Rl*3b-NWMFa5Pf6usU}g~DVc=ol zom|Ygno)AHJW~oI+vFA|<2Xi;C<7w{AJ7DSAk7G*S+%w^@NWb%m>2|sBpX;TnL!B1 m=7A_+5M~eo%Zq|ZF$QrUEd*50%pk!a#lQ(vCBY!gzzF~YoD-P< 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 bac51f953d2aee0810a369d03d62ca98306215a6..f7343f5456a33e3e4447c4d72611c895b1214dd3 100644 GIT binary patch delta 13 UcmX@la-L;_6cb~@WN9W703VhExBvhE delta 13 UcmX@la-L;_6cc0oWN9W703VS9w*UYD diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSAdapter.class index f267e77709e757d072eb8c3ae504c5299a22c406..12aa9f0432eb4a8594d9905e282e81f2cab9f112 100644 GIT binary patch delta 121 zcmew>^;c?x5|^M113QB_gAju(kd$LkVUV9}%$3imJb5vfGo!}j=Ugs~x|4OdgE@^E z_!vwW1Q^UFcX0bK+DyL6z0uHtftkUPfs4V3L6pInL5IPW!JNU3!HU5H$ns_gWAI^! XVen;$XYgalU^;c?x5|^Mf13QBlgAjuZgE)gMg9?M(WMi&;My1J%xttl*CqL(MVbqzd!yU|N z#K6a3%pkyEI=O?}htYcSRql<3_6*Dn4h&ojjtrsE)3=jt_)TT?m*IuA&kMB YA%?++A)djPA%h`+p@JcB@^+qM0HN&{jQ{`u diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSCreate.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSCreate.class index c992ef479cc7afb34d9c25af656f667c217dd853..d107fd269e046a2c58958541d386776cd1877f5d 100644 GIT binary patch delta 14 WcmaDQ^GasJN@hlm&8wIXZ~*`>Oa+_( delta 14 WcmaDQ^GasJN@hmR&8wIXZ~*`>QU#p= diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementAlteration.class index a98c5e800853fe90dd0b89828efaf0e6484f6bd2..60e1553f3d07174b3950fa507d3023a2229e3810 100644 GIT binary patch delta 979 zcmaKrSxi$=5Qe`~D(!6xRN@*n8udX7q#%g97~BxS1r3T(q_$P7NVOJ-kx=!;7!#wp zPx@kvCYTr#7bppCsJP+2;EMacCPtr(QRkNQ)in9f{4;ar{4;ZVXz-z-&h|eor-2cC zvtUw8*VkzodZyXDYlq`#ac^yvMjdAzBymnLu*g&83k3r{cWuD8!XI{*_$xi(K#jl1 zvmsa=9%rMCQx+~L2K+bCsCmi3Wv(bRucylEuUzH{>HF-x`rEi_l(?qo9xqW7@YlLa z1&;f)KFWMwktZVa^fR_#l9fc`MyG?PJkv|;F1HmeA!5a5fZc#31Ck9$F~Fj*dxKRq z{!rMcsW;p6&7T!HQZnawmZMnB9Y!~XlY)!Bq%nkaGUPW3H~C~TgDhr|&0KO=%t%&} zOHiWKjAj#K*e>=?#PpzE-C-%J~NDhAnyLB`0?`$wDs*ZEwI~m_}CnQQ4oF)q?d56wH?fCgWrZ z{g_G~)5TN3G?6}=LQ0rPd4wWXP|QZ@WfyZeDE*w3;8o^vm-%#3$_EzkorV0QjNdF$ z7M3U{<*F}BRevhfP`oM)pUTFsa#^nOWEPe3d_h;6tf5MnG|Y8wpy;N?ag$q^L{8x! zZet}uRQ=+PSZ2}ooe=9qdpTYaQ9~lNa^E3WyJGhwwn02Dw7=3uq6N{^p=Ub#L{fWL zx?3gj0S^UxOVVvAo*-xN1a)Q2JSt94OMM*WNh@2Ls2B1)PPPhp5hvS(yo{4$LSDs5 zlaSYO(jw%IkR~pQ^)?dow>8n4enj3h#g^g1CU&JXw}zfFi^1}pxLM11*2yYDGU4@9 y5SD0lY;J?P^v35V+3&a_-B@K)*JE=t@jh1l10Ur~m3KP$#1}NH{GmSa7408~u<-W) delta 707 zcmXw$OGs347{!0r8E3qA#z}?DXcLpY#xbSr1%)(4*~7{rGYiX{p`>)cY9x}hHW6)- zyKCDfl0eM|Od!+StgN)MhdozqqZUDsota@a=lh@k_x-^UyVp}-AM`|vOEyUQZWh|*-jMT)K}A}|efy@j+NfDfHcObrQsxq1 z0VR|YWHrkOQN~uv*(skjtl$t89A_m_R&hoXU991X&R1E>HO*XS9k*C-SNXau;}1^U zU|>)9es%hS1H=OZG!Jp1Pap2&gs`4M;RYE9k;g{nv587Hi)|5Bu}kuM*hT}}ImQmo zQBAjQZ?K!Y>OEC=lD$l`j~~?Xll}arju~w}sm)bs2ed?J6_pthdT2=SFZZ}lmZU~_ zKn@NG#(AidQv!XoaY|DSH1UWSF530ntC#8CWA)DJW)ayl^5Ak~xEZx`^NTty4UNf} z!5j_rYq3MM?hYLXhIv*UEGc+C#CU>>gPa$6ogtS*-ekySk+&JrFEW)OgCg%TBp&S5 z?yOXnep!cxu*zX(a|Az)`hQ3DPnr}}Sn)(sq0CPkq9vV);(E^q+09X?iBu+8d`zvK T=96lH1V;JHS4=uozhV9di|L*k diff --git a/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementRemark.class b/source/bin/classes/me/caesar2011/vpherder/teachersubstitution/TSjsonAnnouncementRemark.class index b22f49d54b061744580eff7d485624b02f75d6dc..7a6c00dbdd61ef016f879657299d95aa1a3b3624 100644 GIT binary patch delta 14 Vcmey)`<-`#6AL59W@nZyOaLk71h@bI delta 14 Vcmey)`<-`#6AL5fW@nZyOaLkD1i1hJ 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 5cc5381d1d0ae479f2c334fe5f165e38e3170f30..0268da3af4e682a97ef773a85cec3513c18e7314 100644 GIT binary patch delta 14 VcmdnXwU=u{0V5;F=0e6Z%m5}J1g!u7 delta 14 VcmdnXwU=u{0V5;l=0e6Z%m5}P1g-!8 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; }