From 04b1c999976db662551520d483b9382b463d0f13 Mon Sep 17 00:00:00 2001 From: Carl Antoine Date: Fri, 10 Jan 2020 15:47:47 -0500 Subject: [PATCH] Added map icon for workshops and schedule activity --- ...zontalSectionCard_RecyclerViewAdapter.java | 19 +++++++++++------ .../knighthacksandroid/Schedule.java | 2 +- .../knighthacksandroid/Workshops.java | 2 +- .../res/layout/activity_splash_screen.xml | 3 +-- .../res/layout/horizontal_section_card.xml | 20 +++++++++++++++++- .../res/mipmap-hdpi/map_icon_foreground.png | Bin 0 -> 2627 bytes .../res/mipmap-mdpi/map_icon_foreground.png | Bin 0 -> 1594 bytes .../res/mipmap-xhdpi/map_icon_foreground.png | Bin 0 -> 3757 bytes .../res/mipmap-xxhdpi/map_icon_foreground.png | Bin 0 -> 6851 bytes .../mipmap-xxxhdpi/map_icon_foreground.png | Bin 0 -> 10298 bytes 10 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/mipmap-hdpi/map_icon_foreground.png create mode 100644 app/src/main/res/mipmap-mdpi/map_icon_foreground.png create mode 100644 app/src/main/res/mipmap-xhdpi/map_icon_foreground.png create mode 100644 app/src/main/res/mipmap-xxhdpi/map_icon_foreground.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/map_icon_foreground.png diff --git a/app/src/main/java/org/httpsknighthacks/knighthacksandroid/HorizontalSectionCard_RecyclerViewAdapter.java b/app/src/main/java/org/httpsknighthacks/knighthacksandroid/HorizontalSectionCard_RecyclerViewAdapter.java index 5681ed7..246550a 100644 --- a/app/src/main/java/org/httpsknighthacks/knighthacksandroid/HorizontalSectionCard_RecyclerViewAdapter.java +++ b/app/src/main/java/org/httpsknighthacks/knighthacksandroid/HorizontalSectionCard_RecyclerViewAdapter.java @@ -180,20 +180,21 @@ private void setContentViewHolderAtPosition(final ContentViewHolder holder, int } if (!this.tag.equals(Sponsors.TAG)) { + if (numOfViewType < mCardMapEventList.size()) + Glide.with(mContext) + .asDrawable() + .load(R.mipmap.map_icon_foreground) + .into(holder.mCardMapIcon); + holder.mCardView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { int position = holder.getAdapterPosition(); - - if (position < mCardMapEventList.size()) { + if (position < mCardMapEventList.size()) Glide.with(mContext) .asBitmap() .load(reference.child(mCardMapEventList.get(position))) .into(holder.mCardMapEvent); - } else { - Toast.makeText(mContext, "No Map at the current moment.", Toast.LENGTH_SHORT).show(); - return; - } holder.showPopUpMapImage(); } @@ -210,6 +211,7 @@ public class ContentViewHolder extends RecyclerView.ViewHolder { CardView mCardView; ImageView mCardImage; ImageView mCardMapEvent; + ImageView mCardMapIcon; TextView mCardTitle; TextView mCardSideSubtitle; TextView mCardSubtitle; @@ -233,6 +235,11 @@ public ContentViewHolder(final View itemView) { this.mCardMapEvent = dialog.findViewById(R.id.mapImage); } + if (tag.equals(Workshops.TAG)) + this.mCardMapIcon = itemView.findViewById(R.id.horizontal_section_card_workshop_map_icon); + else if (tag.equals(Schedule.TAG)) + this.mCardMapIcon = itemView.findViewById(R.id.horizontal_section_card_schedule_map_icon); + this.mCardView = itemView.findViewById(R.id.horizontal_section_card_view); this.mCardImage = itemView.findViewById(R.id.horizontal_section_card_image); this.mCardTitle = itemView.findViewById(R.id.horizontal_section_card_title); diff --git a/app/src/main/java/org/httpsknighthacks/knighthacksandroid/Schedule.java b/app/src/main/java/org/httpsknighthacks/knighthacksandroid/Schedule.java index c1448b3..c8217ef 100644 --- a/app/src/main/java/org/httpsknighthacks/knighthacksandroid/Schedule.java +++ b/app/src/main/java/org/httpsknighthacks/knighthacksandroid/Schedule.java @@ -27,7 +27,7 @@ public class Schedule extends AppCompatActivity { private static final String ALLFILTER = "All"; private static final String FILTERTYPE = "event"; - private static final String TAG = Schedule.class.getSimpleName(); + public static final String TAG = Schedule.class.getSimpleName(); private ArrayList mViewTypeList; private ArrayList mSubSectionTitleList; diff --git a/app/src/main/java/org/httpsknighthacks/knighthacksandroid/Workshops.java b/app/src/main/java/org/httpsknighthacks/knighthacksandroid/Workshops.java index 22cdf94..9f4bf20 100644 --- a/app/src/main/java/org/httpsknighthacks/knighthacksandroid/Workshops.java +++ b/app/src/main/java/org/httpsknighthacks/knighthacksandroid/Workshops.java @@ -30,7 +30,7 @@ public class Workshops extends AppCompatActivity { private static final String ALLFILTER = "All"; private static final String FILTERTYPE = "workshop"; - private static final String TAG = Workshops.class.getSimpleName(); + public static final String TAG = Workshops.class.getSimpleName(); private ArrayList mViewTypeList; private ArrayList mSubSectionTitleList; diff --git a/app/src/main/res/layout/activity_splash_screen.xml b/app/src/main/res/layout/activity_splash_screen.xml index 40a443f..5a9d37c 100644 --- a/app/src/main/res/layout/activity_splash_screen.xml +++ b/app/src/main/res/layout/activity_splash_screen.xml @@ -17,7 +17,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:lottie_rawRes="@raw/lightblue_loadingscreen" - android:scaleX="1.5" - android:scaleY="1.5"/> + android:scaleType="centerCrop"/> diff --git a/app/src/main/res/layout/horizontal_section_card.xml b/app/src/main/res/layout/horizontal_section_card.xml index de7c1c4..2503cdb 100644 --- a/app/src/main/res/layout/horizontal_section_card.xml +++ b/app/src/main/res/layout/horizontal_section_card.xml @@ -1,6 +1,7 @@ @@ -27,7 +28,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" /> + android:layout_centerHorizontal="true"/> + + + + diff --git a/app/src/main/res/mipmap-hdpi/map_icon_foreground.png b/app/src/main/res/mipmap-hdpi/map_icon_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..f49b010071b89c59d8a8383520090f1009ebb83c GIT binary patch literal 2627 zcmd^>>01(58^+DlEH^CENph>nB~vra6bjdJU@UXrLY*8lBk>hATtLH>7WV~5G6&q6 za?Kq@EltC6-_k_Pl`wI%P(YNIc|Xp-@Ltz*o^#HZ^W5k6oawJj`tUL$_WrJ5Zw}Z^p|g?Ep^T61d;8gbg{W^GyrG~tVYsgk&>A4|uQ1N&F6d9l zR-vA47_k=zhDu|0)B{pf#x8`P$lJah<`2EQ&~cAQWCl%U7@26tu-osY3=U?MBy<%S zst7l`TCQh1{_3v16p-EQ1th@A-mD_JaTWVawz|cepPHR#w);q78IJeD2Q2ep-8zjC zr+;ub8oxPUQsRY`t^F+)mn#%_>u$NTg4y#*sz|GeD5WPXZ@qUjgwtw&WgEWQx5 z#?NeTlQ{-cy@)Ayc^N8GZgkz(K*hp5;Pl65LRl>O33YqXfJ^8dLIkTf$^@W2jfvasLB~~Oo_c^_|z6%u02WgNY zSZDqaL1EW``o-(vCENW*z896dKH6fxqUImEF@R}@Kd(ba$R}^-*<4=%n6<*jb8?kg|UJTjB zPype55lXq*qMD!T1^j`nk$G%eGX*dGgMHO;sH;xA#g>rub8}E7e?YE>Rayf2l*S&> zDCh=KP3%n~=#<%W3cGIBBL+lIJ+{^l+BKIhidZ}`oOxtwabk#=5jp$ArT=tQLoAtJ3F+9qR#nLO@9X`DE{VjAps`W>@mw*68nEh-36i02iFOaYUAdE>pjfokLmC=?qn2KKvAc&uQBjeliGq z0O_AUc>63s$39`JQ1*G!fdxzg*P(2-X}Ew?&*6GF>-FKJdm8)*=7Y-g)|i{_kk6CR zNk{Qs3FbUq52#9#8>hrl1WRRcq77ZzL2yV@ToG?2aSDKww)_8G5(y(U;+8DaI}wTiTtPC%^JcZe z9@C)rzK@7XIRj3NA_{mD!x>;cpPwPZIyM+av-Gj-pcQc2=jN*H4=Un=SAA)Uh>|tQ zWndeHpK;(6p#C9Bw-yP%8S!DXI@ju1CqQQg?McB2Z^YA(SD(@^-F*AtA7x( zd|uR#_1QB#9h#$rBs#{vueV#&^>Ls#Du+W~?#(5b#XzO;Rv7oZ3#M!|DH8EkWwCG)v^by{jm~%`)`M~D|11%>(*q>L<3|)&-r)nrJy_J{&U-mQri0SpXy9>P zP^Y83#ZoyqX9)Z1V^<>UK|q`q#Pb|QWxV-*rV)PkRjRUp3!*|VPxWh+2z*#p#*3rjcEhS*y9W_?S4YJBbm z7_ATa`Usi14ez+;#^d%@F@sbVe80YC*F2zpnb+goDnSl>Jq-M-)Pn^n+Qc zO4qALOTvqaPTLO*s0VFpLXLi7@@Mo4V6lreEu+=CwrddmPQ>|C_-z*oTu*#&hREc` zBH6ZPT9D&>wsI>sZvZo8*Owdf_8O%SaWr@F`%jF58~c@!8Zrso!0_m<(+EJH#2j{p zqiWLLqUT6AB~>)0odEgVsVknUzWY3aLCI}!(nb?vo`Vf0(6NQGVeK;tpz^_-briVI8mQiw- zv_qv9E*Hhu~RQ@P~~dGBt zX)W+Bq7Ee*r~8l&0V~Y6<3ulk{tkDhRh7Fk|Ammshdb+Ca79Cub%mI?}G z+?~uEPLve+qp>YNwM%!R-n8bCT~#5pnNRg|!>U&d?1;zy?YgW1At6G^CU3&Z$!Q#2 QWDdokS8v!=+xRE^7XaGj@Bjb+ literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/map_icon_foreground.png b/app/src/main/res/mipmap-mdpi/map_icon_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..1ce9b368e23aa40ef17282e24287ba480dc77e08 GIT binary patch literal 1594 zcmc(g`#Tc~7{@m=W^>D^+(quUl@p3ZE-{s|=04_}T5=h29JVA@#&L^GrkutcmuGG{ zLYQgD2%Salv(2SQwJehJP&zvQ#Ce|Y`+lGIc|JeB&-a^k!P`RtssRN6017BiH}sxI z{}_nO-p;?`{{jGz0ixVaVTiNhhY?q?zN!Q8;H|vciT0wP*6Gf9DX)GdnP*;1g)7T~ zWL)*>cl#@|eT(+n$?M-*Gybd)NGTY?YL;p>M==Hj%1v_zf2$2&~z}KG&2I6=qL6Nnp)wV zy4N9{F3hq!zeScy0dKRl3TE@5cJ2l7Bn+K5v{MANZUFO2ZEC(>6~P+qX00d$*7{5X zk~J;o$^DF_lzvZmeTt%|HU@fWh2swdkM;DcoUS!}jZ#(5)fl>|OB#c;$*f`I3n$rA z8rqJTe?ssVX?d4XE4p# zD}?kFOH|EM2Oi~^dO^%*Bujp2`%v9M98aCy3RjCGFq4cc+ zH2YN{wA6KmaBbgYRX8HU65sTvfnt&qFi?PXzJ9JwLW8=Py(JwKT_*}baXnEH&*?uq zvXrN`yK)!0Z*YpX7cN&t+vu^gtOXzSDqT(hh*1lqEj&6g(o}Nzjcq6qZnVlbOz-+9 z?Rl@IB=2R$rBTElV_(<2&>&&~18eB3q^>v;Yib?SVR39UPX)h0K z7(^aKB4$LG_(@oOs@-g;y(W*1#=plea&{Ad0o@dxM^DL;mfIXf*|vdWVSQCh=9U}o zs4t%8nreU;AS=+$Rwox;ZVH-7`ZObw8;J|+bN`!KF_MS}Q^8W2!QhIupExWKeJc)Q zVuYaW@srDqukdAR+A505B}<%)9E|N{1NjhHfk)UKki&>K6^X0eMhlV<(JIrPH9heV zvrI<&t{uLy6CN;^nZLeq8(OxyFJN>b{_Tpq^y#qwP5W7qYBvi}{MCEW&ga7V>%Ik z+B34swoc*rtb6 zx3W80Ti+9>(oi{`Qkp>eXrk$4R|llj<2Y~xR(4Ihq$RC+8n^f5J68_!gxP^#LW`Ua zAHRcJAU%38w3&C(grK)UVw-c?P=EO|B@b@2_Ax?>7o-|`l_IA%l$>|Uc@K&n`X;Db zku?pp!$h>i?lCHo^r_HNk15Hc0_A%T;>gDNO@#CN> z3qv(UWXQ@RG0&8QVv`$~SnD&+P(P(ReLU~1Z&$D8a$YZg_8g>^ z`mLl@qC-|V8y{u6Hsy#yVb3#2R6Y6|m3opOxENiWS>kBE>dO7ajVX*!DF&&hc`zwT21usICYD?vr+gKlPYE8~h+yaq?k zA&ea0@bx1^q0w{~IIC}%3kx?cwZDhhS$@I4h7IOt7`*4+|6RN^8uKH0_X60fb;zl* XgPzpP_xQTk2>_J4w_Br2*sXs79ChGP literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/map_icon_foreground.png b/app/src/main/res/mipmap-xhdpi/map_icon_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..a5b850a9ef745a5837d77e37de7ca5f911991716 GIT binary patch literal 3757 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/map_icon_foreground.png b/app/src/main/res/mipmap-xxxhdpi/map_icon_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..e9fc6198756e455fc22da7cdb3ad39163d3bf647 GIT binary patch literal 10298 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 P_|ewTzgK$K_WAz;5ezAF literal 0 HcmV?d00001