From 3cd335aaa0705edcfa1917d9e224890301a23b67 Mon Sep 17 00:00:00 2001
From: LagradOst <11805592+LagradOst@users.noreply.github.com>
Date: Fri, 22 Apr 2022 18:52:31 +0200
Subject: [PATCH] new tv icon
---
.../res/drawable-v24/ic_banner_background.xml | 169 +++++++++++++++
.../ic_banner_foreground.xml | 98 +++------
.../debug/res/mipmap-anydpi-v26/ic_banner.xml | 3 +-
app/src/debug/res/mipmap-xhdpi/ic_banner.png | Bin 5065 -> 9281 bytes
.../debug/res/values/ic_banner_background.xml | 4 -
.../cloudstream3/ui/result/ImageAdapter.kt | 40 +++-
.../cloudstream3/ui/result/ResultFragment.kt | 16 +-
.../res/drawable-v24/ic_banner_background.xml | 169 +++++++++++++++
.../res/drawable/ic_cloudstreamlogotv.xml | 199 +++++++++++++++++
.../res/drawable/ic_cloudstreamlogotv_2.xml | 200 ++++++++++++++++++
.../res/drawable/ic_cloudstreamlogotv_pre.xml | 175 +++++++++++++++
.../drawable/ic_cloudstreamlogotv_pre_2.xml | 177 ++++++++++++++++
.../main/res/mipmap-anydpi-v26/ic_banner.xml | 3 +-
app/src/main/res/mipmap-xhdpi/ic_banner.png | Bin 4998 -> 9287 bytes
.../main/res/values/ic_banner_background.xml | 4 -
.../res/drawable-v24/ic_banner_background.xml | 186 ++++++++++++++++
.../res/drawable-v24/ic_banner_foreground.xml | 95 ---------
.../res/drawable/ic_banner_foreground.xml | 69 ++++++
.../res/mipmap-anydpi-v26/ic_banner.xml | 3 +-
.../prerelease/res/mipmap-xhdpi/ic_banner.png | Bin 4887 -> 9447 bytes
.../res/values/ic_banner_background.xml | 4 -
.../res/drawable-v24/ic_banner_background.xml | 169 +++++++++++++++
.../res/mipmap-anydpi-v26/ic_banner.xml | 4 +
.../release/res/mipmap-xhdpi/ic_banner.png | Bin 0 -> 9287 bytes
24 files changed, 1598 insertions(+), 189 deletions(-)
create mode 100644 app/src/debug/res/drawable-v24/ic_banner_background.xml
rename app/src/debug/res/{drawable-v24 => drawable}/ic_banner_foreground.xml (58%)
delete mode 100644 app/src/debug/res/values/ic_banner_background.xml
create mode 100644 app/src/main/res/drawable-v24/ic_banner_background.xml
create mode 100644 app/src/main/res/drawable/ic_cloudstreamlogotv.xml
create mode 100644 app/src/main/res/drawable/ic_cloudstreamlogotv_2.xml
create mode 100644 app/src/main/res/drawable/ic_cloudstreamlogotv_pre.xml
create mode 100644 app/src/main/res/drawable/ic_cloudstreamlogotv_pre_2.xml
delete mode 100644 app/src/main/res/values/ic_banner_background.xml
create mode 100644 app/src/prerelease/res/drawable-v24/ic_banner_background.xml
delete mode 100644 app/src/prerelease/res/drawable-v24/ic_banner_foreground.xml
create mode 100644 app/src/prerelease/res/drawable/ic_banner_foreground.xml
delete mode 100644 app/src/prerelease/res/values/ic_banner_background.xml
create mode 100644 app/src/release/res/drawable-v24/ic_banner_background.xml
create mode 100644 app/src/release/res/mipmap-anydpi-v26/ic_banner.xml
create mode 100644 app/src/release/res/mipmap-xhdpi/ic_banner.png
diff --git a/app/src/debug/res/drawable-v24/ic_banner_background.xml b/app/src/debug/res/drawable-v24/ic_banner_background.xml
new file mode 100644
index 00000000..7b05b711
--- /dev/null
+++ b/app/src/debug/res/drawable-v24/ic_banner_background.xml
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+ _k%y6mrhOhg(&3wV;x>e%Zz!9lrTRr-wdr7$bAB{(%2sgX|F-N`YV*BYTNQ87X%%%*^Y!46gJ4vyy*p5aW#mV8YX>ERzc{hpQO~!`}8xBjf
z6p_d2O@llBHgCk|vC+eO`lAY{t15N3^B`}>jfXhcMO3V~GDcP93lC0rN5eXq+A;zX
z41uVnIjME>aTim2n_vlHPY#o>n`&w4INv{=A+^leTtx2KlVxfD6j+~d6ZlPFblECU
zd5VPS8ri1*v-djKxhvnHd^UMu8&V-l%xlrG!Hm$FUG7a&@LqH4gn&TMK-Yz6>Z-ki
zYnb8Hj`{hf(LZmhVEFO%=d0KS$vz71)@pNLWkzdakOLidOwz(F@7=-Bk}Z4|LfN{!
zjY(d}!{HQ(_5trx``tEWe%T^$MId`OH5+^yG<~3HB-h^Yw5y$OI#M;(IUrz7A`F
zyJPE(@|6W%<{Y}XP8yHhI{na}Y?UKYu;h_s5{R&_%u3G}4gNZ|E#aV1K6|s|oRW;<
zgmvu)`FoUbwaP~AyUHM^r_!m
zIpOZ7TT+PZQwk~h)I89)bsT0Rkz#(MWXhh~UL1k^;e|(%^AR#cRhM24%sYO2>}jCR
z$Z*T?7^0@wF=_Uqs9Dan1v3&ql2f9E(dE0%WOmz07KsQ}@$hy2o^jhGxNpN|VC7TK
zwtq^lcpOuKTg#;@sEN<2tCvs(IF}NDIk=`pW4=YN#ztRHf{VP|Y*Q7g9L3mvl(tnv
zxsj2DpsS_yW$0BZ5+aezIg?^EIC@(wYfG~I#>ubkcPjE?CxOnGSf9on)&C8?3ohU
z!Ukcn%zN||6MP}dZ)X=f-LCAQAvALup&foR#BUlCxY88;!2pI$1hVxJMrWX}Ya5f2
zDK6ZaI?my4b{~jZoY{(W@C~8b?})oYE#o((W@tj$7uBnpr$shacX}ufT}Ck^dQep4
zvQWR>(`>Bu^tqw-&yTadN&a58Nz6tsECtqqpmiY62r*_D837jK&T$NB-F6jylKZ%pX^BD8CyosMc+GL9fpR
z2kH`n^8>BlU0fF~Vl)H~INZL(flB*4*)0WhfhD;VfUduT8M%3{knL~kj&tS)`S*GP
zJuMMk{uMy?tBCrAr8)Uc=gz^q@+K#aIT)mz%%&bYs>Jv6U9=LZ-+BU^qKtQY4F{-9
zEfQP(5q>#FlmpaSIZsf>kxvC^7U<>#q?u^uI!wC-XsY=}mZHdgZZQFI)?~!Y?o7=Q
z+G6It(ca8cf@hQWZ&b4;Q27G?-Z)ER|A?EZ$Am~ss-=yn#_|$Mq{m^tjvbW&pz3PfN$8PtE5w2PFaeW|9?fvZgAepyFV$+5YNm)5sB#(%EHD+F4n>*=g;Wfd@tu6pyt1QM1xLmG
zOG@n0_M@de>+^2}5I<2Gdpu)*)E$q|2$;Tnz`vcH%8Th{)bhA<+PP_dUCU<@=1^9T
zPC9>mg+{>jVH-g#5w#2XKN&{A4!|MfMt@AKP3G{0xyLI5*mzCgpocYtrAo+@WFL-z
zW53CSGuMlVSs93njfomg=+Gs3)P2(u@^
zWd4kJ5BbY8miBad&b&Y%N-Zrv6C!4D>~5|G7mHDW>ickC=8yoMbzD1+vg5JL7f>~d
zQ+)F;#=5CJnE~#dRi#mYCJwqQd6SBfUGxl}L<2AP&xmhOx=Zb@Op>2yw3(Z%2HWi|
zJQZ!Z2a%FrjwCcu{lI=(7^V}DJ{K=Q$hb}(SQVg19FHD!*GJI7$Fg|s_c1+6fCKFM
zm%pFm#Q`0M;pBPpMuV=)O=V!0|LnA4HRdu(dH;SNp%#7)$w^{5EI`+pdLL$%wME*t
ztu>JWcDotzQqz6IbT|VlR-b>|D@T^`TFAL*Dj7YkIX3t(_-{$QZwHQ*ywA!M_bq%k
z6LVLU`p5mqwYPG2w9NuU6o8zid9j`wHo?oBOMqukNC{`qM{xV6N|%39RnYm_aZ$+Y
z3ZlAnEdrXUP*C)Y39-3DBMb`nnCdv?R9Gc&JykXVQz
zt^gqxt@h#AHkJm(i^Y9H03s7EHe?WXBXdw28;@)<#DLNd-@gMrDb_asHl4$M0ZT&*
z-(>Erw1^?7uJECjaq!cDO=?!Txjxqs1=IK)e(b|enNDKrV_Jbpbkg+0|Dx$}TK;#Y(JFjs3-Nkn(s6%x5Fw
z5f5jG@Rjs}OtOZ$j58^UQEUEs_?U<1D*t6LE!a&fKVkTbH3FV-CIhfo88DtYAdI2F
zEo_@kjA=z$=h?(FaC@(tuO2f9~Ux@mtiq3QkgtfC(3db;JK
zLD3dwu$H>mWU>zvw;pseunRk1c*W=O8|K+6+*!-*f8n-Ec~8?#$+IhTesSuQt1`Y>#96Eic
zvSU!Aq~x;TQm;8iv6+`YgwK<_Z6V5&5zcsy$ryi#PgNzqm+xVsA6e#k
zFHZ2}K27fI+yhMHFd)Cvs6#_>1Gr1ya=3DQPsZPwbhTQt}jTQl7IIp06NIm
z!N^q}l&{faNI<;OHC6^47(dOtP3(gu_|yuk@HAfohIWp`8X*zLq36JE221d-qFqj%
z!`n@!^DcmM!&X|+p9{h=t9yd9h`uLNgN`GRGaT4YGq+yo=Wg(7*vhho0@c7{nJrWp
z!)*%TcHMI5Gb!0=Z<*Tkp<6_+ztl{<=+BK|jZsgK$i_N&{#y9oE+QRnu%oSDkK!5b
zqtYH?EnAVeBF%Rg$O^rZ+HHB=eVp{f2u3Xv@-!p0wZ`NRK`CfC@F0^8zM7))YM&<*
zuts`yygu8M{J<0^E*yX4|8NvIDw8xU
zGoIf}{Kj^!(KX(XjQYWuz_O#*PzCG@=7)cz#SX$D4OqMM;N^y|$Y5>issmZIBLS|E4Sp2H
z0V=R%b?uZbp3Ta@Ha6jkK~ICV(f7wWg#>+`qCZJ2=J%{&}`S*oIyUDcaUDHLIGMhEa>_k*(``54^KJk6Q@#wD#l)ipeq-)dd!P
zZom2ad&=|2kvD9_gM14~c`oKJJU^AI-G0olcuPOr_3pJiDcZc;ysTtvjkGCJbZ`3q
iESUecC#AAX0W~7aPJDJw3eGJ$!0@iAZiO~H{Qm$gmxdPr
diff --git a/app/src/debug/res/values/ic_banner_background.xml b/app/src/debug/res/values/ic_banner_background.xml
deleted file mode 100644
index 1394fa6e..00000000
--- a/app/src/debug/res/values/ic_banner_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- #000000
-
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
index 0be6d644..35e372d6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
@@ -6,6 +6,7 @@ import android.view.ViewGroup
import android.widget.ImageView
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
/*
class ImageAdapter(context: Context, val resource: Int) : ArrayAdapter(context, resource) {
@@ -19,9 +20,14 @@ class ImageAdapter(context: Context, val resource: Int) : ArrayAdapter(cont
return newConvertView
}
}*/
+const val IMAGE_CLICK = 0
+const val IMAGE_LONG_CLICK = 1
class ImageAdapter(
val layout: Int,
+ val clickCallback: ((Int) -> Unit)? = null,
+ val nextFocusUp: Int? = null,
+ val nextFocusDown: Int? = null,
) :
RecyclerView.Adapter() {
private val images: MutableList = mutableListOf()
@@ -35,7 +41,7 @@ class ImageAdapter(
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
when (holder) {
is ImageViewHolder -> {
- holder.bind(images[position])
+ holder.bind(images[position], clickCallback, nextFocusUp, nextFocusDown)
}
}
}
@@ -62,8 +68,36 @@ class ImageAdapter(
class ImageViewHolder
constructor(itemView: View) :
RecyclerView.ViewHolder(itemView) {
- fun bind(img: Int) {
- (itemView as? ImageView?)?.setImageResource(img)
+ fun bind(
+ img: Int,
+ clickCallback: ((Int) -> Unit)?,
+ nextFocusUp: Int?,
+ nextFocusDown: Int?,
+ ) {
+ (itemView as? ImageView?)?.apply {
+ setImageResource(img)
+ if (nextFocusDown != null) {
+ this.nextFocusDownId = nextFocusDown
+ }
+ if (nextFocusUp != null) {
+ this.nextFocusUpId = nextFocusUp
+ }
+ if (clickCallback != null) {
+ if (context.isTrueTvSettings()) {
+ isClickable = true
+ isLongClickable = true
+ isFocusable = true
+ isFocusableInTouchMode = true
+ }
+ setOnClickListener {
+ clickCallback.invoke(IMAGE_CLICK)
+ }
+ setOnLongClickListener {
+ clickCallback.invoke(IMAGE_LONG_CLICK)
+ return@setOnLongClickListener true
+ }
+ }
+ }
}
}
}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index b10e7b91..18050f3f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -799,7 +799,8 @@ class ResultFragment : Fragment(), PanelsChildGestureRegionObserver.GestureRegio
val builder = AlertDialog.Builder(requireContext(), R.style.AlertDialogCustom)
builder.setTitle(title)
- builder.setItems(links.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }.toTypedArray()) { dia, which ->
+ builder.setItems(links.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
+ .toTypedArray()) { dia, which ->
callback.invoke(links[which])
dia?.dismiss()
}
@@ -1302,7 +1303,18 @@ class ResultFragment : Fragment(), PanelsChildGestureRegionObserver.GestureRegio
}
}
}
- val imgAdapter = ImageAdapter(R.layout.result_mini_image)
+ val imgAdapter = ImageAdapter(
+ R.layout.result_mini_image,
+ nextFocusDown = R.id.result_sync_set_score,
+ clickCallback = { action ->
+ if (action == IMAGE_CLICK || action == IMAGE_LONG_CLICK) {
+ if (result_overlapping_panels?.getSelectedPanel()?.ordinal == 1) {
+ result_overlapping_panels?.openStartPanel()
+ } else {
+ result_overlapping_panels?.closePanels()
+ }
+ }
+ })
result_mini_sync?.adapter = imgAdapter
observe(syncModel.synced) { list ->
diff --git a/app/src/main/res/drawable-v24/ic_banner_background.xml b/app/src/main/res/drawable-v24/ic_banner_background.xml
new file mode 100644
index 00000000..7b05b711
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_banner_background.xml
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+