添加动态页面

Author: fmtcias

.idea/codeStyles/codeStyleConfig.xml

@@ -2,7 +2,7 @@
 [![Platform](https://img.shields.io/badge/platform-Android-green.svg)](https://github.com/fmtjava/OpenGitHub)
 [![API](https://img.shields.io/badge/API-17%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=16)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Release Version](https://img.shields.io/badge/version-1.8-red.svg)](https://fir.im/8jw7)
+[![Release Version](https://img.shields.io/badge/version-1.9-red.svg)](https://fir.im/8jw7)
 [![](https://img.shields.io/badge/Author-fmtjava-blue.svg)](https://github.com/fmtjava)
 [![](https://img.shields.io/badge/QQ-2694746499-orange.svg)](https://github.com/fmtjava)<br />
 基于Kotlin + Jetpack全家桶 + Coroutines(协程) 等架构实现的一款精简版Github客户端项目。<br />
@@ -84,8 +84,12 @@ Model-View-ViewModel，View 指绿色的 Activity/Fragment，主要负责界面
    Glide相比起Fresco要轻量很多，api调用起来也很简洁，对图片加载要求不是很高的话建议使用Glide。
 
 # 更新日志
+### v1.9
+  * 添加动态页面
+  * 调整项目结构，优化代码
 ### v1.8
   * 添加App启动优化代码，提示App的启动速度
+  * 调整项目结构，优化代码
  ### v1.7
   * 使用协程进一步简化异步代码，增强代码的可读性
   * BaseActivity、BaseMVActivity等基类再次进行封装

.idea/misc.xml

@@ -12,8 +12,8 @@ android {
         applicationId "com.fmt.github"
         minSdkVersion 17
         targetSdkVersion 28
-        versionCode 8
-        versionName "1.8"
+        versionCode 9
+        versionName "1.9"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
@@ -38,6 +38,10 @@ android {
     androidExtensions {
         experimental = true
     }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
 }
 
 dependencies {
@@ -46,15 +50,15 @@ dependencies {
     //Androidx
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'
 
     //协程
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
 
     //Android KTX 是一组 Kotlin 扩展程序，属于 Android Jetpack 系列
     implementation 'androidx.core:core-ktx:1.2.0'
@@ -63,10 +67,10 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
 
 
-    //okhttp + retrofit(2.6.0支持协程)
+    //okhttp + retrofit(2.6.0以后支持协程)
     implementation("com.squareup.okhttp3:logging-interceptor:4.0.0")
-    implementation 'com.squareup.retrofit2:retrofit:2.6.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.7.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.7.1'
 
     //协程 + room
     implementation "androidx.room:room-runtime:2.2.5"
@@ -85,7 +89,7 @@ dependencies {
     implementation 'de.hdodenhof:circleimageview:3.0.0'
     implementation 'com.just.agentweb:agentweb:4.0.3-beta'
     implementation project(path: ':simplebehavior')
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    implementation 'com.github.bumptech.glide:glide:4.10.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'

.idea/vcs.xml

@@ -1,13 +1,18 @@
 package com.fmt.github.ext
 
+import android.graphics.Typeface
 import android.graphics.drawable.Drawable
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.StyleSpan
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
 import androidx.databinding.BindingConversion
 import com.bumptech.glide.Glide
 import com.fmt.github.AppContext
 import com.fmt.github.R
+import com.fmt.github.home.model.ReceivedEventModel
 import com.fmt.github.repos.model.ReposItemModel
 
 //DataBinding自定义属性
@@ -44,4 +49,42 @@ fun setReposLanguageBg(reposItemModel: ReposItemModel): Drawable? =
             "Dart" -> ContextCompat.getDrawable(AppContext, R.drawable.shape_dart_circular_bg)
             else -> ContextCompat.getDrawable(AppContext, R.drawable.shape_html_circular_bg)
         }
-    }
+    }
+
+@BindingConversion
+fun setReceivedEventImage(receivedEventModel: ReceivedEventModel): Drawable? =
+    when (receivedEventModel.type) {
+        "WatchEvent" -> ContextCompat.getDrawable(AppContext, R.mipmap.icon_star_yellow)
+        "ForkEvent", "PushEvent", "CreateEvent" -> ContextCompat.getDrawable(
+            AppContext,
+            R.mipmap.icon_fork_green
+        )
+        else -> null
+    }
+
+@BindingConversion
+fun setReceivedEventContent(receivedEventModel: ReceivedEventModel): CharSequence {
+    val actor = receivedEventModel.actor.display_login
+    val action = when (receivedEventModel.type) {
+        "WatchEvent" -> "starred"
+        "CreateEvent" -> "created"
+        "ForkEvent" -> "forked"
+        "PushEvent" -> "pushed"
+        else -> receivedEventModel.type
+    }
+
+    val repo = receivedEventModel.repo.name
+
+    //利用SpannableStringBuilder处理富文本
+    return SpannableStringBuilder().apply {
+        append("$actor $action $repo")
+
+        setSpan(StyleSpan(Typeface.BOLD), 0, actor.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        setSpan(
+            StyleSpan(Typeface.BOLD),
+            actor.length + action.length + 2,
+            actor.length + action.length + repo.length + 2,
+            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+    }
+}

README.md

@@ -19,6 +19,7 @@ import com.fmt.github.databinding.LayoutNavHeaderBinding
 import com.fmt.github.ext.showConfirmPopup
 import com.fmt.github.ext.yes
 import com.fmt.github.home.adapter.HomePageAdapter
+import com.fmt.github.home.fragment.HomeFragment
 import com.fmt.github.home.viewmodel.HomeViewModel
 import com.fmt.github.user.activity.AboutActivity
 import com.fmt.github.user.activity.LoginActivity
@@ -57,12 +58,13 @@ class HomeActivity : BaseVMActivity(), NavigationView.OnNavigationItemSelectedLi
             //Androidx的协程支持LifecycleScope、ViewModelScope
             mUser = mUserDao.getAll()[0]
             initHeaderLayout()
-            initViewPager()
+            initRecyclerView()
         }
     }
 
     private fun initHeaderLayout() {
-        val dataBind = LayoutNavHeaderBinding.inflate(LayoutInflater.from(this), mNavigationView,false)
+        val dataBind =
+            LayoutNavHeaderBinding.inflate(LayoutInflater.from(this), mNavigationView, false)
         dataBind.user = mUser
         mNavigationView.addHeaderView(dataBind.root)
     }
@@ -84,17 +86,14 @@ class HomeActivity : BaseVMActivity(), NavigationView.OnNavigationItemSelectedLi
             }
     }
 
-    private fun initViewPager() {
-        val fragmentList = mutableListOf<Fragment>().apply {
-            add(UserReposFragment.newInstance(mUser.login))
-            add(UserReposFragment.newInstance(mUser.login, true))
-        }
-        val homePageAdapter = HomePageAdapter(
-            supportFragmentManager, fragmentList,
-            FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT
+    private fun initRecyclerView() {
+        val beginTransaction = supportFragmentManager.beginTransaction()
+        beginTransaction.replace(
+            R.id.frameLayout,
+            HomeFragment.newInstance(mUser.login),
+            "Home_Fragment"
         )
-        mViewPager.adapter = homePageAdapter
-        mTabLayout.setupWithViewPager(mViewPager)
+        beginTransaction.commit()
     }
 
     override fun onNavigationItemSelected(menuItem: MenuItem): Boolean {

app/build.gradle

@@ -0,0 +1,74 @@
+package com.fmt.github.home.fragment
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.fmt.github.BR
+import com.fmt.github.R
+import com.fmt.github.base.fragment.BaseListMVFragment
+import com.fmt.github.base.viewmodel.BaseViewModel
+import com.fmt.github.databinding.LayoutReceivedEventBinding
+import com.fmt.github.home.model.ReceivedEventModel
+import com.fmt.github.home.viewmodel.HomeViewModel
+import com.fmt.github.repos.activity.ReposDetailActivity
+import com.github.nitrico.lastadapter.LastAdapter
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import com.github.nitrico.lastadapter.Type
+import kotlinx.android.synthetic.main.common_refresh_recyclerview.*
+
+class HomeFragment : BaseListMVFragment<ReceivedEventModel>() {
+
+    private var mUserName = ""
+
+    private val mViewModel: HomeViewModel by viewModel()
+
+    override fun getViewModel(): BaseViewModel = mViewModel
+
+    companion object {
+
+        const val KEY = "key"
+        const val BASE_WEB_URL = "https://github.com/"
+
+        fun newInstance(userName: String): HomeFragment {
+            val reposFragment = HomeFragment()
+            val arguments = Bundle()
+            arguments.putString(KEY, userName)
+            reposFragment.arguments = arguments
+            return reposFragment
+        }
+    }
+
+    override fun initRecyclerView() {
+        val type = Type<LayoutReceivedEventBinding>(R.layout.layout_received_event)
+            .onClick {
+                go2ReposDetailActivity(mListData[it.adapterPosition])
+            }
+        LastAdapter(mListData, BR.item)
+            .map<ReceivedEventModel>(type)
+            .into(mRecyclerView.apply {
+                layoutManager = LinearLayoutManager(mActivity)
+            })
+    }
+
+    override fun initData() {
+        arguments?.let {
+            mUserName = it.getString(KEY)
+            initViewModelAction()
+        }
+    }
+
+    override fun getListData() {
+        mViewModel.queryReceivedEvents(mUserName, mPage).observe(this, mListObserver)
+    }
+
+    private fun go2ReposDetailActivity(receivedEventModel: ReceivedEventModel) {
+        val splitArr = receivedEventModel.repo.name.split("/")
+        with(Intent(mActivity, ReposDetailActivity::class.java)) {
+            putExtra(ReposDetailActivity.WEB_URL, "${BASE_WEB_URL}${receivedEventModel.repo.name}")
+            putExtra(ReposDetailActivity.OWNER, splitArr[0])
+            putExtra(ReposDetailActivity.REPO, splitArr[1])
+        }.run {
+            startActivity(this)
+        }
+    }
+}

app/src/main/java/com/fmt/github/ext/DataBindExt.kt

@@ -0,0 +1,7 @@
+package com.fmt.github.home.model
+
+data class ReceivedEventModel(val id: String,val type:String,val actor: Actor,val repo:Repo,val created_at:String)
+
+data class Actor(val login:String,val display_login : String,val avatar_url: String)
+
+data class Repo(val name:String)

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

@@ -2,10 +2,15 @@ package com.fmt.github.home.viewmodel
 
 import androidx.lifecycle.LiveData
 import com.fmt.github.base.viewmodel.BaseViewModel
+import com.fmt.github.home.model.ReceivedEventModel
 import com.fmt.github.user.repository.UserRepository
 
 class HomeViewModel(private val mUserRepository: UserRepository) : BaseViewModel() {
 
+    fun queryReceivedEvents(user: String, page: Int): LiveData<List<ReceivedEventModel>> = emit {
+        mUserRepository.queryReceivedEvents(user, page)
+    }
+
     fun deleteAuthorization(id: Int): LiveData<Boolean> = emit {
         mUserRepository.deleteAuthorization(id).code() == 204
     }