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

Optimize glide

Browse Source
pull/605/head
jhengazuki 6 months ago
parent 7c5b2894ad
commit c9fe40f7a4
20 changed files with 8 additions and 39 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. 4
      app/build.gradle
  2. 1
      app/src/leanback/res/layout/activity_search.xml
  3. 6
      app/src/leanback/res/layout/activity_setting.xml
  4. 1
      app/src/leanback/res/layout/adapter_config.xml
  5. 1
      app/src/leanback/res/layout/adapter_file.xml
  6. 2
      app/src/leanback/res/layout/adapter_live.xml
  7. 1
      app/src/leanback/res/layout/adapter_restore.xml
  8. 1
      app/src/leanback/res/layout/adapter_vod_list.xml
  9. 2
      app/src/leanback/res/layout/view_widget_cast.xml
  10. 2
      app/src/leanback/res/layout/view_widget_live.xml
  11. 2
      app/src/leanback/res/layout/view_widget_vod.xml
  12. 9
      app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
  13. 1
      app/src/mobile/res/layout/adapter_config.xml
  14. 1
      app/src/mobile/res/layout/adapter_file.xml
  15. 2
      app/src/mobile/res/layout/adapter_live.xml
  16. 2
      app/src/mobile/res/layout/adapter_site.xml
  17. 1
      app/src/mobile/res/layout/adapter_vod_list.xml
  18. 6
      app/src/mobile/res/layout/fragment_setting.xml
  19. 1
      app/src/mobile/res/layout/view_widget_live.xml
  20. 1
      app/src/mobile/res/layout/view_widget_vod.xml

4
app/build.gradle
Unescape View File

