diff --git a/app/src/leanback/res/values-zh-rCN/strings.xml b/app/src/leanback/res/values-zh-rCN/strings.xml index 1d99703bd..f7f6f67eb 100644 --- a/app/src/leanback/res/values-zh-rCN/strings.xml +++ b/app/src/leanback/res/values-zh-rCN/strings.xml @@ -17,7 +17,6 @@ %s”的搜索结果 - 全部 手机或电脑连接同一个局域网,扫描 QR Code 或浏览器输入地址\n%s diff --git a/app/src/leanback/res/values-zh-rTW/strings.xml b/app/src/leanback/res/values-zh-rTW/strings.xml index 2bd812c2c..065c5cba5 100644 --- a/app/src/leanback/res/values-zh-rTW/strings.xml +++ b/app/src/leanback/res/values-zh-rTW/strings.xml @@ -17,7 +17,6 @@ %s」的搜尋結果 - 全部 手機或電腦連接同一個區域網路,掃描 QR Code 或瀏覽器輸入網址\n%s diff --git a/app/src/leanback/res/values/strings.xml b/app/src/leanback/res/values/strings.xml index bbf420161..8950bbe4d 100644 --- a/app/src/leanback/res/values/strings.xml +++ b/app/src/leanback/res/values/strings.xml @@ -17,7 +17,6 @@ Search results for %s - All Connect phone or pc to LAN and scan QR Code or enter the URL in browser\n%s diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Collect.java b/app/src/main/java/com/fongmi/android/tv/bean/Collect.java index 780c22bc4..e949ebc69 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Collect.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Collect.java @@ -12,7 +12,7 @@ public class Collect { private final List list; public static Collect all() { - return new Collect(Site.get("all", ResUtil.getString(R.string.collect_all)), new ArrayList<>()); + return new Collect(Site.get("all", ResUtil.getString(R.string.all)), new ArrayList<>()); } public static Collect create(List list) { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index db81cfaa8..135ed47b7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -76,6 +76,7 @@ 关闭 + 全部 %s diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 76a0af053..ec23652b4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -76,6 +76,7 @@ 關閉 + 全部 %s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f59c599b8..fee49abda 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,6 +76,7 @@ Close + All %s s diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml index bbb902852..7b7b72756 100644 --- a/app/src/mobile/AndroidManifest.xml +++ b/app/src/mobile/AndroidManifest.xml @@ -12,6 +12,14 @@ android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + + + + + android:screenOrientation="fullSensor" /> \ No newline at end of file diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/VodAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/VodAdapter.java index 8b53eb42c..025f542be 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/VodAdapter.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/VodAdapter.java @@ -83,6 +83,6 @@ public class VodAdapter extends RecyclerView.Adapter { holder.binding.remark.setText(item.getVodRemarks()); holder.binding.year.setVisibility(item.getYearVisible()); holder.binding.remark.setVisibility(item.getRemarkVisible()); - ImgUtil.load(item.getVodName(), item.getVodPic(), holder.binding.image); + ImgUtil.load(item.getVodPic(), holder.binding.image); } } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java index d4a3f629a..3f5aadfc3 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java @@ -13,7 +13,6 @@ import com.fongmi.android.tv.api.ApiConfig; import com.fongmi.android.tv.bean.History; import com.fongmi.android.tv.bean.Vod; import com.fongmi.android.tv.databinding.FragmentHomeBinding; -import com.fongmi.android.tv.db.AppDatabase; import com.fongmi.android.tv.model.SiteViewModel; import com.fongmi.android.tv.ui.activity.BaseFragment; import com.fongmi.android.tv.ui.adapter.HistoryAdapter; @@ -69,7 +68,7 @@ public class HomeFragment extends BaseFragment implements VodAdapter.OnClickList } private void getHistory() { - mHistoryAdapter.addAll(AppDatabase.get().getHistoryDao().getAll()); + mHistoryAdapter.addAll(History.get()); } @Override 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 239c8d62e..98a023452 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 @@ -19,7 +19,6 @@ import androidx.viewbinding.ViewBinding; import com.fongmi.android.tv.api.ApiConfig; import com.fongmi.android.tv.bean.Site; import com.fongmi.android.tv.databinding.FragmentSettingBinding; -import com.fongmi.android.tv.db.AppDatabase; import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.net.Callback; import com.fongmi.android.tv.ui.activity.BaseFragment; @@ -63,7 +62,6 @@ public class SettingFragment extends BaseFragment implements ConfigDialog.Callba public void setConfig(String url) { mBinding.url.setText(url); Notify.progress(getActivity()); - AppDatabase.clear(); Prefers.putUrl(url); checkUrl(url); } diff --git a/app/src/leanback/res/drawable/selector_text.xml b/app/src/mobile/res/drawable/selector_text.xml similarity index 100% rename from app/src/leanback/res/drawable/selector_text.xml rename to app/src/mobile/res/drawable/selector_text.xml diff --git a/app/src/mobile/res/drawable/shape_text_activated.xml b/app/src/mobile/res/drawable/shape_text_activated.xml new file mode 100644 index 000000000..b7afb8cba --- /dev/null +++ b/app/src/mobile/res/drawable/shape_text_activated.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/mobile/res/drawable/shape_text_focused.xml b/app/src/mobile/res/drawable/shape_text_focused.xml new file mode 100644 index 000000000..bad85c441 --- /dev/null +++ b/app/src/mobile/res/drawable/shape_text_focused.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/mobile/res/drawable/shape_text_normal.xml b/app/src/mobile/res/drawable/shape_text_normal.xml new file mode 100644 index 000000000..bb15f6d3c --- /dev/null +++ b/app/src/mobile/res/drawable/shape_text_normal.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file