From 823b97a3ec82045aa2fff584b97c45f779072f0d Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 24 Mar 2023 16:18:58 +0800 Subject: [PATCH] [mobile] add back button for control --- .../res/drawable/ic_widget_volume_high.xml | 1 - .../res/drawable/ic_widget_volume_low.xml | 1 - .../res/drawable/ic_widget_volume_medium.xml | 1 - .../tv/ui/activity/DetailActivity.java | 6 ++-- .../tv/ui/fragment/child/TypeFragment.java | 2 ++ ...ontrol_full_on.xml => ic_control_full.xml} | 0 .../res/drawable/ic_control_full_off.xml | 10 ------ app/src/mobile/res/drawable/shape_widget.xml | 2 +- .../mobile/res/layout/view_control_vod.xml | 34 ++++++++++++++----- 9 files changed, 32 insertions(+), 25 deletions(-) rename app/src/mobile/res/drawable/{ic_control_full_on.xml => ic_control_full.xml} (100%) delete mode 100644 app/src/mobile/res/drawable/ic_control_full_off.xml diff --git a/app/src/main/res/drawable/ic_widget_volume_high.xml b/app/src/main/res/drawable/ic_widget_volume_high.xml index 51e0a4be7..643bc5672 100644 --- a/app/src/main/res/drawable/ic_widget_volume_high.xml +++ b/app/src/main/res/drawable/ic_widget_volume_high.xml @@ -1,7 +1,6 @@ diff --git a/app/src/main/res/drawable/ic_widget_volume_low.xml b/app/src/main/res/drawable/ic_widget_volume_low.xml index 60aa7c4e6..2195955af 100644 --- a/app/src/main/res/drawable/ic_widget_volume_low.xml +++ b/app/src/main/res/drawable/ic_widget_volume_low.xml @@ -1,7 +1,6 @@ diff --git a/app/src/main/res/drawable/ic_widget_volume_medium.xml b/app/src/main/res/drawable/ic_widget_volume_medium.xml index 6d9b330d3..ae7b59662 100644 --- a/app/src/main/res/drawable/ic_widget_volume_medium.xml +++ b/app/src/main/res/drawable/ic_widget_volume_medium.xml @@ -1,7 +1,6 @@ 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 1c2ea6128..223d15d10 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 @@ -202,6 +202,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mBinding.more.setOnClickListener(view -> onMore()); mBinding.content.setOnClickListener(view -> onContent()); mBinding.reverse.setOnClickListener(view -> onReverse()); + mBinding.control.back.setOnClickListener(view -> onFull()); mBinding.control.full.setOnClickListener(view -> onFull()); mBinding.control.keep.setOnClickListener(view -> onKeep()); mBinding.control.lock.setOnClickListener(view -> onLock()); @@ -587,7 +588,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mBinding.video.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT)); setRequestedOrientation(mPlayers.isPortrait() ? ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); getIjk().getSubtitleView().setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); - mBinding.control.full.setImageResource(R.drawable.ic_control_full_off); + mBinding.control.full.setVisibility(View.GONE); setRotate(mPlayers.isPortrait()); App.post(mR3, 2000); setFullscreen(true); @@ -597,9 +598,9 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void exitFullscreen() { if (!isFullscreen()) return; getIjk().getSubtitleView().setTextSize(TypedValue.COMPLEX_UNIT_SP, 14); - mBinding.control.full.setImageResource(R.drawable.ic_control_full_on); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT); mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition()); + mBinding.control.full.setVisibility(View.VISIBLE); mBinding.video.setLayoutParams(mFrameParams); App.post(mR3, 2000); setFullscreen(false); @@ -644,6 +645,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void showControl() { mBinding.control.parse.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE); mBinding.control.rotate.setVisibility(isFullscreen() && !isLock() ? View.VISIBLE : View.GONE); + mBinding.control.back.setVisibility(isFullscreen() && !isLock() ? View.VISIBLE : View.GONE); mBinding.control.action.getRoot().setVisibility(isFullscreen() ? View.VISIBLE : View.GONE); mBinding.control.setting.setVisibility(isFullscreen() ? View.GONE : View.VISIBLE); mBinding.control.share.setVisibility(isFullscreen() ? View.GONE : View.VISIBLE); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java index 83a5dec84..52e5c2eaa 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java @@ -23,6 +23,7 @@ import com.fongmi.android.tv.ui.adapter.VodAdapter; import com.fongmi.android.tv.ui.base.BaseFragment; import com.fongmi.android.tv.ui.custom.CustomScroller; import com.fongmi.android.tv.ui.custom.ViewType; +import com.fongmi.android.tv.utils.ResUtil; import java.util.ArrayList; import java.util.HashMap; @@ -83,6 +84,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac private void setRecyclerView() { mBinding.recycler.setHasFixedSize(true); mBinding.recycler.setAdapter(mAdapter = new VodAdapter(this)); + mBinding.recycler.setPadding(ResUtil.dp2px(isFolder() ? 0 : 8), ResUtil.dp2px(isFolder() ? 4 : 8), ResUtil.dp2px(isFolder() ? 0 : 8), ResUtil.dp2px(isFolder() ? 0 : 8)); mBinding.recycler.setLayoutManager(isFolder() ? new LinearLayoutManager(getActivity()) : new GridLayoutManager(getContext(), Product.getColumn())); mAdapter.setViewType(isFolder() ? ViewType.FOLDER : ViewType.GRID); mAdapter.setSize(Product.getSpec(getActivity())); diff --git a/app/src/mobile/res/drawable/ic_control_full_on.xml b/app/src/mobile/res/drawable/ic_control_full.xml similarity index 100% rename from app/src/mobile/res/drawable/ic_control_full_on.xml rename to app/src/mobile/res/drawable/ic_control_full.xml diff --git a/app/src/mobile/res/drawable/ic_control_full_off.xml b/app/src/mobile/res/drawable/ic_control_full_off.xml deleted file mode 100644 index 57b6398b5..000000000 --- a/app/src/mobile/res/drawable/ic_control_full_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/mobile/res/drawable/shape_widget.xml b/app/src/mobile/res/drawable/shape_widget.xml index 1d1cdec8c..aa0305982 100644 --- a/app/src/mobile/res/drawable/shape_widget.xml +++ b/app/src/mobile/res/drawable/shape_widget.xml @@ -8,7 +8,7 @@ diff --git a/app/src/mobile/res/layout/view_control_vod.xml b/app/src/mobile/res/layout/view_control_vod.xml index d125692ca..267395860 100644 --- a/app/src/mobile/res/layout/view_control_vod.xml +++ b/app/src/mobile/res/layout/view_control_vod.xml @@ -43,16 +43,18 @@ android:id="@+id/keep" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="16dp" + android:layout_marginEnd="8dp" android:background="?attr/selectableItemBackgroundBorderless" + android:padding="4dp" android:src="@drawable/ic_control_keep_off" /> @@ -77,7 +80,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/shape_control" - android:visibility="gone"> + android:visibility="gone" + tools:visibility="visible"> + android:visibility="gone" + tools:visibility="visible"> + + @@ -182,15 +198,15 @@ android:id="@+id/seek" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" android:layout_weight="1" /> + android:src="@drawable/ic_control_full" />