From 982c1095f223e4bf96c3cf34823d1ed4a15ec532 Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 16 Jan 2024 15:08:02 +0800 Subject: [PATCH] [mobile] add vod_id to info --- .../android/tv/ui/activity/VideoActivity.java | 2 +- .../android/tv/ui/dialog/InfoDialog.java | 20 +++++++++++++++---- app/src/mobile/res/layout/dialog_info.xml | 12 +++++++++-- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 1c23499c0..948d4729a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -707,7 +707,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void onInfo() { - InfoDialog.create(this).title(mBinding.control.title.getText()).headers(mPlayers.getHeaders()).url(mPlayers.getUrl()).show(); + InfoDialog.create(this).title(mBinding.control.title.getText()).headers(mPlayers.getHeaders()).vid(getId()).url(mPlayers.getUrl()).show(); } private void onFull() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/InfoDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/InfoDialog.java index 3009ac0d0..b24555468 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/InfoDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/InfoDialog.java @@ -1,6 +1,7 @@ package com.fongmi.android.tv.ui.dialog; import android.app.Activity; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -21,6 +22,7 @@ public class InfoDialog { private AlertDialog dialog; private CharSequence title; private String header; + private String vid; private String url; public static InfoDialog create(Activity activity) { @@ -44,6 +46,11 @@ public class InfoDialog { return this; } + public InfoDialog vid(String vid) { + this.vid = vid; + return this; + } + public InfoDialog url(String url) { this.url = url; return this; @@ -65,12 +72,17 @@ public class InfoDialog { binding.url.setText(url); binding.title.setText(title); binding.header.setText(header); - binding.header.setVisibility(header.isEmpty() ? View.GONE : View.VISIBLE); + binding.vid.setText("Vid : ".concat(vid)); + binding.vid.setVisibility(TextUtils.isEmpty(vid) ? View.GONE : View.VISIBLE); + binding.url.setVisibility(TextUtils.isEmpty(url) ? View.GONE : View.VISIBLE); + binding.header.setVisibility(TextUtils.isEmpty(header) ? View.GONE : View.VISIBLE); } private void initEvent() { binding.url.setOnClickListener(this::onShare); - binding.url.setOnLongClickListener(this::onCopy); + binding.vid.setOnLongClickListener(v -> onCopy(vid)); + binding.url.setOnLongClickListener(v -> onCopy(url)); + binding.header.setOnLongClickListener(v -> onCopy(header)); } private void onShare(View view) { @@ -78,9 +90,9 @@ public class InfoDialog { dialog.dismiss(); } - private boolean onCopy(View view) { + private boolean onCopy(String text) { Notify.show(R.string.copied); - Util.copy(url); + Util.copy(text); return true; } diff --git a/app/src/mobile/res/layout/dialog_info.xml b/app/src/mobile/res/layout/dialog_info.xml index 9bdcdacd0..2245559ea 100644 --- a/app/src/mobile/res/layout/dialog_info.xml +++ b/app/src/mobile/res/layout/dialog_info.xml @@ -14,22 +14,30 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginBottom="8dp" android:linksClickable="false" android:textColor="?android:attr/textColorPrimary" android:textSize="20sp" android:textStyle="bold" /> + +