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

Optimize ui

Browse Source
pull/605/head
jhengazuki 4 months ago
parent 38403f79aa
commit 2a2d36ae4e
10 changed files with 40 additions and 54 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. 0
      app/src/leanback/res/drawable/ic_widget_error.xml
  2. 6
      app/src/leanback/res/drawable/shape_widget.xml
  3. 3
      app/src/leanback/res/layout/view_widget_cast.xml
  4. 4
      app/src/leanback/res/layout/view_widget_live.xml
  5. 3
      app/src/leanback/res/layout/view_widget_vod.xml
  6. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  7. 4
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  8. 16
      app/src/mobile/res/drawable/ic_widget_error.xml
  9. 27
      app/src/mobile/res/layout/view_widget_live.xml
  10. 27
      app/src/mobile/res/layout/view_widget_vod.xml

0
app/src/main/res/drawable/ic_widget_error.xml → app/src/leanback/res/drawable/ic_widget_error.xml
Unescape View File

6
app/src/leanback/res/drawable/shape_widget.xml
Unescape View File

@ -6,4 +6,10 @@
<corners android:radius="8dp" />
<padding
android:bottom="16dp"
android:left="16dp"
android:right="16dp"
android:top="16dp" />
</shape>

3
app/src/leanback/res/layout/view_widget_cast.xml
Unescape View File

@ -77,7 +77,6 @@
android:background="@drawable/shape_widget"
android:gravity="center"
android:orientation="vertical"
android:padding="16dp"
android:visibility="gone"
tools:visibility="visible">
@ -90,7 +89,6 @@
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="16sp"
@ -106,7 +104,6 @@
android:background="@drawable/shape_widget"
android:gravity="center"
android:orientation="vertical"
android:padding="16dp"
android:visibility="gone"
tools:visibility="visible">

4
app/src/leanback/res/layout/view_widget_live.xml
Unescape View File

@ -78,7 +78,6 @@
android:background="@drawable/shape_widget"
android:gravity="center"
android:orientation="vertical"
android:padding="16dp"
android:visibility="gone"
tools:visibility="visible">
@ -91,7 +90,6 @@
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="16sp"
@ -107,7 +105,6 @@
android:background="@drawable/shape_widget"
android:includeFontPadding="false"
android:letterSpacing="0.05"
android:padding="16dp"
android:textColor="@color/white"
android:textSize="64sp"
android:visibility="gone"
@ -122,7 +119,6 @@
android:background="@drawable/shape_widget"
android:gravity="center"
android:orientation="vertical"
android:padding="16dp"
android:visibility="gone"
tools:visibility="visible">

3
app/src/leanback/res/layout/view_widget_vod.xml
Unescape View File

@ -76,7 +76,6 @@
android:background="@drawable/shape_widget"
android:gravity="center"
android:orientation="vertical"
android:padding="16dp"
android:visibility="gone"
tools:visibility="visible">
@ -89,7 +88,6 @@
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="16sp"
@ -105,7 +103,6 @@
android:background="@drawable/shape_widget"
android:gravity="center"
android:orientation="vertical"
android:padding="16dp"
android:visibility="gone"
tools:visibility="visible">

4
app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
Unescape View File

@ -490,13 +490,13 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
private void showError(String text) {
mBinding.widget.error.setVisibility(View.VISIBLE);
mBinding.widget.text.setText(text);
mBinding.widget.error.setText(text);
hideProgress();
}
private void hideError() {
mBinding.widget.error.setVisibility(View.GONE);
mBinding.widget.text.setText("");
mBinding.widget.error.setText("");
}
private void showControl() {

4
app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
Unescape View File

@ -941,13 +941,13 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
private void showError(String text) {
mBinding.widget.error.setVisibility(View.VISIBLE);
mBinding.widget.text.setText(text);
mBinding.widget.error.setText(text);
hideProgress();
}
private void hideError() {
mBinding.widget.error.setVisibility(View.GONE);
mBinding.widget.text.setText("");
mBinding.widget.error.setText("");
}
private void showDanmaku() {

16
app/src/mobile/res/drawable/ic_widget_error.xml
Unescape View File

@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,5.99L19.53,19H4.47L12,5.99M12,2L1,21h22L12,2L12,2z" />
<path
android:fillColor="@android:color/white"
android:pathData="M13,16l-2,0l0,2l2,0z" />
<path
android:fillColor="@android:color/white"
android:pathData="M13,10l-2,0l0,5l2,0z" />
</vector>

27
app/src/mobile/res/layout/view_widget_live.xml
Unescape View File

@ -5,33 +5,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.LinearLayoutCompat
<com.google.android.material.textview.MaterialTextView
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/shape_widget_error"
android:drawableTop="@drawable/ic_widget_error"
android:drawablePadding="8dp"
android:gravity="center"
android:orientation="vertical"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"
tools:visibility="visible">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_widget_error" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="@string/error_play_url" />
</androidx.appcompat.widget.LinearLayoutCompat>
tools:text="@string/error_play_url"
tools:visibility="visible" />
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"

27
app/src/mobile/res/layout/view_widget_vod.xml
Unescape View File

@ -5,33 +5,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.LinearLayoutCompat
<com.google.android.material.textview.MaterialTextView
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/shape_widget_error"
android:drawableTop="@drawable/ic_widget_error"
android:drawablePadding="8dp"
android:gravity="center"
android:orientation="vertical"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"
tools:visibility="visible">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_widget_error" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="@string/error_play_url" />
</androidx.appcompat.widget.LinearLayoutCompat>
tools:text="@string/error_play_url"
tools:visibility="visible" />
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"

Write Preview
Loading…
Cancel
Save