接入Navigation改写动态页面

Author: fmtcias

README.md

@@ -84,6 +84,9 @@ Model-View-ViewModel，View 指绿色的 Activity/Fragment，主要负责界面
    Glide相比起Fresco要轻量很多，api调用起来也很简洁，对图片加载要求不是很高的话建议使用Glide。
 
 # 更新日志
+### v2.2
+  * 接入Navigation改写动态页面
+  * 调整项目结构，优化代码
 ### v2.1
   * 接入WorkManager实现版本更新功能
   * 新增SmallestWidth限定符屏幕适配方案

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.fmt.github"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 10
-        versionName "2.1"
+        versionCode 11
+        versionName "2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
@@ -79,6 +79,10 @@ dependencies {
     kapt "androidx.room:room-compiler:2.2.5"
     implementation "androidx.room:room-ktx:2.2.5"
 
+    //navigation
+    implementation "androidx.navigation:navigation-fragment-ktx:2.3.0-alpha06"
+    implementation "androidx.navigation:navigation-ui-ktx:2.3.0-alpha06"
+
     //paging
     implementation "androidx.paging:paging-runtime-ktx:2.1.2"
 
@@ -101,7 +105,7 @@ dependencies {
     kapt "com.github.bumptech.glide:compiler:4.11.0"
     implementation 'com.github.GrenderG:Toasty:1.4.2'
     implementation 'com.github.jd-alexander:LikeButton:0.2.3'
-    implementation  'com.github.Kennyc1012:MultiStateView:2.1.2'
+    implementation 'com.github.Kennyc1012:MultiStateView:2.1.2'
     implementation 'com.jaredrummler:animated-svg-view:1.0.6'
     implementation 'com.jeremyliao:live-event-bus-x:1.4.4'
     implementation 'com.github.nitrico.lastadapter:lastadapter:2.3.0'
@@ -112,7 +116,7 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.3.0@aar'
 
     //bugly捕获异常
-    implementation 'com.tencent.bugly:crashreport:latest.release'
+    implementation 'com.tencent.bugly:crashreport:3.2.1'
     implementation project(path: ':LaunchStarter')
 
 }

app/src/main/java/com/fmt/github/GlideModule.kt

@@ -4,5 +4,4 @@ import com.bumptech.glide.annotation.GlideModule
 import com.bumptech.glide.module.AppGlideModule
 
 @GlideModule
-class GlideModule : AppGlideModule() {
-}
+class GlideModule : AppGlideModule()

app/src/main/java/com/fmt/github/WelcomeActivity.kt

@@ -4,6 +4,7 @@ import android.content.Intent
 import androidx.lifecycle.lifecycleScope
 import com.afollestad.assent.*
 import com.fmt.github.base.activity.BaseDataBindActivity
+import com.fmt.github.config.Settings
 import com.fmt.github.databinding.ActivityWelcomeBinding
 import com.fmt.github.ext.*
 import com.fmt.github.home.activity.HomeActivity
@@ -55,6 +56,7 @@ class WelcomeActivity : BaseDataBindActivity<ActivityWelcomeBinding>() {
             (userList.isEmpty()).yes {
                 go2Activity(LoginActivity::class.java)
             }.otherwise {
+                Settings.Account.loginUser = userList[0].login
                 go2Activity(HomeActivity::class.java)
             }
         }

app/src/main/java/com/fmt/github/config/Settings.kt

@@ -7,6 +7,7 @@ object Settings {
 
     object Account {
         var token by Preference(Constant.USER_TOKEN, "")
+        var loginUser by Preference(Constant.LOGIN_USER, "")
         var userName by Preference(Constant.USER_NAME, "")
         var password by Preference(Constant.USER_PASSWORD, "")
     }

app/src/main/java/com/fmt/github/constant/Constant.kt

@@ -3,6 +3,7 @@ package com.fmt.github.constant
 object Constant {
 
     const val USER_TOKEN = "token"
+    const val LOGIN_USER = "loginUser"
     const val USER_NAME = "userName"
     const val USER_PASSWORD = "password"
     const val AUTHORIZATIONS = "authorizations"

app/src/main/java/com/fmt/github/home/activity/HomeActivity.kt

@@ -8,6 +8,7 @@ import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.Navigation
 import com.fmt.github.R
 import com.fmt.github.base.activity.BaseVMActivity
 import com.fmt.github.base.viewmodel.BaseViewModel
@@ -16,7 +17,6 @@ import com.fmt.github.databinding.LayoutNavHeaderBinding
 import com.fmt.github.ext.getVersionName
 import com.fmt.github.ext.showConfirmPopup
 import com.fmt.github.ext.yes
-import com.fmt.github.home.fragment.ReceivedEventFragment
 import com.fmt.github.home.viewmodel.HomeViewModel
 import com.fmt.github.home.work.DownLoadWork
 import com.fmt.github.user.activity.AboutActivity
@@ -31,7 +31,6 @@ import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-
 class HomeActivity : BaseVMActivity(), NavigationView.OnNavigationItemSelectedListener {
 
     private val mUserDao: UserDao by inject()//kotlin的val相当于Java的final
@@ -60,7 +59,6 @@ class HomeActivity : BaseVMActivity(), NavigationView.OnNavigationItemSelectedLi
             //Androidx的协程支持LifecycleScope、ViewModelScope
             mUser = mUserDao.getAll()[0]
             initHeaderLayout()
-            initRecyclerView()
         }
     }
 
@@ -88,15 +86,8 @@ class HomeActivity : BaseVMActivity(), NavigationView.OnNavigationItemSelectedLi
             }
     }
 
