diff --git a/app/src/mobile/java/com/fongmi/android/tv/pip/Receiver.java b/app/src/mobile/java/com/fongmi/android/tv/receiver/PiPReceiver.java similarity index 88% rename from app/src/mobile/java/com/fongmi/android/tv/pip/Receiver.java rename to app/src/mobile/java/com/fongmi/android/tv/receiver/PiPReceiver.java index 529dc921c..e196b0f92 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/pip/Receiver.java +++ b/app/src/mobile/java/com/fongmi/android/tv/receiver/PiPReceiver.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.pip; +package com.fongmi.android.tv.receiver; import android.app.Activity; import android.content.BroadcastReceiver; @@ -6,11 +6,13 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -public class Receiver extends BroadcastReceiver { +import com.fongmi.android.tv.utils.PiP; + +public class PiPReceiver extends BroadcastReceiver { private final Listener listener; - public Receiver(Listener listener) { + public PiPReceiver(Listener listener) { this.listener = listener; } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 980c12418..26086a49e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -44,8 +44,8 @@ import com.fongmi.android.tv.event.ErrorEvent; import com.fongmi.android.tv.event.PlayerEvent; import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.model.SiteViewModel; -import com.fongmi.android.tv.pip.PiP; -import com.fongmi.android.tv.pip.Receiver; +import com.fongmi.android.tv.utils.PiP; +import com.fongmi.android.tv.receiver.PiPReceiver; import com.fongmi.android.tv.player.ExoUtil; import com.fongmi.android.tv.player.Players; import com.fongmi.android.tv.ui.adapter.EpisodeAdapter; @@ -82,7 +82,7 @@ import java.util.concurrent.Executors; import tv.danmaku.ijk.media.player.ui.IjkVideoView; -public class DetailActivity extends BaseActivity implements Clock.Callback, CustomKeyDownVod.Listener, CastDialog.Listener, Receiver.Listener, TrackDialog.Listener, ControlDialog.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, ParseAdapter.OnClickListener { +public class DetailActivity extends BaseActivity implements Clock.Callback, CustomKeyDownVod.Listener, CastDialog.Listener, PiPReceiver.Listener, TrackDialog.Listener, ControlDialog.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, ParseAdapter.OnClickListener { private ViewGroup.LayoutParams mFrameParams; private ActivityDetailBinding mBinding; @@ -95,7 +95,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust private SiteViewModel mViewModel; private FlagAdapter mFlagAdapter; private List mDialogs; - private Receiver mReceiver; + private PiPReceiver mReceiver; private History mHistory; private Players mPlayers; private boolean fullscreen; @@ -207,8 +207,8 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust mKeyDown = CustomKeyDownVod.create(this, mBinding.video); mFrameParams = mBinding.video.getLayoutParams(); mBinding.progressLayout.showProgress(); + mReceiver = new PiPReceiver(this); mPlayers = new Players().init(); - mReceiver = new Receiver(this); mDialogs = new ArrayList<>(); mR1 = this::hideControl; mR2 = this::setTraffic; diff --git a/app/src/mobile/java/com/fongmi/android/tv/pip/PiP.java b/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java similarity index 97% rename from app/src/mobile/java/com/fongmi/android/tv/pip/PiP.java rename to app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java index 18366ed62..978340321 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/pip/PiP.java +++ b/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.pip; +package com.fongmi.android.tv.utils; import android.app.Activity; import android.app.PendingIntent; @@ -13,8 +13,6 @@ import android.view.View; import androidx.media3.ui.R; -import com.fongmi.android.tv.utils.Utils; - import java.util.ArrayList; import java.util.List; diff --git a/app/src/mobile/res/layout/view_control_seek.xml b/app/src/mobile/res/layout/view_control_seek.xml index 7464c7bc1..fdb8a379e 100644 --- a/app/src/mobile/res/layout/view_control_seek.xml +++ b/app/src/mobile/res/layout/view_control_seek.xml @@ -22,11 +22,7 @@ android:layout_marginStart="8dp" android:layout_marginEnd="8dp" android:layout_weight="1" - app:bar_height="2dp" - app:buffered_color="@color/blue_200" - app:played_color="@color/blue_500" - app:scrubber_color="@color/blue_500" - app:unplayed_color="@color/grey_200" /> + app:bar_height="2dp" />