hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[mobile] add back button for control

Browse Source
pull/123/head
FongMi 3 years ago
parent a3ccda9cdf
commit 823b97a3ec
9 changed files with 32 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      app/src/main/res/drawable/ic_widget_volume_high.xml
  2. 1
      app/src/main/res/drawable/ic_widget_volume_low.xml
  3. 1
      app/src/main/res/drawable/ic_widget_volume_medium.xml
  4. 6
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  5. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java
  6. 0
      app/src/mobile/res/drawable/ic_control_full.xml
  7. 10
      app/src/mobile/res/drawable/ic_control_full_off.xml
  8. 2
      app/src/mobile/res/drawable/shape_widget.xml
  9. 34
      app/src/mobile/res/layout/view_control_vod.xml

1
app/src/main/res/drawable/ic_widget_volume_high.xml
Unescape View File

@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">

1
app/src/main/res/drawable/ic_widget_volume_low.xml
Unescape View File

@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">

1
app/src/main/res/drawable/ic_widget_volume_medium.xml
Unescape View File

@ -1,7 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">

6
app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
Unescape View File

@ -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);

2
app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java
Unescape View File

@ -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()));

0
app/src/mobile/res/drawable/ic_control_full_on.xml → app/src/mobile/res/drawable/ic_control_full.xml
Unescape View File

10
app/src/mobile/res/drawable/ic_control_full_off.xml
Unescape View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="@color/white"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M5,16h3v3h2v-5L5,14v2zM8,8L5,8v2h5L10,5L8,5v3zM14,19h2v-3h3v-2h-5v5zM16,8L16,5h-2v5h5L19,8h-3z" />
</vector>

2
app/src/mobile/res/drawable/shape_widget.xml
Unescape View File

@ -8,7 +8,7 @@
<padding
android:bottom="6dp"
android:left="16dp"
android:left="12dp"
android:right="16dp"
android:top="6dp" />

34
app/src/mobile/res/layout/view_control_vod.xml
Unescape View File

@ -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" />
<ImageView
android:id="@+id/share"
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_share" />
<ImageView
@ -60,6 +62,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="4dp"
android:src="@drawable/ic_control_setting" />
</LinearLayout>
@ -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">
<ImageView
android:id="@+id/prev"
@ -91,8 +95,8 @@
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="48dp"
android:layout_marginEnd="48dp"
android:background="@drawable/shape_control">
<ImageView
@ -109,7 +113,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">
<ImageView
android:id="@+id/next"
@ -131,19 +136,30 @@
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="4dp"
android:src="@drawable/ic_control_back" />
<ImageView
android:id="@+id/lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="4dp"
android:src="@drawable/ic_control_lock_off" />
<ImageView
android:id="@+id/rotate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="4dp"
android:src="@drawable/ic_control_rotate" />
</LinearLayout>
@ -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" />
<ImageView
android:id="@+id/full"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_control_full_on" />
android:src="@drawable/ic_control_full" />
</LinearLayout>

Write Preview
Loading…
Cancel
Save