-    private fun initRecyclerView() {
-        val beginTransaction = supportFragmentManager.beginTransaction()
-        beginTransaction.replace(
-            R.id.frameLayout,
-            ReceivedEventFragment.newInstance(mUser.login),
-            "Home_Fragment"
-        )
-        beginTransaction.commit()
-    }
+    override fun onSupportNavigateUp(): Boolean =
+        Navigation.findNavController(this, R.id.nav_home_fragment).navigateUp()
 
     override fun onNavigationItemSelected(menuItem: MenuItem): Boolean {
         when (menuItem.itemId) {

app/src/main/java/com/fmt/github/home/adapter/HomeAdapter.kt

@@ -1,7 +1,6 @@
 package com.fmt.github.home.adapter
 
-import android.content.Context
-import android.content.Intent
+import android.app.Activity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,11 +9,13 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.fmt.github.databinding.LayoutReceivedEventBinding
 import com.fmt.github.home.model.ReceivedEventModel
-import com.fmt.github.repos.activity.ReposDetailActivity
+import com.fmt.github.repos.activity.go2ReposDetailActivity
+import com.fmt.github.user.activity.go2UserInfoActivity
+import com.fmt.github.user.model.UserModel
 
 const val BASE_WEB_URL = "https://github.com/"
 
-class HomeAdapter(private val mContext: Context) :
+class HomeAdapter(private val mContext: Activity) :
     PagedListAdapter<ReceivedEventModel, HomeAdapter.ViewHolder>(object :
         DiffUtil.ItemCallback<ReceivedEventModel>() {
         override fun areItemsTheSame(oldItem: ReceivedEventModel, newItem: ReceivedEventModel) =
@@ -38,27 +39,25 @@ class HomeAdapter(private val mContext: Context) :
         getItem(position)?.let { receivedEventModel ->
             holder.bindData(receivedEventModel)
             holder.itemView.setOnClickListener {
-                go2ReposDetailActivity(receivedEventModel)
+                val splitArr = receivedEventModel.repo.name.split("/")
+                go2ReposDetailActivity(mContext,"${BASE_WEB_URL}${receivedEventModel.repo.name}",
+                    splitArr[1],splitArr[0])
             }
         }
     }
 
-    private fun go2ReposDetailActivity(receivedEventModel: ReceivedEventModel) {
-        val splitArr = receivedEventModel.repo.name.split("/")
-        with(Intent(mContext, ReposDetailActivity::class.java)) {
-            putExtra(ReposDetailActivity.WEB_URL, "${BASE_WEB_URL}${receivedEventModel.repo.name}")
-            putExtra(ReposDetailActivity.OWNER, splitArr[0])
-            putExtra(ReposDetailActivity.REPO, splitArr[1])
-        }.run {
-            mContext.startActivity(this)
-        }
-    }
-
-    class ViewHolder(itemView: View, val binding: LayoutReceivedEventBinding) :
+    inner class ViewHolder(itemView: View, val binding: LayoutReceivedEventBinding) :
         RecyclerView.ViewHolder(itemView) {
 
         fun bindData(receivedEventModel: ReceivedEventModel) {
             binding.item = receivedEventModel
+            binding.ivHead.setOnClickListener {
+                go2UserInfoActivity(
+                    mContext,
+                    binding.ivHead,
+                    UserModel(receivedEventModel.actor.login, receivedEventModel.actor.avatar_url)
+                )
+            }
         }
     }
 }

app/src/main/java/com/fmt/github/home/fragment/ReceivedEventFragment.kt

@@ -1,9 +1,9 @@
 package com.fmt.github.home.fragment
 
-import android.os.Bundle
 import androidx.paging.PagedListAdapter
 import com.fmt.github.base.fragment.BasePagingVMFragment
 import com.fmt.github.base.viewmodel.BaseViewModel
+import com.fmt.github.config.Settings
 import com.fmt.github.home.adapter.HomeAdapter
 import com.fmt.github.home.model.ReceivedEventModel
 import com.fmt.github.home.viewmodel.ReceivedEventViewModel
@@ -12,30 +12,12 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 class ReceivedEventFragment :
     BasePagingVMFragment<ReceivedEventModel, ReceivedEventViewModel, HomeAdapter.ViewHolder>() {
 
-    private var mUserName = ""
-
     private val mReceivedEventViewModel: ReceivedEventViewModel by viewModel()
 
     override fun getViewModel(): BaseViewModel = mReceivedEventViewModel
 
-    companion object {
-
-        const val KEY = "key"
-
-        fun newInstance(userName: String): ReceivedEventFragment {
-            val reposFragment = ReceivedEventFragment()
-            val arguments = Bundle()
-            arguments.putString(KEY, userName)
-            reposFragment.arguments = arguments
-            return reposFragment
-        }
-    }
-
     override fun afterViewCreated() {
-        arguments?.let {
-            mUserName = it.getString(KEY).toString()
-            mViewModel.user = mUserName
-        }
+        mViewModel.user = Settings.Account.loginUser
     }
 
     override fun getAdapter(): PagedListAdapter<ReceivedEventModel, HomeAdapter.ViewHolder> =

app/src/main/java/com/fmt/github/repos/activity/ReposDetailActivity.kt

@@ -1,5 +1,7 @@
 package com.fmt.github.repos.activity
 
+import android.content.Context
+import android.content.Intent
 import android.view.KeyEvent
 import android.view.View
 import android.widget.LinearLayout
@@ -124,4 +126,14 @@ class ReposDetailActivity : BaseVMActivity() {
         }.otherwise {
             super.onKeyDown(keyCode, event)
         }
+}
+
+fun go2ReposDetailActivity(context: Context, webUrl: String, repo: String, owner: String) {
+    with(Intent(context, ReposDetailActivity::class.java)) {
+        putExtra(ReposDetailActivity.WEB_URL, webUrl)
+        putExtra(ReposDetailActivity.REPO, repo)
+        putExtra(ReposDetailActivity.OWNER, owner)
+    }.run {
+        context.startActivity(this)
+    }
 }