Compose RepoDetailActivity (#57)

Goooler · web-flow · commit 2e08d99d56d3 · 2022-03-17T15:21:22.000+08:00
* Add DetailApi * Add moshi support * Add DetailViewModel * Use DetailViewModel * Add elements * Add click events * Observe vm.repoDetailModel * Increase fork count when clicking * Request in viewModelScope * Remove abiFilters limit * Expose immutable livedata * Rearrange * Use fullName as path param * Fix 404 in 6bb19a5 * Pass fullName to RepoDetailActivity * Fix nullable * Add accompanist deps * Add DetailPageWithSwipeRefresh * Add refresh state logic * Fill with max width * Move Composables to a new file * Fill with max size * Allow column scroll * Auto refresh * Move theme block into DetailPageWithSwipeRefresh * Revert "Auto refresh" This reverts commit 012720a.
diff --git a/app/src/main/kotlin/io/goooler/demoapp/RouterManagerImpl.kt b/app/src/main/kotlin/io/goooler/demoapp/RouterManagerImpl.kt
@@ -32,8 +32,9 @@ object RouterManagerImpl : RouterManager {
       .let(context::startActivity)
   }
 
-  override fun goRepoDetail(context: Context) {
+  override fun goRepoDetail(context: Context, fullName: String) {
     Intent(context, RepoDetailActivity::class.java)
+      .putExtra(RepoDetailActivity.FULL_NAME, fullName)
       .let(context::startActivity)
   }
 
diff --git a/buildSrc/src/main/kotlin/ProjectExtensions.kt b/buildSrc/src/main/kotlin/ProjectExtensions.kt
@@ -48,7 +48,6 @@ inline fun <reified T : BaseExtension> Project.setupBase(
     defaultConfig {
       minSdk = 21
       vectorDrawables.useSupportLibrary = true
-      ndk.abiFilters += setOf("arm64-v8a")
       testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     sourceSets.configureEach {
diff --git a/common/src/main/kotlin/io/goooler/demoapp/common/router/RouterManager.kt b/common/src/main/kotlin/io/goooler/demoapp/common/router/RouterManager.kt
@@ -10,7 +10,7 @@ interface RouterManager {
 
   fun goMain(context: Context)
 
-  fun goRepoDetail(context: Context)
+  fun goRepoDetail(context: Context, fullName: String)
 
   fun goAudioPlay(context: Context)
 
@@ -35,8 +35,8 @@ interface RouterManager {
       impl.goMain(context)
     }
 
-    override fun goRepoDetail(context: Context) {
-      impl.goRepoDetail(context)
+    override fun goRepoDetail(context: Context, fullName: String) {
+      impl.goRepoDetail(context, fullName)
     }
 
     override fun goAudioPlay(context: Context) {
diff --git a/detail/build.gradle.kts b/detail/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
   id(libs.plugins.android.library.get().pluginId)
   id(libs.plugins.kotlin.android.get().pluginId)
+  alias(libs.plugins.moshiX)
 }
 
 setupLib(LibModule.Detail) {
@@ -11,4 +12,7 @@ setupLib(LibModule.Detail) {
 dependencies {
   implementation(libs.androidX.activity.compose)
   implementation(libs.bundles.androidX.compose)
+  implementation(libs.bundles.accompanist)
+
+  implementation(libs.square.moshi)
 }
diff --git a/detail/src/main/kotlin/io/goooler/demoapp/detail/api/DetailApi.kt b/detail/src/main/kotlin/io/goooler/demoapp/detail/api/DetailApi.kt
@@ -0,0 +1,13 @@
+package io.goooler.demoapp.detail.api
+
+import io.goooler.demoapp.detail.bean.RepoDetailBean
+import retrofit2.http.GET
+import retrofit2.http.Path
+
+interface DetailApi {
+
+  @GET("https://api.github.com/repos/{fullName}")
+  suspend fun getRepoDetail(
+    @Path(value = "fullName", encoded = true) fullName: String
+  ): RepoDetailBean
+}
diff --git a/detail/src/main/kotlin/io/goooler/demoapp/detail/bean/RepoDetailBean.kt b/detail/src/main/kotlin/io/goooler/demoapp/detail/bean/RepoDetailBean.kt
@@ -0,0 +1,17 @@
+package io.goooler.demoapp.detail.bean
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+class RepoDetailBean(
+  @Json(name = "full_name") val fullName: String,
+  val description: String?,
+  @Json(name = "stargazers_count") val starsCount: Int,
+  @Json(name = "forks_count") val forksCount: Int,
+  @Json(name = "open_issues_count") val openIssuesCount: Int,
+  val license: License?
+) {
+  @JsonClass(generateAdapter = true)
+  class License(val name: String)
+}
diff --git a/detail/src/main/kotlin/io/goooler/demoapp/detail/model/RepoDetailModel.kt b/detail/src/main/kotlin/io/goooler/demoapp/detail/model/RepoDetailModel.kt
@@ -0,0 +1,10 @@
+package io.goooler.demoapp.detail.model
+
+data class RepoDetailModel(
+  val fullName: String = "",
+  val description: String = "",
+  val license: String = "",
+  val starsCount: Int = 0,
+  var forksCount: Int = 0,
+  val openIssuesCount: Int = 0
+)
diff --git a/detail/src/main/kotlin/io/goooler/demoapp/detail/repository/DetailRepository.kt b/detail/src/main/kotlin/io/goooler/demoapp/detail/repository/DetailRepository.kt
@@ -0,0 +1,10 @@
+package io.goooler.demoapp.detail.repository
+
+import io.goooler.demoapp.detail.api.DetailApi
+import io.goooler.demoapp.detail.bean.RepoDetailBean
+
+class DetailRepository(private val api: DetailApi) {
+
+  suspend fun getRepoDetail(fullName: String): RepoDetailBean =
+    api.getRepoDetail(fullName)
+}
diff --git a/detail/src/main/kotlin/io/goooler/demoapp/detail/ui/DetailPage.kt b/detail/src/main/kotlin/io/goooler/demoapp/detail/ui/DetailPage.kt
@@ -0,0 +1,113 @@
+package io.goooler.demoapp.detail.ui
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material.icons.filled.Star
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.google.accompanist.swiperefresh.SwipeRefresh
+import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import io.goooler.demoapp.common.util.showToast
+import io.goooler.demoapp.detail.model.RepoDetailModel
+
+@Composable
+fun DetailPageWithSwipeRefresh(
+  isRefreshing: Boolean,
+  onRefresh: () -> Unit,
+  model: RepoDetailModel,
+  onForkClick: () -> Unit
+) {
+  MaterialTheme {
+    SwipeRefresh(state = rememberSwipeRefreshState(isRefreshing), onRefresh = onRefresh) {
+      DetailPage(model, onForkClick)
+    }
+  }
+}
+
+@Composable
+fun DetailPage(model: RepoDetailModel, onForkClick: () -> Unit) {
+  var isDescExpanded by remember { mutableStateOf(false) }
+
+  Column(
+    modifier = Modifier
+      .padding(8.dp)
+      .fillMaxSize()
+      .verticalScroll(rememberScrollState())
+  ) {
+    Text(
+      text = model.fullName,
+      style = MaterialTheme.typography.h5,
+      maxLines = 1
+    )
+    Spacer(modifier = Modifier.height(5.dp))
+    Text(
+      text = model.description,
+      style = MaterialTheme.typography.body1,
+      maxLines = if (isDescExpanded) Int.MAX_VALUE else 2,
+      modifier = Modifier.clickable {
+        isDescExpanded = !isDescExpanded
+      }
+    )
+    Spacer(modifier = Modifier.height(5.dp))
+    Row {
+      Button(onClick = {
+        "All ${model.starsCount} stars".showToast()
+      }) {
+        Icon(
+          Icons.Filled.Star,
+          contentDescription = "Star",
+          modifier = Modifier.size(ButtonDefaults.IconSize)
+        )
+        Spacer(Modifier.size(ButtonDefaults.IconSpacing))
+        Text(model.starsCount.toString())
+      }
+      Spacer(modifier = Modifier.width(20.dp))
+      Button(onClick = onForkClick) {
+        Icon(
+          Icons.Filled.Share,
+          contentDescription = "Fork",
+          modifier = Modifier.size(ButtonDefaults.IconSize)
+        )
+        Spacer(Modifier.size(ButtonDefaults.IconSpacing))
+        Text(model.forksCount.toString())
+      }
+    }
+    Spacer(modifier = Modifier.height(5.dp))
+  }
+}
+
+@Preview
+@Composable
+fun DetailPagePreview() {
+  val model = RepoDetailModel(
+    "Compose/Demo",
+    "Jetpack Compose is Android’s modern toolkit for building native UI. It simplifies and accelerates UI development on Android. Quickly bring your app to life with less code, powerful tools, and intuitive Kotlin APIs.",
+    "Apache",
+    99,
+    1,
+    2
+  )
+  DetailPage(model) {}
+}
diff --git a/detail/src/main/kotlin/io/goooler/demoapp/detail/ui/RepoDetailActivity.kt b/detail/src/main/kotlin/io/goooler/demoapp/detail/ui/RepoDetailActivity.kt
@@ -2,23 +2,33 @@ package io.goooler.demoapp.detail.ui
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.activity.viewModels
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
 import io.goooler.demoapp.base.core.BaseActivity
+import io.goooler.demoapp.detail.vm.DetailViewModel
 
 class RepoDetailActivity : BaseActivity() {
 
+  private val vm: DetailViewModel by viewModels()
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
+
+    intent.getStringExtra(FULL_NAME)?.let {
+      vm.fullName = it
+      vm.refresh()
+    }
+
     setContent {
-      HelloScreen()
+      val model = vm.repoDetailModel.observeAsState().value
+        ?: throw IllegalArgumentException("RepoDetailModel has not been initialized")
+      val isRefreshing by vm.isRefreshing.observeAsState(false)
+      DetailPageWithSwipeRefresh(isRefreshing, vm::refresh, model, vm::fork)
     }
   }
-}
 
-@Preview
-@Composable
-fun HelloScreen() {
-  Text(text = "Hello Compose")
+  companion object {
+    const val FULL_NAME = "fullName"
+  }
 }
diff --git a/detail/src/main/kotlin/io/goooler/demoapp/detail/vm/DetailViewModel.kt b/detail/src/main/kotlin/io/goooler/demoapp/detail/vm/DetailViewModel.kt
@@ -0,0 +1,46 @@
+package io.goooler.demoapp.detail.vm
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import io.goooler.demoapp.base.core.BaseViewModel
+import io.goooler.demoapp.base.util.MutableBooleanLiveData
+import io.goooler.demoapp.common.network.RetrofitHelper
+import io.goooler.demoapp.detail.model.RepoDetailModel
+import io.goooler.demoapp.detail.repository.DetailRepository
+import kotlinx.coroutines.launch
+
+class DetailViewModel : BaseViewModel() {
+
+  private val repository = DetailRepository(RetrofitHelper.create())
+  private var repoDetail = RepoDetailModel()
+  private val _repoDetailModel = MutableLiveData(repoDetail)
+
+  lateinit var fullName: String
+  val repoDetailModel: LiveData<RepoDetailModel> = _repoDetailModel
+  val isRefreshing: MutableBooleanLiveData = MutableBooleanLiveData()
+
+  fun refresh() {
+    isRefreshing.value = true
+    viewModelScope.launch {
+      repository.getRepoDetail(fullName).let {
+        repoDetail = RepoDetailModel(
+          it.fullName,
+          it.description.orEmpty(),
+          it.license?.name.orEmpty(),
+          it.starsCount,
+          it.forksCount,
+          it.openIssuesCount
+        )
+      }
+      _repoDetailModel.value = repoDetail
+      isRefreshing.value = false
+    }
+  }
+
+  fun fork() {
+    repoDetail = repoDetail.copy()
+    repoDetail.forksCount++
+    _repoDetailModel.value = repoDetail
+  }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,4 +1,5 @@
 [versions]
+accompanist = "0.23.1"
 agp = "7.1.2"
 androidX-activity = "1.4.0"
 androidX-appCompat = "1.4.1"
@@ -78,6 +79,8 @@ square-retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", versi
 square-retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "square-retrofit" }
 square-retrofit-rxJava3 = { module = "com.squareup.retrofit2:adapter-rxjava3", version.ref = "square-retrofit" }
 
+google-accompanist-swipeRefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" }
+google-accompanist-systemUiController = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
 google-gson = "com.google.code.gson:gson:2.9.0"
 google-material = "com.google.android.material:material:1.5.0"
 
@@ -119,10 +122,9 @@ androidX-room = [
   "androidX-room-runtime",
   "androidX-room-ktx"
 ]
-srl = [
-  "srl-kernel",
-  "srl-header",
-  "srl-footer"
+accompanist = [
+  "google-accompanist-swipeRefresh",
+  "google-accompanist-systemUiController"
 ]
 coil = [
   "coil",
@@ -134,3 +136,8 @@ glide = [
   "glide-okhttp3",
   "glide-transformations"
 ]
+srl = [
+  "srl-kernel",
+  "srl-header",
+  "srl-footer"
+]
diff --git a/main/src/main/kotlin/io/goooler/demoapp/main/bean/MainRepoListBean.kt b/main/src/main/kotlin/io/goooler/demoapp/main/bean/MainRepoListBean.kt
@@ -27,6 +27,9 @@ class MainRepoListBean : BaseResponse() {
   @ColumnInfo
   var description: String? = null
 
+  @Json(name = "full_name")
+  var fullName: String = ""
+
   @Embedded
   var owner: OwnerBean? = null
 
diff --git a/main/src/main/kotlin/io/goooler/demoapp/main/model/MainCommonVhModel.kt b/main/src/main/kotlin/io/goooler/demoapp/main/model/MainCommonVhModel.kt
@@ -6,7 +6,8 @@ import io.goooler.demoapp.main.R
 
 sealed class MainCommonVhModel : IDiffVhModelType, ISpanSize {
 
-  class Repo(val logoUrl: String?, val content: String?) : MainCommonVhModel() {
+  class Repo(val logoUrl: String?, val content: String?, val fullName: String = "") :
+    MainCommonVhModel() {
 
     override val viewType: Int = R.layout.main_common_rv_item
 
@@ -18,7 +19,7 @@ sealed class MainCommonVhModel : IDiffVhModelType, ISpanSize {
     override fun isContentTheSame(that: IDiffVhModelType): Boolean = true
 
     interface OnEventListener {
-      fun onContentClick(content: String) {}
+      fun onContentClick(fullName: String) {}
       fun onItemClick(item: MainCommonVhModel) {}
     }
   }
diff --git a/main/src/main/kotlin/io/goooler/demoapp/main/ui/fragment/MainSrlFragment.kt b/main/src/main/kotlin/io/goooler/demoapp/main/ui/fragment/MainSrlFragment.kt
@@ -48,8 +48,8 @@ class MainSrlFragment : BaseBindingFragment<MainSrlFragmentBinding>() {
     OnRefreshLoadMoreListener,
     ItemTouchHelperCallback.ItemChangeListener,
     View.OnClickListener {
-    override fun onContentClick(content: String) {
-      RouterManager.goRepoDetail(requireContext())
+    override fun onContentClick(fullName: String) {
+      RouterManager.goRepoDetail(requireContext(), fullName)
     }
 
     override fun onRefresh(refreshLayout: RefreshLayout) {
diff --git a/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainSrlViewModel.kt b/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainSrlViewModel.kt
diff --git a/main/src/main/res/core/layout/main_common_rv_item.xml b/main/src/main/res/core/layout/main_common_rv_item.xml

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,9 @@ object RouterManagerImpl : RouterManager {`
`32`	`32`	`.let(context::startActivity)`
`33`	`33`	`}`
`34`	`34`
`35`		`- override fun goRepoDetail(context: Context) {`
	`35`	`+ override fun goRepoDetail(context: Context, fullName: String) {`
`36`	`36`	`Intent(context, RepoDetailActivity::class.java)`
	`37`	`+ .putExtra(RepoDetailActivity.FULL_NAME, fullName)`
`37`	`38`	`.let(context::startActivity)`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ inline fun <reified T : BaseExtension> Project.setupBase(`
`48`	`48`	`defaultConfig {`
`49`	`49`	`minSdk = 21`
`50`	`50`	`vectorDrawables.useSupportLibrary = true`
`51`		`- ndk.abiFilters += setOf("arm64-v8a")`
`52`	`51`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`53`	`52`	`}`
`54`	`53`	`sourceSets.configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ interface RouterManager {`
`10`	`10`
`11`	`11`	`fun goMain(context: Context)`
`12`	`12`
`13`		`- fun goRepoDetail(context: Context)`
	`13`	`+ fun goRepoDetail(context: Context, fullName: String)`
`14`	`14`
`15`	`15`	`fun goAudioPlay(context: Context)`
`16`	`16`
`@@ -35,8 +35,8 @@ interface RouterManager {`
`35`	`35`	`impl.goMain(context)`
`36`	`36`	`}`
`37`	`37`
`38`		`- override fun goRepoDetail(context: Context) {`
`39`		`- impl.goRepoDetail(context)`
	`38`	`+ override fun goRepoDetail(context: Context, fullName: String) {`
	`39`	`+ impl.goRepoDetail(context, fullName)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`override fun goAudioPlay(context: Context) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id(libs.plugins.android.library.get().pluginId)`
`3`	`3`	`id(libs.plugins.kotlin.android.get().pluginId)`
	`4`	`+ alias(libs.plugins.moshiX)`
`4`	`5`	`}`
`5`	`6`
`6`	`7`	`setupLib(LibModule.Detail) {`
`@@ -11,4 +12,7 @@ setupLib(LibModule.Detail) {`
`11`	`12`	`dependencies {`
`12`	`13`	`implementation(libs.androidX.activity.compose)`
`13`	`14`	`implementation(libs.bundles.androidX.compose)`
	`15`	`+ implementation(libs.bundles.accompanist)`
	`16`	`+`
	`17`	`+ implementation(libs.square.moshi)`
`14`	`18`	`}`