更换 Fragment 推荐函数

lgsxiaosen · Apr 20, 2021 · 8f8f420 · 8f8f420
1 parent 76f8b6e
commit 8f8f420
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 28 deletions.
diff --git a/app/src/main/java/com/eyepetizer/android/ui/common/ui/BaseFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/common/ui/BaseFragment.kt
@@ -79,7 +79,7 @@ open class BaseFragment : Fragment(), RequestLifecycle {
     override fun onAttach(context: Context) {
         super.onAttach(context)
         // 缓存当前依附的activity
-        activity = getActivity()!!
+        activity = requireActivity()
         logD(TAG, "BaseFragment-->onAttach()")
     }
 

diff --git a/app/src/main/java/com/eyepetizer/android/ui/common/ui/BaseViewPagerFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/common/ui/BaseViewPagerFragment.kt
@@ -17,6 +17,7 @@
 package com.eyepetizer.android.ui.common.ui
 
 import android.os.Bundle
+import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -44,16 +45,16 @@ abstract class BaseViewPagerFragment : BaseFragment() {
 
     protected var pageChangeCallback: PageChangeCallback? = null
 
-    protected val adapter: VpAdapter by lazy { VpAdapter(getActivity()!!).apply { addFragments(createFragments) } }
+    protected val adapter: VpAdapter by lazy { VpAdapter(requireActivity()).apply { addFragments(createFragments) } }
 
     protected var offscreenPageLimit = 1
 
     abstract val createTitles: ArrayList<CustomTabEntity>
 
     abstract val createFragments: Array<Fragment>
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         setupViews()
     }
 

diff --git a/app/src/main/java/com/eyepetizer/android/ui/common/ui/ShareDialogFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/common/ui/ShareDialogFragment.kt
@@ -49,8 +49,8 @@ open class ShareDialogFragment : BottomSheetDialogFragment() {
         return inflater.inflate(R.layout.fragment_share_dialog, container, false)
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
         activity?.let { act ->
             attachedActivity = act

diff --git a/app/src/main/java/com/eyepetizer/android/ui/community/commend/CommendFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/community/commend/CommendFragment.kt
@@ -79,8 +79,8 @@ class CommendFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_refresh_layout, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         adapter = CommendAdapter(this, viewModel.dataList)
         val mainLayoutManager = StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL)
         mainLayoutManager.gapStrategy = StaggeredGridLayoutManager.GAP_HANDLING_NONE

diff --git a/app/src/main/java/com/eyepetizer/android/ui/community/follow/FollowFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/community/follow/FollowFragment.kt
@@ -55,8 +55,8 @@ class FollowFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_refresh_layout, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         adapter = FollowAdapter(this, viewModel.dataList)
         recyclerView.layoutManager = LinearLayoutManager(activity)
         recyclerView.adapter = adapter

diff --git a/app/src/main/java/com/eyepetizer/android/ui/home/HomePageFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/home/HomePageFragment.kt
@@ -55,8 +55,8 @@ class HomePageFragment : BaseViewPagerFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_main_container, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         ivCalendar.visibility = View.VISIBLE
         viewPager?.currentItem = 1
     }

diff --git a/app/src/main/java/com/eyepetizer/android/ui/home/commend/CommendFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/home/commend/CommendFragment.kt
@@ -51,8 +51,8 @@ class CommendFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_refresh_layout, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         adapter = CommendAdapter(this, viewModel.dataList)
         val layoutManager = LinearLayoutManager(activity)
         recyclerView.layoutManager = layoutManager

diff --git a/app/src/main/java/com/eyepetizer/android/ui/home/daily/DailyFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/home/daily/DailyFragment.kt
@@ -51,8 +51,8 @@ class DailyFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_refresh_layout, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         adapter = DailyAdapter(this, viewModel.dataList)
         val layoutManager = LinearLayoutManager(activity)
         recyclerView.layoutManager = layoutManager

diff --git a/app/src/main/java/com/eyepetizer/android/ui/home/discovery/DiscoveryFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/home/discovery/DiscoveryFragment.kt
@@ -51,8 +51,8 @@ class DiscoveryFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_refresh_layout, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         adapter = DiscoveryAdapter(this, viewModel.dataList)
         recyclerView.layoutManager = LinearLayoutManager(activity)
         recyclerView.adapter = adapter

diff --git a/app/src/main/java/com/eyepetizer/android/ui/mine/MineFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/mine/MineFragment.kt
@@ -47,8 +47,8 @@ class MineFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_mine, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         tvVersionNumber.text = String.format(GlobalUtil.getString(R.string.version_show), GlobalUtil.eyepetizerVersionName)
         setOnClickListener(
             ivMore, ivAvatar, tvLoginTips, tvFavorites, tvCache, tvFollow, tvWatchRecord, tvNotificationToggle,

diff --git a/app/src/main/java/com/eyepetizer/android/ui/notification/inbox/InboxFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/notification/inbox/InboxFragment.kt
@@ -37,8 +37,8 @@ class InboxFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_notification_login_tips, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         tvLogin.setOnClickListener { LoginActivity.start(activity) }
     }
 

diff --git a/app/src/main/java/com/eyepetizer/android/ui/notification/interaction/InteractionFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/notification/interaction/InteractionFragment.kt
@@ -37,8 +37,8 @@ class InteractionFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_notification_login_tips, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         tvLogin.setOnClickListener { LoginActivity.start(activity) }
     }
 

diff --git a/app/src/main/java/com/eyepetizer/android/ui/notification/push/PushFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/notification/push/PushFragment.kt
@@ -51,8 +51,8 @@ class PushFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_refresh_layout, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         recyclerView.layoutManager = LinearLayoutManager(activity)
         adapter = PushAdapter(this, viewModel.dataList)
         recyclerView.adapter = adapter

diff --git a/app/src/main/java/com/eyepetizer/android/ui/search/SearchFragment.kt b/app/src/main/java/com/eyepetizer/android/ui/search/SearchFragment.kt
@@ -63,8 +63,8 @@ class SearchFragment : BaseFragment() {
         return super.onCreateView(inflater.inflate(R.layout.fragment_search, container, false))
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         llSearch.visibleAlphaAnimation(500)
         etQuery.setDrawable(ContextCompat.getDrawable(activity, R.drawable.ic_search_gray_17dp), 14f, 14f)
         etQuery.setOnEditorActionListener(EditorActionListener())