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

[leanback] clean layout

Browse Source
pull/123/head
FongMi 3 years ago
parent 08f66206dc
commit f1166efa78
3 changed files with 47 additions and 48 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/LiveActivity.java
  2. 48
      app/src/leanback/res/layout/view_control_live.xml
  3. 37
      app/src/leanback/res/layout/view_control_vod.xml

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

@ -184,11 +184,11 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
mPlayers.set(getExo(), getIjk());
setScale(Prefers.getLiveScale());
getIjk().setRender(Prefers.getRender());
findViewById(R.id.timeBar).setNextFocusUpId(R.id.home);
mBinding.control.speed.setText(mPlayers.getSpeedText());
mBinding.control.home.setVisibility(LiveConfig.isOnly() ? View.GONE : View.VISIBLE);
mBinding.control.invert.setActivated(Prefers.isInvert());
mBinding.control.across.setActivated(Prefers.isAcross());
findViewById(R.id.timeBar).setNextFocusUpId(R.id.home);
mBinding.control.home.setVisibility(LiveConfig.isOnly() ? View.GONE : View.VISIBLE);
}
private void setScale(int scale) {
@ -267,7 +267,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
private void onToggle() {
if (isVisible(mBinding.control.getRoot())) hideControl();
else if (isVisible(mBinding.recycler)) hideUI();
if (isVisible(mBinding.recycler)) hideUI();
else showUI();
hideInfo();
}
@ -364,6 +364,8 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
mBinding.control.getRoot().setVisibility(View.VISIBLE);
view.requestFocus();
setR2Callback();
hideInfo();
hideUI();
}
private void hideControl() {
@ -700,8 +702,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
if (isVisible(mBinding.control.home)) showControl(mBinding.control.home);
else if (isVisible(mBinding.control.line)) showControl(mBinding.control.line);
else showControl(mBinding.control.player);
hideInfo();
hideUI();
}
@Override

48
app/src/leanback/res/layout/view_control_live.xml
Unescape View File

@ -99,30 +99,6 @@
android:textSize="14sp"
tools:text="預設" />
<TextView
android:id="@+id/invert"
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_invert"
android:textColor="@color/text"
android:textSize="14sp" />
<TextView
android:id="@+id/across"
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_across"
android:textColor="@color/text"
android:textSize="14sp" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
@ -157,6 +133,7 @@
android:id="@+id/video"
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"
@ -167,6 +144,29 @@
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/invert"
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_invert"
android:textColor="@color/text"
android:textSize="14sp" />
<TextView
android:id="@+id/across"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:text="@string/play_across"
android:textColor="@color/text"
android:textSize="14sp" />
</LinearLayout>
</HorizontalScrollView>

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

@ -118,74 +118,73 @@
tools:text="預設" />
<TextView
android:id="@+id/opening"
android:id="@+id/text"
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:tag="3"
android:text="@string/play_track_text"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="00:00" />
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/ending"
android:id="@+id/audio"
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:tag="1"
android:text="@string/play_track_audio"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="00:00" />
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/text"
android:id="@+id/video"
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:tag="3"
android:text="@string/play_track_text"
android:tag="2"
android:text="@string/play_track_video"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/audio"
android:id="@+id/opening"
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:tag="1"
android:text="@string/play_track_audio"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible" />
tools:text="00:00" />
<TextView
android:id="@+id/video"
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/video"
android:tag="2"
android:text="@string/play_track_video"
android:nextFocusRight="@id/ending"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible" />
tools:text="00:00" />
</LinearLayout>
</HorizontalScrollView>

Write Preview
Loading…
Cancel
Save