@ -11,8 +11,8 @@ android {
applicationId "com.fongmi.android.tv"
minSdk 24
targetSdk 36
versionCode 445
versionName "4.4.5"
versionCode 446
versionName "4.4.6"
javaCompileOptions {
annotationProcessorOptions {
arguments = ["room.schemaLocation": "$projectDir/schemas".toString(), "eventBusIndex": "com.fongmi.android.tv.event.EventIndex"]

1
app/src/leanback/res/layout/activity_search.xml
Unescape View File

@ -52,7 +52,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusLeft="@id/record"
android:scaleType="fitCenter"
android:src="@drawable/ic_search_mic" />
<com.fongmi.android.tv.ui.custom.CustomSearchView

6
app/src/leanback/res/layout/activity_setting.xml
Unescape View File

@ -62,7 +62,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
<androidx.appcompat.widget.AppCompatImageView
@ -73,7 +72,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_history" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -129,7 +127,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
<androidx.appcompat.widget.AppCompatImageView
@ -140,7 +137,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_history" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -196,7 +192,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
<androidx.appcompat.widget.AppCompatImageView
@ -207,7 +202,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_refresh" />
</androidx.appcompat.widget.LinearLayoutCompat>

1
app/src/leanback/res/layout/adapter_config.xml
Unescape View File

@ -29,7 +29,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_delete" />
</androidx.appcompat.widget.LinearLayoutCompat>

1
app/src/leanback/res/layout/adapter_file.xml
Unescape View File

@ -19,7 +19,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="16dp"
android:scaleType="fitCenter"
tools:src="@drawable/ic_folder" />
<com.google.android.material.textview.MaterialTextView

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

@ -29,7 +29,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_live_pass" />
<androidx.appcompat.widget.AppCompatImageView
@ -41,7 +40,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_live_boot" />
</androidx.appcompat.widget.LinearLayoutCompat>

1
app/src/leanback/res/layout/adapter_restore.xml
Unescape View File

@ -29,7 +29,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_delete" />
</androidx.appcompat.widget.LinearLayoutCompat>

1
app/src/leanback/res/layout/adapter_vod_list.xml
Unescape View File

@ -20,7 +20,6 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="16dp"
android:scaleType="fitCenter"
app:shapeAppearanceOverlay="@style/Vod.Grid.Large" />
<androidx.appcompat.widget.LinearLayoutCompat

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

@ -92,7 +92,6 @@
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_widget_error" />
<com.google.android.material.textview.MaterialTextView
@ -123,7 +122,6 @@
android:id="@+id/action"
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_widget_play" />
<androidx.appcompat.widget.LinearLayoutCompat

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

@ -93,7 +93,6 @@
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_widget_error" />
<com.google.android.material.textview.MaterialTextView
@ -140,7 +139,6 @@
android:id="@+id/action"
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_widget_play" />
<androidx.appcompat.widget.LinearLayoutCompat

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

@ -91,7 +91,6 @@
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_widget_error" />
<com.google.android.material.textview.MaterialTextView
@ -122,7 +121,6 @@
android:id="@+id/action"
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_widget_play" />
<androidx.appcompat.widget.LinearLayoutCompat

9
app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
Unescape View File

@ -13,6 +13,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.bumptech.glide.RequestBuilder;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.load.model.GlideUrl;
@ -47,10 +48,13 @@ public class ImgUtil {
}
public static void load(String text, String url, ImageView view, boolean vod) {
view.setScaleType(vod ? CENTER_CROP : FIT_CENTER);
if (!vod) view.setVisibility(TextUtils.isEmpty(url) ? View.GONE : View.VISIBLE);
if (TextUtils.isEmpty(url) || failed.contains(url)) view.setImageDrawable(getTextDrawable(text, vod));
else try {
Glide.with(view).load(getUrl(url)).listener(getListener(text, url, view, vod)).into(view);
RequestBuilder<Drawable> builder = Glide.with(view).load(getUrl(url)).listener(getListener(text, url, view, vod));
if (vod) builder.centerCrop().into(view);
else builder.fitCenter().into(view);
} catch (Exception e) {
e.printStackTrace();
}
@ -91,8 +95,7 @@ public class ImgUtil {
}
@Override
public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target<Drawable> target, @NonNull DataSource dataSource, boolean isFirstResource) {
view.setScaleType(vod ? CENTER_CROP : FIT_CENTER);
public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
return false;
}
};

1
app/src/mobile/res/layout/adapter_config.xml
Unescape View File

@ -24,7 +24,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_delete" />
</androidx.appcompat.widget.LinearLayoutCompat>

1
app/src/mobile/res/layout/adapter_file.xml
Unescape View File

@ -15,7 +15,6 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="12dp"
android:scaleType="fitCenter"
tools:src="@drawable/ic_folder" />
<com.google.android.material.textview.MaterialTextView

2
app/src/mobile/res/layout/adapter_live.xml
Unescape View File

@ -24,7 +24,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter"
android:src="@drawable/ic_live_pass" />
<androidx.appcompat.widget.AppCompatImageView
@ -33,7 +32,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter"
android:src="@drawable/ic_live_boot" />
</androidx.appcompat.widget.LinearLayoutCompat>

2
app/src/mobile/res/layout/adapter_site.xml
Unescape View File

@ -24,7 +24,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter"
android:src="@drawable/ic_site_search" />
<androidx.appcompat.widget.AppCompatImageView
@ -33,7 +32,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:scaleType="fitCenter"
android:src="@drawable/ic_site_change" />
</androidx.appcompat.widget.LinearLayoutCompat>

1
app/src/mobile/res/layout/adapter_vod_list.xml
Unescape View File

@ -16,7 +16,6 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="12dp"
android:scaleType="fitCenter"
app:shapeAppearanceOverlay="@style/Vod.Grid.Large" />
<androidx.appcompat.widget.LinearLayoutCompat

6
app/src/mobile/res/layout/fragment_setting.xml
Unescape View File

@ -70,7 +70,6 @@
android:layout_marginEnd="12dp"
android:background="@drawable/shape_item"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
<androidx.appcompat.widget.AppCompatImageView
@ -79,7 +78,6 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_item"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_history" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -128,7 +126,6 @@
android:layout_marginEnd="12dp"
android:background="@drawable/shape_item"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
<androidx.appcompat.widget.AppCompatImageView
@ -137,7 +134,6 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_item"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_history" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -186,7 +182,6 @@
android:layout_marginEnd="12dp"
android:background="@drawable/shape_item"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
<androidx.appcompat.widget.AppCompatImageView
@ -195,7 +190,6 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_item"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_refresh" />
</androidx.appcompat.widget.LinearLayoutCompat>

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

@ -19,7 +19,6 @@
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_widget_error" />
<com.google.android.material.textview.MaterialTextView

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

@ -19,7 +19,6 @@
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_widget_error" />
<com.google.android.material.textview.MaterialTextView

Write Preview
Loading…
Cancel
Save