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

[leanback] adjust layout

Browse Source
pull/137/head
FongMi 3 years ago
parent 3256403f4b
commit 4d1111c476
4 changed files with 41 additions and 63 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. 10
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  2. 2
      app/src/leanback/res/layout/adapter_parse.xml
  3. 7
      app/src/leanback/res/layout/view_control_seek.xml
  4. 85
      app/src/leanback/res/layout/view_control_vod.xml

10
app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
Unescape View File

@ -337,10 +337,9 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
mViewModel.search.observe(this, result -> setSearch(result.getList()));
mViewModel.player.observe(this, result -> {
setUseParse(ApiConfig.hasParse() && ((result.getPlayUrl().isEmpty() && ApiConfig.get().getFlags().contains(result.getFlag())) || result.getJx() == 1));
mBinding.control.parseLayout.setVisibility(isUseParse() ? View.VISIBLE : View.GONE);
mBinding.control.parse.setVisibility(isUseParse() ? View.VISIBLE : View.GONE);
int timeout = getSite().isChangeable() ? Constant.TIMEOUT_PLAY : -1;
mPlayers.start(result, isUseParse(), timeout);
resetFocus();
});
mViewModel.result.observe(this, result -> {
if (result.getList().isEmpty()) setEmpty();
@ -349,13 +348,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
});
}
private void resetFocus() {
findViewById(R.id.timeBar).setNextFocusUpId(isUseParse() ? R.id.parse : R.id.next);
for (int i = 0; i < mBinding.control.actionLayout.getChildCount(); i++) {
mBinding.control.actionLayout.getChildAt(i).setNextFocusDownId(isUseParse() ? R.id.parse : R.id.timeBar);
}
}
private void checkCast() {
if (isCast()) onVideo();
else mBinding.progressLayout.showProgress();

2
app/src/leanback/res/layout/adapter_parse.xml
Unescape View File

@ -8,8 +8,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:nextFocusUp="@id/action"
android:nextFocusDown="@id/timeBar"
android:textColor="@color/text"
android:textSize="14sp"
tools:text="解析" />

7
app/src/leanback/res/layout/view_control_seek.xml
Unescape View File

@ -24,9 +24,10 @@
android:layout_weight="1"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusLeft="@+id/timeBar"
android:nextFocusRight="@+id/timeBar"
android:nextFocusDown="@+id/timeBar"
android:nextFocusLeft="@id/timeBar"
android:nextFocusRight="@id/timeBar"
android:nextFocusUp="@id/next"
android:nextFocusDown="@id/timeBar"
app:buffered_color="@color/blue_200"
app:played_color="@color/blue_500"
app:scrubber_color="@color/blue_500"

85
app/src/leanback/res/layout/view_control_vod.xml
Unescape View File

@ -11,6 +11,15 @@
android:paddingEnd="16dp"
android:paddingBottom="8dp">
<com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
android:id="@+id/parse"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:clipChildren="false"
android:clipToPadding="false"
tools:layout_height="36dp" />
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -24,14 +33,6 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:text="@string/play"
android:textColor="@color/grey_700"
android:textSize="18sp" />
<TextView
android:id="@+id/next"
android:layout_width="wrap_content"
@ -41,6 +42,7 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusLeft="@id/next"
android:nextFocusDown="@id/timeBar"
android:text="@string/play_next"
android:textColor="@color/white"
android:textSize="14sp" />
@ -53,6 +55,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:text="@string/play_prev"
android:textColor="@color/white"
android:textSize="14sp" />
@ -65,6 +68,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="刷新" />
@ -77,6 +81,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:text="@string/play_change"
android:textColor="@color/white"
android:textSize="14sp"
@ -90,6 +95,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="EXO" />
@ -102,6 +108,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="硬解" />
@ -114,6 +121,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="1.00" />
@ -126,22 +134,11 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="預設" />
<TextView
android:id="@+id/loop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:text="@string/play_loop"
android:textColor="@color/text"
android:textSize="14sp" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
@ -150,6 +147,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:tag="3"
android:text="@string/play_track_text"
android:textColor="@color/white"
@ -165,6 +163,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:tag="1"
android:text="@string/play_track_audio"
android:textColor="@color/white"
@ -180,6 +179,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:tag="2"
android:text="@string/play_track_video"
android:textColor="@color/white"
@ -195,6 +195,7 @@
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/timeBar"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="00:00" />
@ -203,45 +204,31 @@
android:id="@+id/ending"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusRight="@id/ending"
android:nextFocusDown="@id/timeBar"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="00:00" />
<TextView
android:id="@+id/loop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusRight="@id/loop"
android:nextFocusDown="@id/timeBar"
android:text="@string/play_loop"
android:textColor="@color/text"
android:textSize="14sp" />
</LinearLayout>
</HorizontalScrollView>
<LinearLayout
android:id="@+id/parseLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:text="@string/parse"
android:textColor="@color/grey_700"
android:textSize="18sp" />
<com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
android:id="@+id/parse"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
tools:layout_height="36dp" />
</LinearLayout>
<com.fongmi.android.tv.ui.custom.CustomSeekView
android:id="@+id/seek"
android:layout_width="match_parent"

Write Preview
Loading…
Cancel
Save