Clean up home code

app/src/main/java/com/fongmi/bear/ui/activity/HomeActivity.java

@@ -49,26 +49,24 @@ public class HomeActivity extends BaseActivity {
 
     private void setRecyclerView() {
         mBinding.func.setHasFixedSize(true);
-        mBinding.func.setNestedScrollingEnabled(false);
         mBinding.func.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
         mBinding.func.setAdapter(mFuncAdapter = new FuncAdapter());
-        mBinding.update.setHasFixedSize(true);
-        mBinding.update.setNestedScrollingEnabled(false);
-        mBinding.update.setLayoutManager(new GridLayoutManager(this, 5));
-        mBinding.update.addItemDecoration(new SpaceItemDecoration(5, 12, false, 0));
-        mBinding.update.setAdapter(mVodAdapter = new VodAdapter());
+        mBinding.recommend.setHasFixedSize(true);
+        mBinding.recommend.setLayoutManager(new GridLayoutManager(this, 5));
+        mBinding.recommend.addItemDecoration(new SpaceItemDecoration(5, 12, false, 0));
+        mBinding.recommend.setAdapter(mVodAdapter = new VodAdapter());
     }
 
     private void setViewModel() {
         mSiteViewModel = new ViewModelProvider(this).get(SiteViewModel.class);
         mSiteViewModel.mResult.observe(this, result -> {
             mVodAdapter.addAll(result.getList());
-            mBinding.updateLayout.showContent();
+            mBinding.recommendLayout.showContent();
         });
     }
 
     private void homeContent() {
-        mBinding.updateLayout.showProgress();
+        mBinding.recommendLayout.showProgress();
         mSiteViewModel.homeContent(ApiConfig.get().getHome().getKey());
     }
 

app/src/main/java/com/fongmi/bear/ui/activity/SettingActivity.java

@@ -80,6 +80,7 @@ public class SettingActivity extends BaseActivity {
         DialogSiteBinding bindingDialog = DialogSiteBinding.inflate(LayoutInflater.from(this));
         bindingDialog.site.setLayoutManager(new LinearLayoutManager(this));
         bindingDialog.site.getItemAnimator().setChangeDuration(0);
+        bindingDialog.site.setHasFixedSize(true);
         bindingDialog.site.setAdapter(mAdapter);
         mAdapter.addAll(ApiConfig.get().getSites());
         bindingDialog.site.scrollToPosition(position);

app/src/main/res/layout/activity_home.xml

@@ -21,7 +21,9 @@
             android:id="@+id/func"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp" />
+            android:layout_marginTop="16dp"
+            android:nestedScrollingEnabled="false"
+            android:overScrollMode="never" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -35,26 +37,28 @@
             android:id="@+id/recent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp" />
+            android:layout_marginTop="16dp"
+            android:nestedScrollingEnabled="false" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:text="@string/home_update"
+            android:text="@string/home_recommend"
             android:textColor="@color/white"
             android:textSize="24sp" />
 
         <com.github.androidprogresslayout.ProgressLayout
-            android:id="@+id/updateLayout"
+            android:id="@+id/recommendLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginTop="16dp">
 
             <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/update"
+                android:id="@+id/recommend"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:nestedScrollingEnabled="false" />
 
         </com.github.androidprogresslayout.ProgressLayout>
     </LinearLayout>

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

@@ -13,7 +13,7 @@
     <string name="home_push">推送</string>
     <string name="home_setting">设定</string>
     <string name="home_recent">最近观看</string>
-    <string name="home_update">更新推荐</string>
+    <string name="home_recommend">更新推荐</string>
 
     <!-- Setting -->
     <string name="setting_site">首页</string>

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

@@ -13,7 +13,7 @@
     <string name="home_push">推送</string>
     <string name="home_setting">設定</string>
     <string name="home_recent">最近觀看</string>
-    <string name="home_update">更新推薦</string>
+    <string name="home_recommend">更新推薦</string>
 
     <!-- Setting -->
     <string name="setting_site">首頁</string>

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

@@ -13,7 +13,7 @@
     <string name="home_push">Push</string>
     <string name="home_setting">Setting</string>
     <string name="home_recent">Recent</string>
-    <string name="home_update">Recommend</string>
+    <string name="home_recommend">Recommend</string>
 
     <!-- Setting -->
     <string name="setting_site">Home site</string>