Rename Recent to History

app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java

@@ -296,7 +296,7 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener {
         history.setVodPic(mBinding.video.getTag().toString());
         history.setVodName(mBinding.name.getText().toString());
         AppDatabase.get().getHistoryDao().insertOrUpdate(history);
-        EventBus.getDefault().post(RefreshEvent.recent());
+        EventBus.getDefault().post(RefreshEvent.history());
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java

@@ -49,11 +49,11 @@ import java.util.List;
 
 public class HomeActivity extends BaseActivity implements VodPresenter.OnClickListener, FuncPresenter.OnClickListener, HistoryPresenter.OnClickListener {
 
-    private ArrayObjectAdapter mHistoryAdapter;
-    private HistoryPresenter mHistoryPresenter;
     private ActivityHomeBinding mBinding;
-    private ArrayObjectAdapter mAdapter;
     private SiteViewModel mSiteViewModel;
+    private ArrayObjectAdapter mAdapter;
+    private ArrayObjectAdapter mHistoryAdapter;
+    private HistoryPresenter mHistoryPresenter;
     private FuncPresenter mFuncPresenter;
     private boolean mConfirmExit;
 
@@ -75,7 +75,7 @@ public class HomeActivity extends BaseActivity implements VodPresenter.OnClickLi
         setRecyclerView();
         setViewModel();
         setAdapter();
-        getRecent();
+        getHistory();
         getVideo();
     }
 
@@ -115,7 +115,7 @@ public class HomeActivity extends BaseActivity implements VodPresenter.OnClickLi
     private void setAdapter() {
         mAdapter.add(R.string.app_name);
         mAdapter.add(getFuncRow());
-        mAdapter.add(R.string.home_recent);
+        mAdapter.add(R.string.home_history);
         mAdapter.add(R.string.home_recommend);
     }
 
@@ -147,17 +147,17 @@ public class HomeActivity extends BaseActivity implements VodPresenter.OnClickLi
         return new ListRow(adapter);
     }
 
-    private void getRecent() {
-        int recentIndex = getRecentIndex();
+    private void getHistory() {
+        int historyIndex = getHistoryIndex();
         int recommendIndex = getRecommendIndex();
         List<History> items = AppDatabase.get().getHistoryDao().getAll();
         if (items.isEmpty()) return;
-        if (recommendIndex - recentIndex != 2) mAdapter.add(recentIndex, new ListRow(mHistoryAdapter));
+        if (recommendIndex - historyIndex != 2) mAdapter.add(historyIndex, new ListRow(mHistoryAdapter));
         mHistoryAdapter.setItems(items, null);
     }
 
-    private int getRecentIndex() {
-        for (int i = 0; i < mAdapter.size(); i++) if (mAdapter.get(i).equals(R.string.home_recent)) return i + 1;
+    private int getHistoryIndex() {
+        for (int i = 0; i < mAdapter.size(); i++) if (mAdapter.get(i).equals(R.string.home_history)) return i + 1;
         return -1;
     }
 
@@ -193,7 +193,7 @@ public class HomeActivity extends BaseActivity implements VodPresenter.OnClickLi
         mHistoryAdapter.remove(item);
         AppDatabase.get().getHistoryDao().delete(item.getKey());
         if (mHistoryAdapter.size() > 0) return;
-        mAdapter.removeItems(getRecentIndex(), 1);
+        mAdapter.removeItems(getHistoryIndex(), 1);
         mHistoryPresenter.setDelete(false);
     }
 
@@ -211,8 +211,8 @@ public class HomeActivity extends BaseActivity implements VodPresenter.OnClickLi
             getVideo();
         } else if (event.getType() == RefreshEvent.Type.IMAGE) {
             mAdapter.notifyArrayItemRangeChanged(getRecommendIndex(), mAdapter.size() - getRecommendIndex());
-        } else if (event.getType() == RefreshEvent.Type.RECENT) {
-            getRecent();
+        } else if (event.getType() == RefreshEvent.Type.HISTORY) {
+            getHistory();
         }
     }
 

app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java

@@ -99,7 +99,7 @@ public class SettingActivity extends BaseActivity {
             @Override
             public void success() {
                 mBinding.home.setText(ApiConfig.getHomeName());
-                EventBus.getDefault().post(RefreshEvent.recent());
+                EventBus.getDefault().post(RefreshEvent.history());
                 EventBus.getDefault().post(RefreshEvent.video());
                 Notify.dismiss();
             }
@@ -107,7 +107,7 @@ public class SettingActivity extends BaseActivity {
             @Override
             public void error(int resId) {
                 mBinding.home.setText(ApiConfig.getHomeName());
-                EventBus.getDefault().post(RefreshEvent.recent());
+                EventBus.getDefault().post(RefreshEvent.history());
                 EventBus.getDefault().post(RefreshEvent.video());
                 Notify.dismiss();
                 Notify.show(resId);

app/src/main/java/com/fongmi/android/tv/event/RefreshEvent.java

@@ -12,8 +12,8 @@ public class RefreshEvent {
         return new RefreshEvent(Type.VIDEO);
     }
 
-    public static RefreshEvent recent() {
-        return new RefreshEvent(Type.RECENT);
+    public static RefreshEvent history() {
+        return new RefreshEvent(Type.HISTORY);
     }
 
     public RefreshEvent(Type type) {
@@ -25,6 +25,6 @@ public class RefreshEvent {
     }
 
     public enum Type {
-        IMAGE, VIDEO, RECENT
+        IMAGE, VIDEO, HISTORY
     }
 }

app/src/main/res/values-zh-rCN/strings.xml

@@ -13,7 +13,7 @@
     <string name="home_search">搜寻</string>
     <string name="home_push">推送</string>
     <string name="home_setting">设定</string>
-    <string name="home_recent">最近观看</string>
+    <string name="home_history">最近观看</string>
     <string name="home_recommend">更新推荐</string>
 
     <!-- Vod -->

app/src/main/res/values-zh-rTW/strings.xml

@@ -13,7 +13,7 @@
     <string name="home_search">搜尋</string>
     <string name="home_push">推送</string>
     <string name="home_setting">設定</string>
-    <string name="home_recent">最近觀看</string>
+    <string name="home_history">最近觀看</string>
     <string name="home_recommend">更新推薦</string>
 
     <!-- Vod -->

app/src/main/res/values/strings.xml

@@ -13,7 +13,7 @@
     <string name="home_search">Search</string>
     <string name="home_push">Push</string>
     <string name="home_setting">Setting</string>
-    <string name="home_recent">Recent</string>
+    <string name="home_history">History</string>
     <string name="home_recommend">Recommend</string>
 
     <!-- Vod -->