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 5 months ago
parent c0fc980d6f
commit d38fdaaaab
10 changed files with 74 additions and 118 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. 31
      app/src/main/res/layout/view_progress.xml
  2. 8
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  3. 8
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  4. 16
      app/src/mobile/res/drawable/ic_widget_error.xml
  5. 15
      app/src/mobile/res/drawable/shape_widget_error.xml
  6. 10
      app/src/mobile/res/layout-sw600dp/activity_video.xml
  7. 30
      app/src/mobile/res/layout/activity_live.xml
  8. 10
      app/src/mobile/res/layout/activity_video.xml
  9. 32
      app/src/mobile/res/layout/view_widget_live.xml
  10. 32
      app/src/mobile/res/layout/view_widget_vod.xml

31
app/src/main/res/layout/view_progress.xml
Unescape View File

@ -1,6 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminateTint="@color/white" />
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.progressindicator.CircularProgressIndicator
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true"
app:indicatorColor="@color/white" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/traffic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="40dp"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"
tools:text="120 KB/s"
tools:visibility="visible" />
</FrameLayout>

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

@ -475,15 +475,13 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
}
private void showProgress() {
mBinding.widget.progress.setVisibility(View.VISIBLE);
mBinding.widget.traffic.setVisibility(View.VISIBLE);
mBinding.progress.getRoot().setVisibility(View.VISIBLE);
App.post(mR2, 0);
hideError();
}
private void hideProgress() {
mBinding.widget.progress.setVisibility(View.GONE);
mBinding.widget.traffic.setVisibility(View.GONE);
mBinding.progress.getRoot().setVisibility(View.GONE);
App.removeCallbacks(mR2);
Traffic.reset();
}
@ -533,7 +531,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
}
private void setTraffic() {
Traffic.setSpeed(mBinding.widget.traffic);
Traffic.setSpeed(mBinding.progress.traffic);
App.post(mR2, 1000);
}

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

@ -926,15 +926,13 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
}
private void showProgress() {
mBinding.widget.progress.setVisibility(View.VISIBLE);
mBinding.widget.traffic.setVisibility(View.VISIBLE);
mBinding.progress.getRoot().setVisibility(View.VISIBLE);
App.post(mR2, 0);
hideError();
}
private void hideProgress() {
mBinding.widget.progress.setVisibility(View.GONE);
mBinding.widget.traffic.setVisibility(View.GONE);
mBinding.progress.getRoot().setVisibility(View.GONE);
App.removeCallbacks(mR2);
Traffic.reset();
}
@ -987,7 +985,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
}
private void setTraffic() {
Traffic.setSpeed(mBinding.widget.traffic);
Traffic.setSpeed(mBinding.progress.traffic);
App.post(mR2, 1000);
}

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

@ -1,16 +0,0 @@
<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>

15
app/src/mobile/res/drawable/shape_widget_error.xml
Unescape View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black_50" />
<corners android:radius="16dp" />
<padding
android:bottom="12dp"
android:left="12dp"
android:right="12dp"
android:top="12dp" />
</shape>

10
app/src/mobile/res/layout-sw600dp/activity_video.xml
Unescape View File

@ -40,6 +40,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/widget"
layout="@layout/view_widget_vod"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/control"
layout="@layout/view_control_vod"
@ -48,8 +54,8 @@
android:visibility="gone" />
<include
android:id="@+id/widget"
layout="@layout/view_widget_vod"
android:id="@+id/progress"
layout="@layout/view_progress"
android:layout_width="match_parent"
android:layout_height="match_parent" />

30
app/src/mobile/res/layout/activity_live.xml
Unescape View File

@ -21,20 +21,26 @@
android:layout_height="match_parent"
app:surface_type="none" />
</FrameLayout>
<include
android:id="@+id/widget"
layout="@layout/view_widget_live"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/control"
layout="@layout/view_control_live"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<include
android:id="@+id/control"
layout="@layout/view_control_live"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<include
android:id="@+id/widget"
layout="@layout/view_widget_live"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/progress"
layout="@layout/view_progress"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/recycler"

10
app/src/mobile/res/layout/activity_video.xml
Unescape View File

@ -33,6 +33,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/widget"
layout="@layout/view_widget_vod"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<include
android:id="@+id/control"
layout="@layout/view_control_vod"
@ -41,8 +47,8 @@
android:visibility="gone" />
<include
android:id="@+id/widget"
layout="@layout/view_widget_vod"
android:id="@+id/progress"
layout="@layout/view_progress"
android:layout_width="match_parent"
android:layout_height="match_parent" />

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

@ -9,40 +9,16 @@
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:layout_gravity="top|center"
android:layout_marginTop="24dp"
android:background="@drawable/shape_widget"
android:gravity="center"
android:textColor="@color/white"
android:textSize="12sp"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/error_play_url"
tools:visibility="visible" />
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true"
android:visibility="gone"
app:indicatorColor="@color/white"
app:indicatorSize="48dp"
tools:visibility="visible" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/traffic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="40dp"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"
tools:text="120KB/s"
tools:visibility="visible" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/seek"
android:layout_width="wrap_content"

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

@ -9,40 +9,16 @@
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:layout_gravity="top|center"
android:layout_marginTop="24dp"
android:background="@drawable/shape_widget"
android:gravity="center"
android:textColor="@color/white"
android:textSize="12sp"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/error_play_url"
tools:visibility="visible" />
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true"
android:visibility="gone"
app:indicatorColor="@color/white"
app:indicatorSize="48dp"
tools:visibility="visible" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/traffic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="40dp"
android:textColor="@color/white"
android:textSize="12sp"
android:visibility="gone"
tools:text="120KB/s"
tools:visibility="visible" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/seek"
android:layout_width="wrap_content"

Write Preview
Loading…
Cancel
Save