diff --git a/app/build.gradle b/app/build.gradle index 5a4a5ee33..5e3340220 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ dependencies { implementation 'cat.ereza:customactivityoncrash:2.4.0' implementation 'com.github.bassaer:materialdesigncolors:1.0.0' implementation 'com.github.bumptech.glide:glide:4.14.2' - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.9.0-beta01' implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' implementation 'com.google.zxing:core:3.3.0' diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java index 843fee79b..02dd98f8b 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java @@ -56,6 +56,10 @@ public class ApiConfig { return get().getConfig().getUrl(); } + public static String getDesc() { + return get().getConfig().getDesc(); + } + public static int getHomeIndex() { return get().getSites().indexOf(get().getHome()); } diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java index 421132d6b..3726f9685 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java @@ -39,6 +39,10 @@ public class LiveConfig { return get().getConfig().getUrl(); } + public static String getDesc() { + return get().getConfig().getDesc(); + } + public static int getHomeIndex() { return get().getLives().indexOf(get().getHome()); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index 179e80532..6e9713357 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -60,9 +60,9 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit @Override protected void initView() { - mBinding.vodUrl.setText(ApiConfig.getUrl()); - mBinding.liveUrl.setText(LiveConfig.getUrl()); + mBinding.vodUrl.setText(ApiConfig.getDesc()); mBinding.wallUrl.setText(WallConfig.getUrl()); + mBinding.liveUrl.setText(LiveConfig.getDesc()); mBinding.versionText.setText(BuildConfig.VERSION_NAME); mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Prefers.getSize()]); mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Prefers.getScale()]); @@ -104,12 +104,12 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit switch (config.getType()) { case 0: Notify.progress(getActivity(), true); - mBinding.vodUrl.setText(config.getUrl()); + mBinding.vodUrl.setText(config.getDesc()); ApiConfig.get().clear().config(config).load(getCallback(config)); break; case 1: Notify.progress(getActivity(), true); - mBinding.liveUrl.setText(config.getUrl()); + mBinding.liveUrl.setText(config.getDesc()); LiveConfig.get().clear().config(config).load(getCallback(config)); break; case 2: @@ -141,13 +141,13 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit case 0: Notify.dismiss(); RefreshEvent.video(); - mBinding.vodUrl.setText(ApiConfig.getUrl()); - mBinding.liveUrl.setText(LiveConfig.getUrl()); + mBinding.vodUrl.setText(ApiConfig.getDesc()); + mBinding.liveUrl.setText(LiveConfig.getDesc()); mBinding.wallUrl.setText(WallConfig.getUrl()); break; case 1: Notify.dismiss(); - mBinding.liveUrl.setText(LiveConfig.getUrl()); + mBinding.liveUrl.setText(LiveConfig.getDesc()); break; case 2: Notify.dismiss(); diff --git a/app/src/mobile/res/layout/activity_main.xml b/app/src/mobile/res/layout/activity_main.xml index 5e963236b..d3aeb5617 100644 --- a/app/src/mobile/res/layout/activity_main.xml +++ b/app/src/mobile/res/layout/activity_main.xml @@ -19,7 +19,6 @@ android:background="@color/white_15" app:elevation="0dp" app:itemIconTint="@color/nav" - app:itemTextColor="@color/white" app:labelVisibilityMode="unlabeled" app:menu="@menu/menu_nav" />