From 7c8919cb79a2e4fd9f03ca8058ae000a60dc5537 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 10 Jul 2015 23:37:18 +0300 Subject: [PATCH] new album icon, various headline tweaks --- .../java/org/fox/ttrss/HeadlinesFragment.java | 16 +++--- .../main/res/drawable-hdpi/ic_image_album.png | Bin 0 -> 613 bytes .../res/drawable-xhdpi/ic_image_album.png | Bin 0 -> 829 bytes .../res/drawable-xxhdpi/ic_image_album.png | Bin 0 -> 1146 bytes .../res/drawable-xxxhdpi/ic_image_album.png | Bin 0 -> 1587 bytes .../main/res/drawable/flavor_video_play.xml | 15 ----- .../drawable/flavor_video_play_youtube.xml | 15 ----- .../src/main/res/layout/headlines_row.xml | 54 +++++++++--------- .../main/res/layout/headlines_row_unread.xml | 54 +++++++++--------- org.fox.ttrss/src/main/res/values/style.xml | 2 +- 10 files changed, 62 insertions(+), 94 deletions(-) create mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png create mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png create mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png create mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png delete mode 100644 org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml delete mode 100644 org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 8994b46d..0d4510e4 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -658,7 +658,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public TextView excerptView; public ImageView flavorImageView; public ImageView flavorVideoPlayView; - public TextView flavorImagePrompt; public TextView authorView; public TextView dateView; public CheckBox selectionBoxView; @@ -850,7 +849,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder.publishedView = (ImageView)v.findViewById(R.id.published); holder.excerptView = (TextView)v.findViewById(R.id.excerpt); holder.flavorImageView = (ImageView) v.findViewById(R.id.flavor_image); - holder.flavorImagePrompt = (TextView) v.findViewById(R.id.flavor_image_prompt); holder.flavorVideoPlayView = (ImageView) v.findViewById(R.id.flavor_video_play); holder.authorView = (TextView)v.findViewById(R.id.author); holder.dateView = (TextView) v.findViewById(R.id.date); @@ -1058,7 +1056,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder.flavorImageView.setVisibility(View.VISIBLE); holder.flavorImageView.setVisibility(View.GONE); holder.flavorVideoPlayView.setVisibility(View.GONE); - holder.flavorImagePrompt.setVisibility(View.GONE); boolean videoFound = false; @@ -1113,7 +1110,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, videoFound = true; - holder.flavorVideoPlayView.setImageResource(R.drawable.flavor_video_play); + holder.flavorVideoPlayView.setImageResource(R.drawable.ic_play_circle); ViewCompat.setTransitionName(holder.flavorImageView, "TRANSITION:ARTICLE_VIDEO_PLAYER"); @@ -1156,7 +1153,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, videoFound = true; - holder.flavorVideoPlayView.setImageResource(R.drawable.flavor_video_play_youtube); + holder.flavorVideoPlayView.setImageResource(R.drawable.ic_youtube_play); if (!thumbUri.equals(holder.flavorImageView.getTag())) { ImageAware imageAware = new ImageViewAware(holder.flavorImageView, false); @@ -1267,7 +1264,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder.flavorImageView.setVisibility(View.VISIBLE); if (article.flavorImageCount > 1) { - holder.flavorImagePrompt.setVisibility(View.VISIBLE); + holder.flavorVideoPlayView.setVisibility(View.VISIBLE); + holder.flavorVideoPlayView.setImageResource(R.drawable.ic_image_album); } maybeRepositionFlavorImage(view, bitmap); @@ -1294,7 +1292,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder.flavorImageView.setVisibility(View.VISIBLE); if (article.flavorImageCount > 1) { - holder.flavorImagePrompt.setVisibility(View.VISIBLE); + holder.flavorVideoPlayView.setVisibility(View.VISIBLE); + holder.flavorVideoPlayView.setImageResource(R.drawable.ic_image_album); } } @@ -1395,10 +1394,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, lp.addRule(RelativeLayout.BELOW, R.id.headline_header); + } else { lp.addRule(RelativeLayout.BELOW, 0); - lp.topMargin = 0; - //lp.removeRule(RelativeLayout.BELOW); } view.setLayoutParams(lp); diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png new file mode 100644 index 0000000000000000000000000000000000000000..9bbc5bd101293b5ae4e5403471c1b8fb624c279e GIT binary patch literal 613 zcmV-r0-F7aP)6o#KygbfOou}D(*9|VcuAMh7M5Yhzu7>PDQ&_)HZNEsUuBy~a> zG40x<5d>2N69ffA2)M*=@L0?(WN>zFW_P_idSBRL?woVa`^?OpIkN*%Q4d@42{N-@ z;59G^bhX&i2~Y)=Bpo&kU}lejk3dh0ji*%uUP$^~FQ~&~qVWLcaW%*Df_wm;2Qcql zyVGNm?wcEu`h6;!*|#PDbms;5oPoAh1PHAN5Lyu+v?4%gMS##MJ%CR$mnk!Q0=#jX zi<0(B0bpho;HCRj-0*;ztpF>M&f6Bi%!Wvg`qR{|3NQu?o7v)B0rU(^1*Rlj)|*7qXBt=!MO%pjU{q2qBS*k9Nqasf%K-wWjBLF|&;nf@;?FCccKEtU_!aX^2$wS53K z0|MmMzW*Qj+yo=Q2FWMTR_nyo8p$&s6%_^7cA(}A=D7{B`bBY}Z|>4c|?V@SoVx3dkiMI0sC=7+Z&cG@7~(>1|s zgSqb|4yAu=ucw$Psxju82$)(nC#gns^m1{ziEv(Ya}3nU5jhfL;>g0y>C&TgCw-%^ z#gl7qR5s7F&71e?#_ZdF?>+yvZ?0^f;zSRXT@txZozu4QTX4y+d~-Rsfo~7{Gu5@z z^bVZqV_4p}cVhGZ(^3YSFFiAv&g3xcV0zOv*Q{NwAn4NRMe-UlN6xVHgjoD>nIb>+sU;_ULo2-wrKXR z#>Z)4)4%AH-6&(RWInSdE$#4uxzj#Ke_`01R(6temB?*7<}*1H-bBB@nesxQ;KrG} z2OHDED;W>0IetURK*qX6`=yq^?uHvGj2pQ-d_`F$4ESnZg)v@N)n!ONus%=t1Je#R zg-pR2?@AcwH@Y3%7~g0-X_mCK%3XH3(p3$m2~%>W?bvnlhW&wvbM-aL8kYKr6!--> zU*a-&==97`_hsyEbCtD|O^*isa*Slk^PH8>`B7@dNl9zK--eKgEYgjX$-uOgz9@qQzxXXWzWJReT&jbnCG{W<5>bIv>bPFxwgKHUGrwu7&p zD?;t{kN6tC2frLI{B-nS3|HN&De#EB!0FQGwK6V2%sT>18T}h)%PH37Jx`b2k{f(p3 z0$2ApOue!4)QYR_2b5IrO=V3vc~vT`VfUG(}8pX7+2iB`GtXjh1Ju=F{I+w+qwSzBB3Jg=le6%esP*?y0kvw zNN){;*^vYD?(Q&gC{a1MV{#+oL0L|fHeOB^0TqesItdJmwF3+rI=glRu^qmD;kxTy zPG4hV+q>`2?l!&qU1hRQdFbA%@AKCEepMP??kK!_ikO^qK2K$O`Cj9P z9%XM-S@t}e%j&)nOBsg}odCWq<9qS^}R#;7>s8d zZ1#L$@ptn5vsDjv%=BG0$+T$A55WmuC(CAqe>FHWeJO9+w)IJQt0w%_Jvl9Qef-=z z@9mG+pu4@Nxj}xf^#+l}dI@4b7=E1Ft=w&Ris>DLwQ6a@`NsQuthWd()_TDCVdIi| zMwPqlWeog#t*@P4!8K!I$=ctXp8J`qfqd`VEO%J{oy>W>W=Sx&?t~JlAJ?o;|gdyKl1tI3IkW~W6j$*b}-1y ztDoR?^djRn^9RPB^*ZUPp5_gb?-wkTWy-reM=$F9XZD8f(>af|J)g7RT)D(}OM=Y@ zu@4+SJTAq&Zz}n>ule8CDlrR-C;!SBx7!Fm&`sFBBwj39K}4+I~`^t}Hi+Vj$Tljdia=ed5KymrmyYbJ7UK6*7xZtCl{w&TJ z^K*DhcfD}f`qPn@u|LyK{Q0KnRW4eEp~sq~n3k#jjY+h3^?ZErOV@k#?TtIkOxE$n zUWKGZRhB#7`3_BdbHkfs$766x)>llpX3gD~ay-uIfaEOmo5y%@@zjt}GMYzL~d4fdh;pX8mW>y7Fpsmt0#o Quw-EHboFyt=akR{032xa)Bpeg literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png new file mode 100644 index 0000000000000000000000000000000000000000..a48a95cda0c9f3c35f98ba91e7dc92de6c05d8eb GIT binary patch literal 1587 zcmcJP`#Y2g6vy9p-Z7(@MH@9DQZ6YYw@^sy7Oz@KF6lB&NFfH}7RgMsO46i@+aMYl z(dUnneAK3Fe-}5=&^V50G^PF?e+sj=Ar-cIm zKn3=2^-+-aRmvDe{>}05O9e1NJKS9rRK#bOhBO71M0*5M74-O~?QIc`Uz-WhPDd4_ zeUtgHMIitvHNmb@(YGK=0}Ca_97;=W6S9Gq@9-anq6QD`9mi35gvBUood95ysxXiNn2_Sgx*!% zt5ySEn`-2pYfxpPRd?782Ha>wBYc0TpFTI&$K@A;2_A*21Ku(q|1E?>i8!5+7Ya;} z6>z1C&9Y5EXo8wdHQN1oLW_VXyU(ifRzc%w1p}(9Q2uAaZ!9Iy+zkeld7lhH`$gj> zc>^~qoS3d0i#D${L@dZ|>>R>-OBt8d{E!sG)<+s=I;35=TNaW7Y+z=DG<`Zdj135N zqV+tNhwP-_yWiUM&iA7x4|C>dt;yjg8G3T#GE`?i%WU>oE5Do)k>yOnJp3UEz>R{& zOzib&UD}fq|DQRs9I)CS9;)4byo;}!HBcJEXz#t*ZGY0Lr4(vwT)=@rO!WEbAW!xEUxVY2#oKd&b8 z3dicqcdxcS0KvtmsF?ed7rXGL1~KSk-%Ay@Z7BYpfyA)reVak%g~r?KvvdLSA+^Yw ziX#1&0{ESV=-o#^qXY8ZtoGBe18_$EA0vrd6gCMQfc6E913Z~O%^L=fy*J|eb-`rH zct>0t)XCR{kAeoNu9JI(JP~-mUO(57DR0Q5mj)-+;B{%wilKz|g$h=nXl2WFT^T?; zjuEW=(03AVSPV@)o%n+ttA@1CRz_eR8HXkF2=Ht^UrZN5=HMd@a--DK?zOBwuov2b z6|q?^xj6vV?tl~)Np6~P#Pmp{{-zX$IpF49lXJDDF=+^FneR@IYT%94lJZDRxj zp=_fgi=WR|CkpULx3XAg=hVCfzet=cIyU||%;X-R$vxO*MkRO@f+d(=`shdoOS*l0 zXrri-t>5hv1q#eQ%sAr>7d+!r2d7?qo#95p#@1xLN`Q$PeAIK^pcq4n@^s!b5ebds6EJIAUG;(Eged&8w{H_&K;2s=|t>Fg7!lntDX0Asc17RnqP` zCz86Rk%>-8_Sz9(=j+FtD5*!dSJS=}SNm;!?KD@)h~CNw2UaW?a7^J!w&MfsuscW5 z_Vm>$QMH#eATpA}IbS>L`zeD(nH#)*MNHR#WKAqHmzpFQ<)DSfEFCSTccY@UlJpbS zIai74uY#t3Z}!07x|$x;xyu^+=iWjW0X#FqOywQTYQnlLS=NX_nfRV{T?CzN+udGClyQHA}| zu{~Xk0Pr$xTSsIZf!$(xmJBlD(#K%E+Oj@lgvfoM`%>?82h@EJj(lQ<&x}zL_+C70 z{&?N#v6M+0Q2-{A3EFfA6Ryk(H(2e*)?nXs&Yz%F-1mw%=^th!65D$s01W^5${zJb wf7Hw1zt*e?sA?(*c_=ROE&lg|QaPV&iJ9(MCuf>H6)zot-Mm~m&g9d718B6?1ONa4 literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml b/org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml deleted file mode 100644 index bbc3c1e2..00000000 --- a/org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml b/org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml deleted file mode 100644 index 6f57ff0f..00000000 --- a/org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index b5764477..e54731e4 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -24,22 +24,6 @@ android:layout_height="wrap_content" android:layout_span="2"> - - - - @@ -64,6 +48,17 @@ android:background="?headlineHeaderBackground" android:padding="16dp"> + + + android:orientation="horizontal" + android:id="@+id/linearLayout2"> + + - + android:layout_gravity="bottom|right" + android:scaleType="fitXY" + android:src="@drawable/ic_play_circle" + android:visibility="visible" + android:layout_below="@+id/headline_header" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index fba42d4f..58691aeb 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -25,22 +25,6 @@ android:layout_height="wrap_content" android:layout_span="2"> - - - - @@ -65,6 +49,17 @@ android:background="?headlineHeaderBackground" android:padding="16dp"> + + + android:orientation="horizontal" + android:id="@+id/linearLayout2"> + + - + android:layout_gravity="bottom|right" + android:scaleType="fitXY" + android:src="@drawable/ic_play_circle" + android:visibility="visible" + android:layout_below="@+id/headline_header" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" /> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index f36d9c2f..74aad95a 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -80,7 +80,7 @@ @android:color/secondary_text_dark ?headlineSelectedExcerptTextColor #1c1c1c - #cc000000 + #99000000 #101010 ?colorPrimary @android:color/black