diff --git a/app/build.gradle b/app/build.gradle index 77d890052..c0e6003fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,7 +81,6 @@ dependencies { implementation 'com.google.zxing:core:3.3.0' implementation 'com.guolindev.permissionx:permissionx:1.7.1' implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10' - implementation 'me.jessyan:autosize:1.2.1' implementation 'net.java.dev.jna:jna:5.12.1' implementation 'org.apache.commons:commons-compress:1.20' implementation 'org.chromium.net:cronet-embedded:101.4951.41' @@ -89,6 +88,7 @@ dependencies { implementation 'org.nanohttpd:nanohttpd:2.3.1' implementation('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' exclude group: 'xpp3', module: 'xpp3' } leanbackImplementation 'androidx.leanback:leanback:1.2.0-alpha02' + leanbackImplementation 'me.jessyan:autosize:1.2.1' annotationProcessor 'androidx.room:room-compiler:2.5.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2' } \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/android/tv/ui/activity/BaseActivity.java b/app/src/main/java/com/fongmi/android/tv/ui/activity/BaseActivity.java index 7e793bd9f..ad73bd9be 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/activity/BaseActivity.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/BaseActivity.java @@ -2,7 +2,6 @@ package com.fongmi.android.tv.ui.activity; import android.app.Activity; import android.content.res.Configuration; -import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -10,7 +9,6 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.viewbinding.ViewBinding; -import com.fongmi.android.tv.Config; import com.fongmi.android.tv.R; import com.fongmi.android.tv.api.WallConfig; import com.fongmi.android.tv.event.RefreshEvent; @@ -25,9 +23,6 @@ import org.greenrobot.eventbus.ThreadMode; import java.io.File; -import me.jessyan.autosize.AutoSizeCompat; -import me.jessyan.autosize.AutoSizeConfig; - public abstract class BaseActivity extends AppCompatActivity { protected abstract ViewBinding getBinding(); @@ -63,23 +58,6 @@ public abstract class BaseActivity extends AppCompatActivity { } } - private void hackResources() { - try { - AutoSizeCompat.autoConvertDensityOfGlobal(super.getResources()); - } catch (Exception ignored) { - } - } - - private void setAutoSizeConfig(Configuration newConfig) { - if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { - AutoSizeConfig.getInstance().setDesignWidthInDp(Config.getAutoSizeWidth()); - AutoSizeConfig.getInstance().setDesignHeightInDp(Config.getAutoSizeHeight()); - } else if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) { - AutoSizeConfig.getInstance().setDesignWidthInDp(Config.getAutoSizeHeight()); - AutoSizeConfig.getInstance().setDesignHeightInDp(Config.getAutoSizeWidth()); - } - } - @Subscribe(threadMode = ThreadMode.MAIN) public void onRefreshEvent(RefreshEvent event) { if (event.getType() != RefreshEvent.Type.WALL) return; @@ -87,16 +65,9 @@ public abstract class BaseActivity extends AppCompatActivity { setWall(); } - @Override - public Resources getResources() { - hackResources(); - return super.getResources(); - } - @Override public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); - setAutoSizeConfig(newConfig); Utils.hideSystemUI(this); } diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml index e0dc26020..a183ea431 100644 --- a/app/src/mobile/AndroidManifest.xml +++ b/app/src/mobile/AndroidManifest.xml @@ -4,14 +4,6 @@ - - - -