diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c33b7e4..7643783 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,6 +4,7 @@
+
@@ -14,6 +15,7 @@
xmlns:android
+
^$
@@ -24,6 +26,7 @@
xmlns:.*
+
^$
@@ -35,6 +38,7 @@
.*:id
+
http://schemas.android.com/apk/res/android
@@ -45,6 +49,7 @@
.*:name
+
http://schemas.android.com/apk/res/android
@@ -55,6 +60,7 @@
name
+
^$
@@ -65,6 +71,7 @@
style
+
^$
@@ -75,6 +82,7 @@
.*
+
^$
@@ -86,6 +94,7 @@
.*
+
http://schemas.android.com/apk/res/android
@@ -97,6 +106,7 @@
.*
+
.*
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index de96934..04e9edb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -24,6 +24,7 @@
+
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..16c711a
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 703e5d4..3378229 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index e3f8830..b035b91 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
}
}
- dataBinding {
- enabled = true
+ buildFeatures {
+ viewBinding true
}
}
@@ -23,12 +23,12 @@ dependencies {
implementation project(':views')
implementation project(':sql')
- //noinspection GradleDependency
- implementation "ca.allanwang.kau:core:${KAU}"
- //noinspection GradleDependency
- implementation "ca.allanwang.kau:core-ui:${KAU}"
- //noinspection GradleDependency
- implementation "ca.allanwang.kau:adapter:${KAU}"
+ implementation kau.Dependencies.kauCore(KAU)
+ implementation kau.Dependencies.kauCoreUi(KAU)
+ implementation kau.Dependencies.kauAdapter(KAU)
+ implementation kau.Dependencies.kauFastAdapter(KAU)
+ implementation kau.Dependencies.kauFastAdapterViewBinding(KAU)
+
implementation kau.Dependencies.coreKtx
implementation "androidx.browser:browser:${Versions.browser}"
implementation "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 37b635c..d0d1daa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,13 +12,13 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/Theme.GitDroid.Light"
+ android:theme="@style/Theme.GitDroid"
tools:ignore="GoogleAppIndexingWarning">
+ android:theme="@style/Theme.GitDroid.Splash.DayNight">
@@ -27,7 +27,7 @@
@@ -44,7 +44,7 @@
+ android:theme="@style/Theme.GitDroid" />
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/GitDroidApp.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/GitDroidApp.kt
index 27caf19..3265d02 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/GitDroidApp.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/GitDroidApp.kt
@@ -27,7 +27,7 @@ class GitDroidApp : Application() {
androidContext(this@GitDroidApp)
modules(
listOf(
- Prefs.module(this@GitDroidApp, "${BuildConfig.APPLICATION_ID}.prefs"),
+ Prefs.module(),
GitDroidData.module(this@GitDroidApp),
GitDb.module(AndroidSqliteDriver(Database.Schema, this@GitDroidApp, "gitdroid.db"))
)
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/BlobActivity.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/BlobActivity.kt
index 32cb694..9af6b48 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/BlobActivity.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/BlobActivity.kt
@@ -23,7 +23,7 @@ class BlobActivity : ToolbarActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- binding = bindContent(R.layout.view_blob)
+ binding = ViewBlobBinding.inflate(layoutInflater, contentRoot, true)
supportActionBar?.also {
it.title = fileName
}
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/IssueCommentActivity.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/IssueCommentActivity.kt
index e531649..291fc9d 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/IssueCommentActivity.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/IssueCommentActivity.kt
@@ -15,7 +15,7 @@ import ca.allanwang.gitdroid.utils.addAppBarView
import ca.allanwang.gitdroid.views.item.IssueCommentVhBinding
import ca.allanwang.gitdroid.views.item.PlaceholderVhBinding
import ca.allanwang.gitdroid.views.item.vh
-import ca.allanwang.gitdroid.views.utils.FastBindingAdapter
+import ca.allanwang.kau.adapters.SingleFastAdapter
import ca.allanwang.kau.utils.startActivity
import ca.allanwang.kau.utils.string
import ca.allanwang.kau.utils.withSceneTransitionAnimation
@@ -31,12 +31,12 @@ class IssueCommentActivity : ToolbarActivity() {
private val issueName by stringExtra { name }
- private val fastAdapter: FastBindingAdapter =
- FastBindingAdapter()
+ private val fastAdapter: SingleFastAdapter =
+ SingleFastAdapter()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- binding = bindContent(R.layout.view_refresh_recycler)
+ binding = ViewRefreshRecyclerBinding.inflate(layoutInflater, contentRoot, true)
binding.recycler.also {
it.adapter = fastAdapter
@@ -49,7 +49,7 @@ class IssueCommentActivity : ToolbarActivity() {
it.subtitle = repo.nameWithOwner
}
val headerBinding: HeaderIssueCommentBinding =
- toolbarBinding.viewToolbar.addAppBarView(R.layout.header_issue_comment)
+ toolbarBinding.viewToolbar.addAppBarView(HeaderIssueCommentBinding::inflate)
headerBinding.title.text = issueName
binding.refresh.setOnRefreshListener {
fastAdapter.clear()
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/LoginActivity.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/LoginActivity.kt
index 01bfc59..923c465 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/LoginActivity.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/LoginActivity.kt
@@ -6,12 +6,12 @@ import android.content.res.ColorStateList
import android.net.Uri
import android.os.Bundle
import androidx.cardview.widget.CardView
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
+import androidx.core.view.get
import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import androidx.transition.*
import androidx.transition.TransitionSet.ORDERING_SEQUENTIAL
import androidx.transition.TransitionSet.ORDERING_TOGETHER
+import androidx.viewbinding.ViewBinding
import ca.allanwang.gitdroid.R
import ca.allanwang.gitdroid.activity.base.BaseActivity
import ca.allanwang.gitdroid.data.GitDroidData
@@ -27,6 +27,8 @@ import ca.allanwang.gitdroid.utils.Prefs
import ca.allanwang.gitdroid.views.databinding.ViewLoginBinding
import ca.allanwang.gitdroid.views.databinding.ViewLoginContainerBinding
import ca.allanwang.gitdroid.views.databinding.ViewLoginSelectionBinding
+import ca.allanwang.gitdroid.views.item.ViewBindingBind
+import ca.allanwang.gitdroid.views.item.ViewBindingInflate
import ca.allanwang.kau.utils.resolveColor
import ca.allanwang.kau.utils.snackbar
import ca.allanwang.kau.utils.startActivity
@@ -43,7 +45,7 @@ class LoginActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
gitState = null
- sceneRoot = bindContentView(R.layout.view_login_container)
+ sceneRoot = bindContentView(ViewLoginContainerBinding::inflate)
showSelectorScene(false)
}
@@ -122,23 +124,20 @@ class LoginActivity : BaseActivity() {
* ------------------------------------------------------------
*/
- private fun currentSubBinding(): T? {
+ private fun inflateSubBinding(inflater: ViewBindingInflate): T =
+ inflater(layoutInflater, sceneRoot.loginContainerScene, false)
+
+ private fun bindSubBinding(binder: ViewBindingBind): T? {
if (sceneRoot.loginContainerScene.childCount == 0) {
return null
}
- return DataBindingUtil.getBinding(sceneRoot.loginContainerScene.getChildAt(0))
- }
-
- private fun inflateSubBinding(layoutRes: Int): T {
- return DataBindingUtil.inflate(
- layoutInflater,
- layoutRes, sceneRoot.loginContainerScene, false
- )
+ return binder(sceneRoot.loginContainerScene[0])
}
private fun showSelectorScene(animate: Boolean = true) {
loginPasswordPage = false
- val view: ViewLoginSelectionBinding = inflateSubBinding(R.layout.view_login_selection)
+ inflateSubBinding(ViewLoginSelectionBinding::inflate)
+ val view: ViewLoginSelectionBinding = inflateSubBinding(ViewLoginSelectionBinding::inflate)
view.loginSelectPassword.setOnClickListener {
showPasswordScene()
}
@@ -147,13 +146,16 @@ class LoginActivity : BaseActivity() {
gitState = request.state
launchUrl(Uri.parse(request.url))
}
- val oldView: ViewLoginBinding? = currentSubBinding()
+ val oldView: ViewLoginBinding? = bindSubBinding(ViewLoginBinding::bind)
val scene = Scene(sceneRoot.loginContainerScene, view.root)
val transition = if (animate) selectorSceneTransition(oldView, view) else null
TransitionManager.go(scene, transition)
}
- private fun selectorSceneTransition(oldView: ViewLoginBinding?, view: ViewLoginSelectionBinding): Transition =
+ private fun selectorSceneTransition(
+ oldView: ViewLoginBinding?,
+ view: ViewLoginSelectionBinding
+ ): Transition =
transitionSet {
val fosi = FastOutSlowInInterpolator()
add(Fade(Visibility.MODE_IN), R.id.login_select_oauth) {
@@ -161,7 +163,12 @@ class LoginActivity : BaseActivity() {
startDelay = 300L
}
add(TransitionSet()) {
- add(Fade(Visibility.MODE_OUT), R.id.login_user, R.id.login_password, R.id.login_send) {
+ add(
+ Fade(Visibility.MODE_OUT),
+ R.id.login_user,
+ R.id.login_password,
+ R.id.login_send
+ ) {
duration = 100L
}
add(TransitionSet()) {
@@ -177,7 +184,8 @@ class LoginActivity : BaseActivity() {
startColor = cardColor,
endColor = accentColor,
setter = { v, c ->
- (v as? MaterialButton)?.backgroundTintList = ColorStateList.valueOf(c)
+ (v as? MaterialButton)?.backgroundTintList =
+ ColorStateList.valueOf(c)
}),
R.id.login_select_password
) {
@@ -211,17 +219,20 @@ class LoginActivity : BaseActivity() {
private fun showPasswordScene(animate: Boolean = true) {
loginPasswordPage = true
- val view: ViewLoginBinding = inflateSubBinding(R.layout.view_login)
+ val view: ViewLoginBinding = inflateSubBinding(ViewLoginBinding::inflate)
view.loginSend.setOnClickListener {
showSelectorScene()
}
- val oldView: ViewLoginSelectionBinding? = currentSubBinding()
+ val oldView: ViewLoginSelectionBinding? = bindSubBinding(ViewLoginSelectionBinding::bind)
val scene = Scene(sceneRoot.loginContainerScene, view.root)
val transition = if (animate) passwordSceneTransition(oldView, view) else null
TransitionManager.go(scene, transition)
}
- private fun passwordSceneTransition(oldView: ViewLoginSelectionBinding?, view: ViewLoginBinding): Transition =
+ private fun passwordSceneTransition(
+ oldView: ViewLoginSelectionBinding?,
+ view: ViewLoginBinding
+ ): Transition =
transitionSet {
val fosi = FastOutSlowInInterpolator()
add(Fade(Visibility.MODE_OUT), R.id.login_select_oauth) {
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/MainActivity.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/MainActivity.kt
index 3c3a954..1c1ee75 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/MainActivity.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/MainActivity.kt
@@ -14,29 +14,29 @@ import ca.allanwang.gitdroid.databinding.ActivityMainBinding
import ca.allanwang.gitdroid.item.clickHook
import ca.allanwang.gitdroid.utils.ViewBottomNavRecyclerConfig
import ca.allanwang.gitdroid.utils.setLoader
-import ca.allanwang.gitdroid.views.item.GenericBindingItem
import ca.allanwang.gitdroid.views.item.IssuePrVhBinding
import ca.allanwang.gitdroid.views.item.RepoVhBinding
import ca.allanwang.gitdroid.views.item.vh
import ca.allanwang.gitdroid.views.itemdecoration.BottomNavDecoration
-import ca.allanwang.gitdroid.views.utils.FastBindingAdapter
+import ca.allanwang.kau.adapters.SingleFastAdapter
import ca.allanwang.kau.utils.snackbar
import com.google.android.material.navigation.NavigationView
+import com.mikepenz.fastadapter.GenericItem
-typealias GitCallVhList = GitCall>
+typealias GitCallVhList = GitCall>
class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
- lateinit var bindings: ActivityMainBinding
+ lateinit var binding: ActivityMainBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- bindings = bindContentView(R.layout.activity_main)
- bindings.bind()
+ binding = bindContentView(ActivityMainBinding::inflate)
+ binding.init()
bindLoader()
}
- private fun ActivityMainBinding.bind() {
+ private fun ActivityMainBinding.init() {
setSupportActionBar(viewToolbar.toolbar)
val toggle = ActionBarDrawerToggle(
this@MainActivity, drawerLayout, viewToolbar.toolbar,
@@ -63,22 +63,22 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
R.id.nav_bottom_prs to ::loadPullRequests
)
override val activity: BaseActivity = this@MainActivity
- override val adapter = FastBindingAdapter().apply {
+ override val adapter = SingleFastAdapter().apply {
addEventHook(RepoVhBinding.clickHook())
addEventHook(IssuePrVhBinding.clickHook())
}
}
- bindings.viewBottomNavRecycler.recycler.apply {
+ binding.viewRecycler.recycler.apply {
recycledViewPool.setMaxRecycledViews(RepoVhBinding.layoutRes, 20)
addItemDecoration(BottomNavDecoration(this@MainActivity))
}
- bindings.viewBottomNavRecycler.setLoader(config)
+ binding.setLoader(config)
}
override fun onBackPressed() {
- if (bindings.drawerLayout.isDrawerOpen(GravityCompat.START)) {
- bindings.drawerLayout.closeDrawer(GravityCompat.START)
+ if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+ binding.drawerLayout.closeDrawer(GravityCompat.START)
} else {
super.onBackPressed()
}
@@ -108,7 +108,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
}
else -> snackbar("Coming soon!")
}
- bindings.drawerLayout.closeDrawer(GravityCompat.START)
+ binding.drawerLayout.closeDrawer(GravityCompat.START)
return true
}
}
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/RepoActivity.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/RepoActivity.kt
index 9725436..735dd9f 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/RepoActivity.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/RepoActivity.kt
@@ -20,9 +20,9 @@ import ca.allanwang.gitdroid.utils.verifyLoaders
import ca.allanwang.gitdroid.viewmodel.RepoViewModel
import ca.allanwang.gitdroid.views.item.RefEntryVhBinding
import ca.allanwang.gitdroid.views.item.vh
-import ca.allanwang.gitdroid.views.utils.FastBindingAdapter
import ca.allanwang.gitdroid.views.utils.entries
import ca.allanwang.gitdroid.views.utils.lazyUi
+import ca.allanwang.kau.adapters.SingleFastAdapter
import ca.allanwang.kau.utils.materialDialog
import ca.allanwang.kau.utils.startActivity
import com.afollestad.materialdialogs.MaterialDialog
@@ -40,8 +40,8 @@ class RepoActivity : ToolbarActivity() {
private var currentRef: GitRef? = null
- private val refAdapter: FastBindingAdapter by lazyUi {
- FastBindingAdapter().apply {
+ private val refAdapter: SingleFastAdapter by lazyUi {
+ SingleFastAdapter().apply {
onClickListener = { _, _, item, _ ->
if (item is RefEntryVhBinding) {
if (!item.data.current) {
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/UserActivity.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/UserActivity.kt
index 4a8f669..7ab34ab 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/UserActivity.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/UserActivity.kt
@@ -11,7 +11,7 @@ import ca.allanwang.gitdroid.utils.RvAnimation
import ca.allanwang.gitdroid.views.item.RepoVhBinding
import ca.allanwang.gitdroid.views.item.SlimEntryVhBinding
import ca.allanwang.gitdroid.views.item.vhFull
-import ca.allanwang.gitdroid.views.utils.FastBindingAdapter
+import ca.allanwang.kau.adapters.SingleFastAdapter
import ca.allanwang.kau.utils.launchMain
import ca.allanwang.kau.utils.startActivity
import ca.allanwang.kau.utils.string
@@ -23,11 +23,11 @@ class UserActivity : ToolbarActivity() {
private val login by stringExtra { login }
- private val fastAdapter = FastBindingAdapter()
+ private val fastAdapter = SingleFastAdapter()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- binding = bindContent(R.layout.view_refresh_recycler)
+ binding = ViewRefreshRecyclerBinding.inflate(layoutInflater, contentRoot, true)
supportActionBar?.also {
it.title = login
}
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/base/BaseActivity.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/base/BaseActivity.kt
index 86b872b..9020e00 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/base/BaseActivity.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/base/BaseActivity.kt
@@ -5,26 +5,24 @@ import android.graphics.Color
import android.os.Build
import android.view.Menu
import android.view.MenuItem
-import android.view.ViewGroup
-import androidx.annotation.LayoutRes
import androidx.annotation.MenuRes
import androidx.core.view.forEach
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
+import androidx.viewbinding.ViewBinding
import ca.allanwang.gitdroid.BuildConfig
import ca.allanwang.gitdroid.R
import ca.allanwang.gitdroid.activity.LoginActivity
import ca.allanwang.gitdroid.activity.MainActivity
-import ca.allanwang.gitdroid.data.gql.GitCall
import ca.allanwang.gitdroid.data.GitDroidData
+import ca.allanwang.gitdroid.data.gql.GitCall
import ca.allanwang.gitdroid.logger.L
import ca.allanwang.gitdroid.sql.Database
import ca.allanwang.gitdroid.sql.awaitOptional
import ca.allanwang.gitdroid.utils.Prefs
import ca.allanwang.gitdroid.viewmodel.base.BaseViewModel
+import ca.allanwang.gitdroid.views.item.ViewBindingInflate
import ca.allanwang.kau.internal.KauBaseActivity
import ca.allanwang.kau.utils.materialDialog
import ca.allanwang.kau.utils.snackbar
@@ -41,8 +39,11 @@ abstract class BaseActivity : KauBaseActivity() {
val db: Database by inject()
val gdd: GitDroidData by inject()
- fun bindContentView(@LayoutRes layoutRes: Int): T =
- DataBindingUtil.setContentView(this, layoutRes)
+ fun bindContentView(inflater: ViewBindingInflate): T {
+ val binding: T = inflater(layoutInflater, null, false)
+ setContentView(binding.root)
+ return binding
+ }
/**
* Returns current user based on token
@@ -94,18 +95,11 @@ abstract class BaseActivity : KauBaseActivity() {
}
}
- fun bindView(
- parent: ViewGroup,
- layoutRes: Int,
- attachToParent: Boolean = true,
- action: T.() -> Unit = {}
- ): T {
- val binding: T = DataBindingUtil.inflate(layoutInflater, layoutRes, parent, attachToParent)
- binding.action()
- return binding
- }
-
- inline fun viewModel(factory: ViewModelProvider.Factory? = BaseViewModel.Factory(intent.extras)) =
+ inline fun viewModel(
+ factory: ViewModelProvider.Factory? = BaseViewModel.Factory(
+ intent.extras
+ )
+ ) =
ViewModelProviders.of(this, factory).get(T::class.java)
fun inflateMenu(@MenuRes menuRes: Int, menu: Menu) {
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/base/ToolbarActivity.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/base/ToolbarActivity.kt
index 1225696..072bb1a 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/activity/base/ToolbarActivity.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/activity/base/ToolbarActivity.kt
@@ -1,9 +1,7 @@
package ca.allanwang.gitdroid.activity.base
import android.os.Bundle
-import androidx.annotation.LayoutRes
-import androidx.databinding.ViewDataBinding
-import ca.allanwang.gitdroid.R
+import android.view.ViewGroup
import ca.allanwang.gitdroid.databinding.ActivityBaseToolbarBinding
abstract class ToolbarActivity : IntentActivity() {
@@ -12,7 +10,8 @@ abstract class ToolbarActivity : IntentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- toolbarBinding = bindContentView(R.layout.activity_base_toolbar)
+ toolbarBinding = ActivityBaseToolbarBinding.inflate(layoutInflater)
+ setContentView(toolbarBinding.root)
setSupportActionBar(toolbarBinding.viewToolbar.toolbar)
supportActionBar?.also {
it.setDisplayShowHomeEnabled(true)
@@ -20,7 +19,6 @@ abstract class ToolbarActivity : IntentActivity() {
}
}
- fun bindContent(@LayoutRes layoutRes: Int): T =
- bindView(toolbarBinding.contentContainer, layoutRes, true)
+ protected val contentRoot: ViewGroup get() = toolbarBinding.contentContainer
}
\ No newline at end of file
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/RepoFileFragment.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/RepoFileFragment.kt
index 2b9d4b9..30d8cdd 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/RepoFileFragment.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/RepoFileFragment.kt
@@ -1,7 +1,8 @@
package ca.allanwang.gitdroid.fragment
import android.os.Bundle
-import android.view.View
+import android.view.LayoutInflater
+import android.view.ViewGroup
import ca.allanwang.gitdroid.R
import ca.allanwang.gitdroid.activity.BlobActivity
import ca.allanwang.gitdroid.fragment.base.BaseFragment
@@ -12,17 +13,15 @@ import ca.allanwang.gitdroid.views.item.PlaceholderVhBinding
import ca.allanwang.gitdroid.views.item.TreeEntryVhBinding
import ca.allanwang.gitdroid.views.item.vh
import ca.allanwang.gitdroid.views.itemdecoration.BottomNavDecoration
-import ca.allanwang.gitdroid.views.utils.FastBindingAdapter
import ca.allanwang.gitdroid.views.utils.PathCrumb
import ca.allanwang.gitdroid.views.utils.lazyUi
+import ca.allanwang.kau.adapters.SingleFastAdapter
import github.fragment.TreeEntryItem
class RepoFileFragment : BaseFragment() {
- override val layoutRes: Int
- get() = R.layout.view_repo_files
- private val fastAdapter: FastBindingAdapter by lazyUi {
- FastBindingAdapter().apply {
+ private val fastAdapter: SingleFastAdapter by lazyUi {
+ SingleFastAdapter().apply {
onClickListener = { _, _, item, _ ->
if (item is TreeEntryVhBinding) {
onClick(item.data)
@@ -41,7 +40,14 @@ class RepoFileFragment : BaseFragment() {
model = viewModel()
}
- override fun ViewRepoFilesBinding.onViewCreated(view: View, savedInstanceState: Bundle?) {
+ override fun createBinding(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): ViewRepoFilesBinding =
+ ViewRepoFilesBinding.inflate(inflater, container, false).also { it.init() }
+
+ private fun ViewRepoFilesBinding.init() {
repoRecycler.apply {
adapter = fastAdapter
addItemDecoration(BottomNavDecoration(context))
@@ -78,9 +84,6 @@ class RepoFileFragment : BaseFragment() {
}
}
- override fun ViewRepoFilesBinding.onActivityCreated(savedInstanceState: Bundle?) {
- }
-
override fun onDestroyView() {
super.onDestroyView()
fastAdapter.clear()
@@ -127,10 +130,10 @@ class RepoFileFragment : BaseFragment() {
}
}
} else {
- binding?.repoPathCrumbs?.addCrumb(PathCrumb(data.name, data.oid))
+ _binding?.repoPathCrumbs?.addCrumb(PathCrumb(data.name, data.oid))
model.entryLoader(data.oid).execute()
}
}
- override fun onBackPressed(): Boolean = binding?.repoPathCrumbs?.onBackPressed() ?: false
+ override fun onBackPressed(): Boolean = _binding?.repoPathCrumbs?.onBackPressed() ?: false
}
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/RepoOverviewFragment.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/RepoOverviewFragment.kt
index c75b259..fcf54b6 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/RepoOverviewFragment.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/RepoOverviewFragment.kt
@@ -1,7 +1,9 @@
package ca.allanwang.gitdroid.fragment
import android.os.Bundle
+import android.view.LayoutInflater
import android.view.View
+import android.view.ViewGroup
import ca.allanwang.gitdroid.R
import ca.allanwang.gitdroid.databinding.ViewRefreshRecyclerBinding
import ca.allanwang.gitdroid.fragment.base.BaseFragment
@@ -11,13 +13,13 @@ import ca.allanwang.gitdroid.views.item.RepoVhBinding
import ca.allanwang.gitdroid.views.item.SlimEntryVhBinding
import ca.allanwang.gitdroid.views.item.vhFull
import ca.allanwang.gitdroid.views.itemdecoration.BottomNavDecoration
-import ca.allanwang.gitdroid.views.utils.FastBindingAdapter
import ca.allanwang.gitdroid.views.utils.lazyUi
+import ca.allanwang.kau.adapters.SingleFastAdapter
class RepoOverviewFragment : BaseFragment() {
- private val fastAdapter: FastBindingAdapter by lazyUi {
- FastBindingAdapter().apply {
+ private val fastAdapter: SingleFastAdapter by lazyUi {
+ SingleFastAdapter().apply {
addEventHook(RepoVhBinding.clickHook())
addEventHook(SlimEntryVhBinding.clickHook())
}
@@ -30,7 +32,13 @@ class RepoOverviewFragment : BaseFragment() {
model = viewModel()
}
- override fun ViewRefreshRecyclerBinding.onViewCreated(view: View, savedInstanceState: Bundle?) {
+ override fun createBinding(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): ViewRefreshRecyclerBinding = ViewRefreshRecyclerBinding.inflate(inflater, container, false).also { it.init() }
+
+ private fun ViewRefreshRecyclerBinding.init() {
recycler.apply {
adapter = fastAdapter
addItemDecoration(BottomNavDecoration(context))
@@ -46,7 +54,4 @@ class RepoOverviewFragment : BaseFragment() {
}
}
- override val layoutRes: Int
- get() = R.layout.view_refresh_recycler
-
}
\ No newline at end of file
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/base/BaseFragment.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/base/BaseFragment.kt
index 19fa475..546330c 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/base/BaseFragment.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/fragment/base/BaseFragment.kt
@@ -4,36 +4,38 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import androidx.annotation.LayoutRes
import androidx.annotation.MainThread
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
import androidx.fragment.app.Fragment
import androidx.lifecycle.*
+import androidx.viewbinding.ViewBinding
import ca.allanwang.gitdroid.R
import ca.allanwang.gitdroid.viewmodel.base.*
import ca.allanwang.gitdroid.views.components.SwipeRefreshLayout
import ca.allanwang.gitdroid.views.item.PlaceholderVhBinding
-import ca.allanwang.gitdroid.views.utils.FastBindingAdapter
+import ca.allanwang.kau.adapters.SingleFastAdapter
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
-abstract class BaseFragment : Fragment() {
+abstract class BaseFragment : Fragment() {
- val binding: Binding?
- get() = view?.let { DataBindingUtil.getBinding(it) }
+ protected var _binding: Binding? = null
- abstract val layoutRes: Int
- @LayoutRes get
+ val binding: Binding get() = _binding!!
- final override fun onCreateView(
+ abstract fun createBinding(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): Binding
+
+ override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
- val binding: Binding = DataBindingUtil.inflate(inflater, layoutRes, container, false)
- return binding.root
+ _binding = createBinding(inflater, container, savedInstanceState)
+ return _binding?.root
}
@MainThread
@@ -77,7 +79,7 @@ abstract class BaseFragment : Fragment() {
@MainThread
fun LoadingLiveData.observeAdapter(
- adapter: FastBindingAdapter,
+ adapter: SingleFastAdapter,
onLoad: (data: T) -> Unit
): Observer> {
return observe(viewLifecycleOwner) { result ->
@@ -93,27 +95,20 @@ abstract class BaseFragment : Fragment() {
}
}
- inline fun viewModel(factory: ViewModelProvider.Factory? = BaseViewModel.Factory(arguments)) =
- ViewModelProviders.of(
- activity ?: throw RuntimeException("Activity not created, cannot initiate viewmodel"),
- factory
- ).get(T::class.java)
-
- final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
- DataBindingUtil.getBinding(view)?.onViewCreated(view, savedInstanceState)
- }
-
- open fun Binding.onViewCreated(view: View, savedInstanceState: Bundle?) {}
-
-
- final override fun onActivityCreated(savedInstanceState: Bundle?) {
- super.onActivityCreated(savedInstanceState)
- binding?.onActivityCreated(savedInstanceState)
+ inline fun viewModel(
+ factory: ViewModelProvider.Factory? = BaseViewModel.Factory(
+ arguments
+ )
+ ) = ViewModelProviders.of(
+ activity ?: throw RuntimeException("Activity not created, cannot initiate viewmodel"),
+ factory
+ ).get(T::class.java)
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ _binding = null
}
- open fun Binding.onActivityCreated(savedInstanceState: Bundle?) {}
-
/**
* Called when a back press event is received.
* Return true if it is handled
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/item/ClickEvents.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/item/ClickEvents.kt
index 5debd2a..e23e6ab 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/item/ClickEvents.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/item/ClickEvents.kt
@@ -2,6 +2,7 @@ package ca.allanwang.gitdroid.item
import android.view.View
import androidx.recyclerview.widget.RecyclerView
+import ca.allanwang.fastadapter.viewbinding.BindingClickEventHook
import ca.allanwang.gitdroid.activity.IssueCommentActivity
import ca.allanwang.gitdroid.activity.RepoActivity
import ca.allanwang.gitdroid.activity.UserActivity
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/utils/Animations.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/utils/Animations.kt
index 08c715c..288ded3 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/utils/Animations.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/utils/Animations.kt
@@ -2,8 +2,8 @@ package ca.allanwang.gitdroid.utils
import androidx.interpolator.view.animation.FastOutSlowInInterpolator
import androidx.recyclerview.widget.RecyclerView
-import ca.allanwang.gitdroid.views.utils.FastBindingAdapter
import ca.allanwang.gitdroid.views.utils.fastAdapter
+import ca.allanwang.kau.adapters.SingleFastAdapter
import ca.allanwang.kau.animators.*
import ca.allanwang.kau.utils.KAU_BOTTOM
@@ -42,7 +42,7 @@ enum class RvAnimation(val animator: RecyclerView.ItemAnimator) {
companion object {
const val THRESHOLD = 300L
- fun set(recyclerView: RecyclerView, adapter: FastBindingAdapter = recyclerView.fastAdapter) {
+ fun set(recyclerView: RecyclerView, adapter: SingleFastAdapter = recyclerView.fastAdapter) {
val anim = if (System.currentTimeMillis() - adapter.lastClearTime > THRESHOLD) SMOOTH else FAST
anim.set(recyclerView)
}
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/utils/Prefs.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/utils/Prefs.kt
index ec6d472..4d13067 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/utils/Prefs.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/utils/Prefs.kt
@@ -1,11 +1,13 @@
package ca.allanwang.gitdroid.utils
-import android.content.Context
+import ca.allanwang.gitdroid.BuildConfig
import ca.allanwang.gitdroid.data.TokenSupplier
import ca.allanwang.kau.kpref.KPref
+import ca.allanwang.kau.kpref.KPrefFactory
+import ca.allanwang.kau.kpref.KPrefFactoryAndroid
import org.koin.dsl.module
-class Prefs : KPref() {
+class Prefs(factory: KPrefFactory) : KPref("${BuildConfig.APPLICATION_ID}.prefs", factory) {
var versionCode: Int by kpref("version_code", -1)
@@ -20,11 +22,9 @@ class Prefs : KPref() {
var token: String by kpref("token", "")
companion object {
- fun module(context: Context, name: String) = module {
+ fun module() = module {
single {
- val prefs = Prefs()
- prefs.initialize(context, name)
- prefs
+ Prefs(KPrefFactoryAndroid(get()))
}
single {
val prefs: Prefs = get()
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/utils/ViewUtils.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/utils/ViewUtils.kt
index 285c5e7..587cd4c 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/utils/ViewUtils.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/utils/ViewUtils.kt
@@ -5,23 +5,23 @@ import android.view.View
import androidx.annotation.MenuRes
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.children
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
import androidx.lifecycle.lifecycleScope
+import androidx.viewbinding.ViewBinding
import ca.allanwang.gitdroid.R
import ca.allanwang.gitdroid.activity.GitCallVhList
import ca.allanwang.gitdroid.activity.base.BaseActivity
import ca.allanwang.gitdroid.databinding.ActivityBaseToolbarBinding
+import ca.allanwang.gitdroid.databinding.ActivityMainBinding
import ca.allanwang.gitdroid.databinding.ViewBottomNavBinding
-import ca.allanwang.gitdroid.databinding.ViewBottomNavRecyclerBinding
import ca.allanwang.gitdroid.databinding.ViewToolbarBinding
import ca.allanwang.gitdroid.logger.L
-import ca.allanwang.gitdroid.views.item.GenericBindingItem
-import ca.allanwang.gitdroid.views.utils.FastBindingAdapter
+import ca.allanwang.gitdroid.views.item.ViewBindingInflate
+import ca.allanwang.kau.adapters.SingleFastAdapter
import ca.allanwang.kau.utils.launchMain
import ca.allanwang.kau.utils.snackbar
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.mikepenz.fastadapter.GenericItem
import kotlinx.coroutines.CancellationException
fun View.setCoordinatorLayoutScrollingBehaviour() {
@@ -44,8 +44,8 @@ fun ActivityBaseToolbarBinding.addBottomNavBar(): BottomNavigationView {
}
-fun ViewToolbarBinding.addAppBarView(layoutRes: Int): T {
- val binding: T = DataBindingUtil.inflate(LayoutInflater.from(appbar.context), layoutRes, appbar, false)
+fun ViewToolbarBinding.addAppBarView(inflater: ViewBindingInflate): T {
+ val binding: T = inflater(LayoutInflater.from(appbar.context), appbar, false)
addAppBarView(binding.root)
return binding
}
@@ -71,7 +71,7 @@ interface ViewBottomNavRecyclerConfig {
val activity: BaseActivity
- val adapter: FastBindingAdapter
+ val adapter: SingleFastAdapter
}
interface ViewBottomNavRecyclerLoader {
@@ -83,7 +83,11 @@ interface ViewBottomNavRecyclerLoader {
fun request(id: Int, forceRefresh: Boolean)
}
-fun ViewBottomNavRecyclerBinding.setLoader(config: ViewBottomNavRecyclerConfig): ViewBottomNavRecyclerLoader {
+fun ActivityMainBinding.setLoader(config: ViewBottomNavRecyclerConfig): ViewBottomNavRecyclerLoader {
+ val bottomNavigation = viewBottomNav.bottomNavigation
+ val recycler = viewRecycler.recycler
+ val refresh = viewRecycler.refresh
+
bottomNavigation.menu.clear()
bottomNavigation.inflateMenu(config.menuRes)
val loaders = config.loaders
@@ -91,7 +95,7 @@ fun ViewBottomNavRecyclerBinding.setLoader(config: ViewBottomNavRecyclerConfig):
bottomNavigation.verifyLoaders(loaders.keys)
- val cache = mutableMapOf>()
+ val cache = mutableMapOf>()
val pending = mutableSetOf()
diff --git a/app/src/main/kotlin/ca/allanwang/gitdroid/viewmodel/base/BaseViewModel.kt b/app/src/main/kotlin/ca/allanwang/gitdroid/viewmodel/base/BaseViewModel.kt
index 3b35e74..b87944c 100644
--- a/app/src/main/kotlin/ca/allanwang/gitdroid/viewmodel/base/BaseViewModel.kt
+++ b/app/src/main/kotlin/ca/allanwang/gitdroid/viewmodel/base/BaseViewModel.kt
@@ -5,23 +5,22 @@ import androidx.annotation.CheckResult
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewModelScope
-import ca.allanwang.gitdroid.data.gql.GitCall
import ca.allanwang.gitdroid.data.GitDroidData
+import ca.allanwang.gitdroid.data.gql.GitCall
import ca.allanwang.gitdroid.logger.L
import ca.allanwang.gitdroid.sql.Database
import com.apollographql.apollo.api.Error
-import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.channels.BroadcastChannel
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.launch
import org.koin.core.KoinComponent
import org.koin.core.inject
-@ExperimentalCoroutinesApi
open class BaseViewModel : ViewModel(), KoinComponent {
val db: Database by inject()
val gdd: GitDroidData by inject()
+
/**
* Post error
*/
@@ -40,7 +39,10 @@ open class BaseViewModel : ViewModel(), KoinComponent {
protected open fun withBundle(bundle: Bundle) {}
@CheckResult(suggest = "Apply using execute")
- protected fun gitCallLaunch(liveData: LoadingLiveData, call: GitCall): GitCallExecutor =
+ protected fun gitCallLaunch(
+ liveData: LoadingLiveData,
+ call: GitCall
+ ): GitCallExecutor =
object : GitCallExecutor {
override fun execute(forceRefresh: Boolean) {
liveData.value = Loading
@@ -75,7 +77,6 @@ interface GitCallExecutor {
fun execute(forceRefresh: Boolean = false)
}
-
typealias LoadingLiveData = MutableLiveDataKtx>
typealias LoadingListLiveData = LoadingLiveData>
diff --git a/app/src/main/res/color/accent_ripple.xml b/app/src/main/res/color/accent_ripple.xml
index d013943..0616f17 100644
--- a/app/src/main/res/color/accent_ripple.xml
+++ b/app/src/main/res/color/accent_ripple.xml
@@ -1,4 +1,4 @@
- - () {
-
- private fun RecyclerView.ViewHolder.binding(): Binding? {
- val holder = this as? BindingItem.ViewHolder ?: return null
- if (holder.layoutRes != identifier.layoutRes) {
- return null
- }
- return DataBindingUtil.getBinding(itemView)
- }
-
- final override fun onBind(viewHolder: RecyclerView.ViewHolder): View? =
- viewHolder.binding()?.onBind(viewHolder) ?: super.onBind(viewHolder)
-
- open fun Binding.onBind(viewHolder: RecyclerView.ViewHolder): View? = super.onBind(viewHolder)
-
- final override fun onBindMany(viewHolder: RecyclerView.ViewHolder): List? =
- viewHolder.binding()?.onBindMany(viewHolder) ?: super.onBindMany(viewHolder)
-
- open fun Binding.onBindMany(viewHolder: RecyclerView.ViewHolder): List? = super.onBindMany(viewHolder)
-
- final override fun onClick(v: View, position: Int, fastAdapter: FastAdapter
- , item: Item) {
- val binding: Binding = DataBindingUtil.findBinding(v) ?: return
- binding.onClick(v, position, fastAdapter, item)
- }
-
- abstract fun Binding.onClick(v: View, position: Int, fastAdapter: FastAdapter
- , item: Item)
+fun BindingItem<*>.unbind(vararg textView: TextView) {
+ textView.forEach { it.text = null }
}
\ No newline at end of file
diff --git a/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/BindingItems.kt b/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/BindingItems.kt
index d61c35d..f2047f6 100644
--- a/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/BindingItems.kt
+++ b/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/BindingItems.kt
@@ -1,22 +1,28 @@
package ca.allanwang.gitdroid.views.item
+import android.view.LayoutInflater
+import android.view.ViewGroup
import androidx.annotation.StringRes
-import androidx.databinding.ViewDataBinding
+import ca.allanwang.fastadapter.viewbinding.BindingItem
+import ca.allanwang.fastadapter.viewbinding.BindingLayout
import ca.allanwang.gitdroid.data.GitObjectID
+import ca.allanwang.gitdroid.data.gitNameAndOwner
import ca.allanwang.gitdroid.views.R
import ca.allanwang.gitdroid.views.databinding.*
import ca.allanwang.gitdroid.views.utils.*
+import ca.allanwang.kau.utils.drawable
import com.mikepenz.fastadapter.FastAdapter
import github.GetProfileQuery
import github.fragment.*
-open class BlankViewHolderBinding(override val layoutRes: Int) : BindingItem(Unit) {
- final override fun ViewDataBinding.bindView(holder: ViewHolder, payloads: MutableList) {}
- final override fun ViewDataBinding.unbindView(holder: ViewHolder) {}
-}
-
abstract class IssuePrVhBinding(override val data: GitIssueOrPr, override val type: Int) :
- BindingItem(data), BindingLayout by Companion {
+ BindingItem(data),
+ BindingLayout by Companion {
+
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewIssueOrPrItemBinding = ViewIssueOrPrItemBinding.inflate(layoutInflater, parent, false)
override fun ViewIssueOrPrItemBinding.unbindView(holder: ViewHolder) {
unbindGlide(iprAvatar)
@@ -30,29 +36,69 @@ abstract class IssuePrVhBinding(override val data: GitIssueOrPr, override val ty
}
class IssueVhBinding(data: ShortIssueRowItem) :
- IssuePrVhBinding(data.issueOrPr(), R.id.git_vh_issue)
+ IssuePrVhBinding(data.issueOrPr(), R.id.git_vh_issue) {
+ override fun ViewIssueOrPrItemBinding.bindView(holder: ViewHolder, payloads: MutableList) {
+ iprAvatar.glideRound(data.avatarUrl)
+ iprLogin.text = data.login
+ iprDate.relativeDateText(data.createdAt)
+ iprTitle.text = data.title
+ iprDetails.text = "${data.nameWithOwner}#${data.number}"
+ iprLocked.goneFlag(!data.locked)
+ iprComments.apply {
+ compactNumberText(data.commentCount)
+ goneFlag(data.commentCount)
+ }
+ }
+}
class PullRequestVhBinding(data: ShortPullRequestRowItem) :
- IssuePrVhBinding(data.issueOrPr(), R.id.git_vh_pr)
+ IssuePrVhBinding(data.issueOrPr(), R.id.git_vh_pr) {
+ override fun ViewIssueOrPrItemBinding.bindView(holder: ViewHolder, payloads: MutableList) {
+ iprAvatar.glideRound(data.avatarUrl)
+ iprLogin.text = data.login
+ iprDate.relativeDateText(data.createdAt)
+ iprTitle.text = data.title
+ iprDetails.text = "${data.nameWithOwner}#${data.number}"
+ iprLocked.goneFlag(!data.locked)
+ iprComments.apply {
+ compactNumberText(data.commentCount)
+ goneFlag(data.commentCount)
+ }
+ }
+}
class RepoVhBinding(override val data: ShortRepoRowItem) :
BindingItem(data), BindingLayout by Companion {
-// override fun ViewRepoBinding.bindView(holder: ViewHolder, payloads: MutableList) {
-// repoName.text = data.nameAndOwner().name
-// repoDesc.text = data.description
-// repoDesc.goneFlag(data.description)
-// repoStars.compactNumberText(data.stargazers.totalCount)
-// repoForks.compactNumberText(data.forks.totalCount)
-// repoPrs.compactNumberText(data.pullRequests.totalCount)
-// repoLanguage.text = data.primaryLanguage?.name
-// repoLanguage.languageColor(data.primaryLanguage?.color)
-// repoDate.relativeDateText(data.pushedAt)
-// }
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewRepoBinding = ViewRepoBinding.inflate(layoutInflater, parent, false)
+
+ override fun ViewRepoBinding.bindView(holder: ViewHolder, payloads: MutableList) {
+ repoName.text = data.gitNameAndOwner().name
+ repoDesc.text = data.description
+ repoDesc.goneFlag(data.description)
+ repoStars.compactNumberText(data.stargazers.totalCount)
+ repoForks.compactNumberText(data.forks.totalCount)
+ repoPrs.compactNumberText(data.pullRequests.totalCount)
+ repoLanguage.text = data.primaryLanguage?.name
+ repoLanguage.languageColor(data.primaryLanguage?.color)
+ repoDate.relativeDateText(data.pushedAt)
+ }
override fun ViewRepoBinding.unbindView(holder: ViewHolder) {
- unbind(repoName, repoDesc, repoStars, repoForks, repoIssues, repoPrs, repoLanguage, repoDate)
+ unbind(
+ repoName,
+ repoDesc,
+ repoStars,
+ repoForks,
+ repoIssues,
+ repoPrs,
+ repoLanguage,
+ repoDate
+ )
}
companion object : BindingLayout {
@@ -64,6 +110,17 @@ class RepoVhBinding(override val data: ShortRepoRowItem) :
class SlimEntryVhBinding(override val data: SlimEntry) :
BindingItem(data), BindingLayout by Companion {
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewSlimEntryBinding = ViewSlimEntryBinding.inflate(layoutInflater, parent, false)
+
+ override fun ViewSlimEntryBinding.bindView(holder: ViewHolder, payloads: MutableList) {
+ slimIcon.setImageResource(data.icon)
+ slimText.text = data.text
+ slimIndicator.goneFlag(data.onClick)
+ }
+
override fun ViewSlimEntryBinding.unbindView(holder: ViewHolder) {
unbind(slimIcon)
unbind(slimText)
@@ -78,6 +135,36 @@ class SlimEntryVhBinding(override val data: SlimEntry) :
class UserHeaderVhBinding(override val data: GetProfileQuery.User) :
BindingItem(data), BindingLayout by Companion {
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewUserHeaderBinding = ViewUserHeaderBinding.inflate(layoutInflater, parent, false)
+
+ override fun ViewUserHeaderBinding.bindView(holder: ViewHolder, payloads: MutableList) {
+ userHeaderAvatar.glide(data.avatarUrl)
+ userHeaderFollowToggle.apply {
+ setImageResource(if (data.isViewerIsFollowing) R.drawable.ic_person_remove else R.drawable.ic_person_add)
+ goneFlag(!data.isViewerCanFollow)
+ }
+ userHeaderName.text = data.name ?: data.login
+ userHeaderEmail.apply {
+ text = data.email
+ goneFlag(data.email)
+ }
+ userHeaderWeb.apply {
+ text = data.websiteUrl?.toString()
+ goneFlag(data.websiteUrl)
+ }
+ userHeaderLocation.apply {
+ text = data.location
+ goneFlag(data.location)
+ }
+ userHeaderDesc.apply {
+ text = data.bio
+ goneFlag(data.bio)
+ }
+ }
+
override fun ViewUserHeaderBinding.unbindView(holder: ViewHolder) {
unbindGlide(userHeaderAvatar)
unbind(userHeaderFollowToggle)
@@ -91,10 +178,20 @@ class UserHeaderVhBinding(override val data: GetProfileQuery.User) :
}
class UserContributionVhBinding(override val data: GetProfileQuery.User) :
- BindingItem(data), BindingLayout by Companion {
-
- override fun ViewUserContributionsBinding.bindView(holder: ViewHolder, payloads: MutableList) {
- model = data.contributionsCollection.fragments.shortContributions
+ BindingItem(data),
+ BindingLayout by Companion {
+
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewUserContributionsBinding =
+ ViewUserContributionsBinding.inflate(layoutInflater, parent, false)
+
+ override fun ViewUserContributionsBinding.bindView(
+ holder: ViewHolder,
+ payloads: MutableList
+ ) {
+ userContributions.contributions = data.contributionsCollection.fragments.shortContributions
}
override fun ViewUserContributionsBinding.unbindView(holder: ViewHolder) {
@@ -108,14 +205,39 @@ class UserContributionVhBinding(override val data: GetProfileQuery.User) :
}
-class PathCrumbHomeVhBinding(override val data: GitObjectID?) : BlankViewHolderBinding(R.layout.view_path_crumb_home)
+class PathCrumbHomeVhBinding(override val data: GitObjectID?) :
+ BindingItem(data), BindingLayout by Companion {
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewPathCrumbBinding = ViewPathCrumbBinding.inflate(layoutInflater, parent, false)
+
+ override fun ViewPathCrumbBinding.bindView(holder: ViewHolder, payloads: MutableList) {
+ // noop
+ }
+
+ override fun ViewPathCrumbBinding.unbindView(holder: ViewHolder) {
+ // noop
+ }
+
+ companion object : BindingLayout {
+ override val layoutRes: Int
+ get() = R.layout.view_path_crumb
+ }
+}
class PathCrumbVhBinding(override val data: PathCrumb) :
BindingItem(data), BindingLayout by Companion {
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewPathCrumbBinding = ViewPathCrumbBinding.inflate(layoutInflater, parent, false)
+
override fun ViewPathCrumbBinding.bindView(holder: ViewHolder, payloads: MutableList) {
- model = data
- val adapter = root.getTag(R.id.fastadapter_item_adapter) as? FastAdapter ?: return
+ pathText.text = data.segment
+ val adapter =
+ root.getTag(R.id.fastadapter_item_adapter) as? FastAdapter ?: return
val isLast = adapter.getPosition(this@PathCrumbVhBinding) == adapter.itemCount - 1
pathText.alpha = if (isLast) 1f else 0.7f
}
@@ -133,6 +255,17 @@ class PathCrumbVhBinding(override val data: PathCrumb) :
class TreeEntryVhBinding(override val data: TreeEntryItem) :
BindingItem(data), BindingLayout by Companion {
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewTreeEntryBinding = ViewTreeEntryBinding.inflate(layoutInflater, parent, false)
+
+ override fun ViewTreeEntryBinding.bindView(holder: ViewHolder, payloads: MutableList) {
+ treeEntryIcon.setImageResource(if (data.obj is ObjectItem.AsBlob) R.drawable.ic_file else R.drawable.ic_folder)
+ treeEntryText.text = data.name
+ treeEntrySize.treeEntrySizeText(data)
+ }
+
override fun ViewTreeEntryBinding.unbindView(holder: ViewHolder) {
unbind(treeEntryIcon)
unbind(treeEntryText, treeEntrySize)
@@ -146,7 +279,22 @@ class TreeEntryVhBinding(override val data: TreeEntryItem) :
}
class IssueCommentVhBinding(override val data: ShortIssueComment) :
- BindingItem(data), BindingLayout by Companion {
+ BindingItem(data),
+ BindingLayout by Companion {
+
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewIssueCommentBinding = ViewIssueCommentBinding.inflate(layoutInflater, parent, false)
+
+ override fun ViewIssueCommentBinding.bindView(holder: ViewHolder, payloads: MutableList) {
+ avatar.glideRound(data.fragments.shortComment?.author?.fragments?.shortActor?.avatarUrl)
+ login.text = data.fragments.shortComment?.author?.fragments?.shortActor?.login
+ date.relativeDateText(data.fragments.shortComment?.updatedAt)
+ reaction.goneFlag(data.fragments.shortReaction?.isViewerCanReact != true)
+ label.authorAssociation(data.fragments.shortComment?.authorAssociation)
+ content.text = data.fragments.shortComment?.bodyText
+ }
override fun ViewIssueCommentBinding.unbindView(holder: ViewHolder) {
unbind(avatar)
@@ -164,6 +312,11 @@ class IssueCommentVhBinding(override val data: ShortIssueComment) :
class PlaceholderVhBinding(@StringRes override val data: Int) :
BindingItem(data), BindingLayout by Companion {
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewPlaceholderBinding = ViewPlaceholderBinding.inflate(layoutInflater, parent, false)
+
override fun ViewPlaceholderBinding.bindView(holder: ViewHolder, payloads: MutableList) {
placeholderText.setText(data)
}
@@ -183,6 +336,18 @@ class PlaceholderVhBinding(@StringRes override val data: Int) :
class RefEntryVhBinding(override val data: RefEntry) :
BindingItem(data), BindingLayout by Companion {
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewRefEntryBinding = ViewRefEntryBinding.inflate(layoutInflater, parent, false)
+
+ override fun ViewRefEntryBinding.bindView(holder: ViewHolder, payloads: MutableList) {
+ refText.apply {
+ setCompoundDrawablesRelative(context.drawable(data.icon), null, null, null)
+ text = data.ref.name
+ }
+ }
+
override fun ViewRefEntryBinding.unbindView(holder: ViewHolder) {
unbind(refText)
}
@@ -196,7 +361,22 @@ class RefEntryVhBinding(override val data: RefEntry) :
}
class RepoOverviewHeaderVhBinding(override val data: ShortRepoRowItem) :
- BindingItem(data), BindingLayout by Companion {
+ BindingItem(data),
+ BindingLayout by Companion {
+
+ override fun createBinding(
+ layoutInflater: LayoutInflater,
+ parent: ViewGroup?
+ ): ViewRepoOverviewHeaderBinding =
+ ViewRepoOverviewHeaderBinding.inflate(layoutInflater, parent, false)
+
+ override fun ViewRepoOverviewHeaderBinding.bindView(
+ holder: ViewHolder,
+ payloads: MutableList
+ ) {
+ repoTitle.repoHeaderText(data)
+ repoDesc.text = data.description
+ }
override fun ViewRepoOverviewHeaderBinding.unbindView(holder: ViewHolder) {
unbind(repoTitle, repoDesc)
diff --git a/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/ViewBindingTemp.kt b/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/ViewBindingTemp.kt
new file mode 100644
index 0000000..4daf928
--- /dev/null
+++ b/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/ViewBindingTemp.kt
@@ -0,0 +1,50 @@
+package ca.allanwang.gitdroid.views.item
+
+import ca.allanwang.gitdroid.views.databinding.ViewMainIssueCommentBinding
+import ca.allanwang.gitdroid.views.databinding.ViewRepoBinding
+import ca.allanwang.gitdroid.views.databinding.ViewRepoOrigBinding
+import ca.allanwang.gitdroid.views.utils.*
+import github.fragment.ShortIssueComment
+import github.fragment.ShortRepoRowItem
+
+fun ViewRepoOrigBinding.setModel(data: ShortRepoRowItem) {
+ repoName.text = data.fragments.repoNameAndOwner.name
+ repoDesc.apply {
+ text = data.description
+ goneFlag(data.description)
+ }
+ repoStars.compactNumberText(data.stargazers.totalCount)
+ repoForks.compactNumberText(data.forkCount)
+ repoIssues.compactNumberText(data.issues.totalCount)
+ repoPrs.compactNumberText(data.pullRequests.totalCount)
+ repoLanguage.apply {
+ text = data.primaryLanguage?.name
+ languageColor(data.primaryLanguage?.color)
+ }
+ repoDate.relativeDateText(data.pushedAt)
+}
+
+fun ViewRepoBinding.setModel(data: ShortRepoRowItem) {
+ repoName.text = data.fragments.repoNameAndOwner.name
+ repoDesc.apply {
+ text = data.description
+ goneFlag(data.description)
+ }
+ repoStars.compactNumberText(data.stargazers.totalCount)
+ repoForks.compactNumberText(data.forkCount)
+ repoIssues.compactNumberText(data.issues.totalCount)
+ repoPrs.compactNumberText(data.pullRequests.totalCount)
+ repoLanguage.apply {
+ text = data.primaryLanguage?.name
+ invisibleFlag(data.primaryLanguage?.name)
+ languageColor(data.primaryLanguage?.color)
+ }
+ repoDate.relativeDateText(data.pushedAt)
+}
+
+fun ViewMainIssueCommentBinding.setModel(data: ShortIssueComment) {
+ avatar.glideRound(data.fragments.shortComment?.author?.fragments?.shortActor?.avatarUrl)
+ login.text = data.fragments.shortComment?.author?.fragments?.shortActor?.login
+ date.relativeDateText(data.fragments.shortComment?.updatedAt)
+ content.text = data.fragments.shortComment?.bodyText
+}
diff --git a/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/ViewHolderLoader.kt b/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/ViewHolderLoader.kt
index 7a1ba3b..545482d 100644
--- a/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/ViewHolderLoader.kt
+++ b/views/src/main/kotlin/ca/allanwang/gitdroid/views/item/ViewHolderLoader.kt
@@ -3,19 +3,20 @@ package ca.allanwang.gitdroid.views.item
import android.content.Context
import ca.allanwang.gitdroid.views.R
import ca.allanwang.gitdroid.views.utils.*
+import com.mikepenz.fastadapter.GenericItem
import github.GetProfileQuery
import github.fragment.*
import java.util.*
-fun ShortIssueRowItem.vh(): GenericBindingItem = IssueVhBinding(this)
-fun ShortPullRequestRowItem.vh(): GenericBindingItem =
+fun ShortIssueRowItem.vh(): GenericItem = IssueVhBinding(this)
+fun ShortPullRequestRowItem.vh(): GenericItem =
PullRequestVhBinding(this)
-fun ShortRepoRowItem.vh(): GenericBindingItem = RepoVhBinding(this)
-fun SlimEntry.vh(): GenericBindingItem =
+fun ShortRepoRowItem.vh(): GenericItem = RepoVhBinding(this)
+fun SlimEntry.vh(): GenericItem =
SlimEntryVhBinding(this)
-fun GetProfileQuery.User.vhFull(context: Context): List {
+fun GetProfileQuery.User.vhFull(context: Context): List {
val dateFormat = Locale.getDefault().bestDateFormat("yyyyMMMdd")
val slimModels = listOf(
SlimEntry(
@@ -39,7 +40,7 @@ fun GetProfileQuery.User.vhFull(context: Context): List {
context.quantityN(R.plurals.gists_n, gists.totalCount)
)
)
- return mutableListOf().apply {
+ return mutableListOf().apply {
add(vhHeader())
addAll(slimModels.map { it.vh() })
add(vhContribution())
@@ -47,32 +48,32 @@ fun GetProfileQuery.User.vhFull(context: Context): List {
}
}
-fun GetProfileQuery.PinnedItems.vhList(): List = pinnedItems?.mapNotNull { item ->
+fun GetProfileQuery.PinnedItems.vhList(): List = pinnedItems?.mapNotNull { item ->
when (item) {
is GetProfileQuery.AsPinnableItem -> item.fragments.shortRepoRowItem?.vh()
else -> throw RuntimeException("Invalid pinned item type ${item.__typename} ${item::class.java.simpleName}")
}
} ?: emptyList()
-fun GetProfileQuery.User.vhHeader(): GenericBindingItem =
+fun GetProfileQuery.User.vhHeader(): GenericItem =
UserHeaderVhBinding(this)
-fun GetProfileQuery.User.vhContribution(): GenericBindingItem =
+fun GetProfileQuery.User.vhContribution(): GenericItem =
UserContributionVhBinding(this)
-fun PathCrumb.vh(): GenericBindingItem =
+fun PathCrumb.vh(): GenericItem =
PathCrumbVhBinding(this)
-fun TreeEntryItem.vh(): GenericBindingItem = TreeEntryVhBinding(this)
+fun TreeEntryItem.vh(): GenericItem = TreeEntryVhBinding(this)
-fun ShortIssueComment.vh(): GenericBindingItem = IssueCommentVhBinding(this)
+fun ShortIssueComment.vh(): GenericItem = IssueCommentVhBinding(this)
-fun RefEntry.vh(): GenericBindingItem = RefEntryVhBinding(this)
+fun RefEntry.vh(): GenericItem = RefEntryVhBinding(this)
-fun ShortRepoRowItem.vhHeader(): GenericBindingItem = RepoOverviewHeaderVhBinding(this)
+fun ShortRepoRowItem.vhHeader(): GenericItem = RepoOverviewHeaderVhBinding(this)
-fun FullRepo.vhFull(context: Context): List {
+fun FullRepo.vhFull(context: Context): List {
val slimModels = with(fragments.shortRepoRowItem) {
listOf(
SlimEntry(
@@ -101,7 +102,7 @@ fun FullRepo.vhFull(context: Context): List {
)
)
}
- return mutableListOf().apply {
+ return mutableListOf().apply {
add(fragments.shortRepoRowItem.vhHeader())
addAll(slimModels.map { it.vh() })
}
diff --git a/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/BindingAdapter.kt b/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/BindingAdapter.kt
index a384efe..dcb15a6 100644
--- a/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/BindingAdapter.kt
+++ b/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/BindingAdapter.kt
@@ -2,7 +2,6 @@ package ca.allanwang.gitdroid.views.utils
import android.content.res.ColorStateList
import android.graphics.Color
-import android.graphics.drawable.Drawable
import android.net.Uri
import android.text.format.DateUtils
import android.text.method.LinkMovementMethod
@@ -12,7 +11,6 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.core.text.buildSpannedString
import androidx.core.text.inSpans
-import androidx.databinding.BindingAdapter
import ca.allanwang.gitdroid.data.gitNameAndOwner
import ca.allanwang.gitdroid.ktx.browser.launchUrl
import ca.allanwang.gitdroid.views.R
@@ -36,17 +34,14 @@ private fun notVisible(value: Any?): Boolean = when (value) {
else -> false
}
-@BindingAdapter("goneFlag")
fun View.goneFlag(value: Any?) {
goneIf(notVisible(value))
}
-@BindingAdapter("invisibleFlag")
fun View.invisibleFlag(value: Any?) {
invisibleIf(notVisible(value))
}
-@BindingAdapter("repoHeaderText")
fun TextView.repoHeaderText(repo: ShortRepoRowItem) {
val ownerClick = object : ClickableSpan() {
override fun onClick(widget: View) {
@@ -65,7 +60,6 @@ fun TextView.repoHeaderText(repo: ShortRepoRowItem) {
}
}
-@BindingAdapter("languageColor")
fun TextView.languageColor(color: String?) {
color ?: return
val c = ColorStateList.valueOf(Color.parseColor(color))
@@ -73,7 +67,6 @@ fun TextView.languageColor(color: String?) {
setTextColor(c)
}
-@BindingAdapter("relativeDateText")
fun TextView.relativeDateText(date: Date?) {
if (date == null) {
text = null
@@ -91,7 +84,6 @@ private fun glideModel(model: Any?): Any? = when {
else -> model
}
-@BindingAdapter("glide")
fun ImageView.glide(model: Any?) {
if (model == null) {
Glide.with(this).clear(this)
@@ -107,7 +99,6 @@ fun ImageView.glide(model: Any?) {
*
* Currently, multi param binding adapters don't seem to work; this is the workaround
*/
-@BindingAdapter("glideRound")
fun ImageView.glideRound(model: Any?) {
if (model == null) {
Glide.with(this).clear(this)
@@ -119,19 +110,6 @@ fun ImageView.glideRound(model: Any?) {
}
}
-@BindingAdapter("android:src")
-fun ImageView.setImageViewResource(resource: Int) {
- setImageResource(resource)
-}
-
-@BindingAdapter(value = ["android:drawableStart", "android:drawableEnd"], requireAll = false)
-fun TextView.compoundDrawables(drawableResStart: Int, drawableResEnd: Int) {
- fun drawable(res: Int): Drawable? = if (res == 0) null else context.getDrawable(res)
- // TODO LTR support
- setCompoundDrawables(drawable(drawableResStart), null, drawable(drawableResEnd), null)
-}
-
-@BindingAdapter("treeEntrySizeText")
fun TextView.treeEntrySizeText(obj: TreeEntryItem?) {
val blob = obj?.obj as? TreeEntryItem.AsBlob
if (blob == null) {
@@ -141,7 +119,6 @@ fun TextView.treeEntrySizeText(obj: TreeEntryItem?) {
}
}
-@BindingAdapter("compactNumberText")
fun TextView.compactNumberText(count: Int) {
fun compact(divisor: Float, suffix: Char): String {
return "${(count / divisor).round(1)}$suffix"
@@ -158,12 +135,10 @@ fun TextView.compactNumberText(count: Int) {
text = compactText
}
-@BindingAdapter("memberSinceText")
fun TextView.memberSinceText(date: Date) {
context.getString(R.string.member_since_s, date.toString())
}
-@BindingAdapter("authorAssociation")
fun TextView.authorAssociation(association: CommentAuthorAssociation?) {
val textRes = when (association) {
CommentAuthorAssociation.OWNER -> R.string.author_owner
diff --git a/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/FastBindingAdapter.kt b/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/FastBindingAdapter.kt
index ee53dd9..4a212b6 100644
--- a/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/FastBindingAdapter.kt
+++ b/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/FastBindingAdapter.kt
@@ -1,62 +1,63 @@
package ca.allanwang.gitdroid.views.utils
-import ca.allanwang.gitdroid.views.item.GenericBindingItem
-import com.mikepenz.fastadapter.FastAdapter
-import com.mikepenz.fastadapter.IAdapter
-import com.mikepenz.fastadapter.IItemAdapter
-import com.mikepenz.fastadapter.adapters.ItemAdapter
-import com.mikepenz.fastadapter.diff.FastAdapterDiffUtil
-
-class FastBindingAdapter private constructor(private val adapter: ItemAdapter) :
- FastAdapter(),
- IItemAdapter by adapter {
-
- constructor() : this(ItemAdapter())
-
- var lastClearTime: Long = -1
-
- init {
- super.addAdapter(0, adapter)
- }
-
- override fun clear(): FastBindingAdapter {
- if (itemCount != 0) {
- adapter.clear()
- lastClearTime = System.currentTimeMillis()
- }
- return this
- }
-
- override fun > addAdapter(
- index: Int,
- adapter: A
- ): FastAdapter {
- throw IllegalArgumentException("FastBindingAdapter only allows one adapter")
- }
-
- fun setWithDiff(items: List, detectMoves: Boolean = true) {
- FastAdapterDiffUtil.set(
- adapter,
- items,
- DiffCallback,
- detectMoves
- )
- }
-
- object DiffCallback : com.mikepenz.fastadapter.diff.DiffCallback {
- override fun areItemsTheSame(oldItem: GenericBindingItem, newItem: GenericBindingItem): Boolean =
- oldItem.identifier == newItem.identifier
-
- override fun areContentsTheSame(oldItem: GenericBindingItem, newItem: GenericBindingItem): Boolean =
- oldItem.data == newItem.data
-
- override fun getChangePayload(
- oldItem: GenericBindingItem,
- oldItemPosition: Int,
- newItem: GenericBindingItem,
- newItemPosition: Int
- ): Any? = null
-
- }
-
-}
\ No newline at end of file
+//import ca.allanwang.gitdroid.views.item.GenericBindingItem
+//import com.mikepenz.fastadapter.FastAdapter
+//import com.mikepenz.fastadapter.GenericItem
+//import com.mikepenz.fastadapter.IAdapter
+//import com.mikepenz.fastadapter.IItemAdapter
+//import com.mikepenz.fastadapter.adapters.ItemAdapter
+//import com.mikepenz.fastadapter.diff.FastAdapterDiffUtil
+//
+//class FastBindingAdapter private constructor(private val adapter: ItemAdapter) :
+// FastAdapter(),
+// IItemAdapter by adapter {
+//
+// constructor() : this(ItemAdapter())
+//
+// var lastClearTime: Long = -1
+//
+// init {
+// super.addAdapter(0, adapter)
+// }
+//
+// override fun clear(): FastBindingAdapter {
+// if (itemCount != 0) {
+// adapter.clear()
+// lastClearTime = System.currentTimeMillis()
+// }
+// return this
+// }
+//
+// override fun > addAdapter(
+// index: Int,
+// adapter: A
+// ): FastAdapter {
+// throw IllegalArgumentException("FastBindingAdapter only allows one adapter")
+// }
+//
+// fun setWithDiff(items: List, detectMoves: Boolean = true) {
+// FastAdapterDiffUtil.set(
+// adapter,
+// items,
+// DiffCallback,
+// detectMoves
+// )
+// }
+//
+// object DiffCallback : com.mikepenz.fastadapter.diff.DiffCallback {
+// override fun areItemsTheSame(oldItem: GenericBindingItem, newItem: GenericBindingItem): Boolean =
+// oldItem.identifier == newItem.identifier
+//
+// override fun areContentsTheSame(oldItem: GenericBindingItem, newItem: GenericBindingItem): Boolean =
+// oldItem.data == newItem.data
+//
+// override fun getChangePayload(
+// oldItem: GenericBindingItem,
+// oldItemPosition: Int,
+// newItem: GenericBindingItem,
+// newItemPosition: Int
+// ): Any? = null
+//
+// }
+//
+//}
\ No newline at end of file
diff --git a/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/Utils.kt b/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/Utils.kt
index f5fdc64..6c316a9 100644
--- a/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/Utils.kt
+++ b/views/src/main/kotlin/ca/allanwang/gitdroid/views/utils/Utils.kt
@@ -4,6 +4,7 @@ import android.content.Context
import android.text.format.DateFormat
import androidx.annotation.PluralsRes
import androidx.recyclerview.widget.RecyclerView
+import ca.allanwang.kau.adapters.SingleFastAdapter
import java.text.SimpleDateFormat
import java.util.*
@@ -21,9 +22,9 @@ fun List.repeat(n: Int): List = generateSequence { this }.take(n).flat
*/
fun lazyUi(initializer: () -> T) = lazy(LazyThreadSafetyMode.NONE, initializer)
-var RecyclerView.fastAdapter: FastBindingAdapter
+var RecyclerView.fastAdapter: SingleFastAdapter
set(value) {
adapter = value
}
- get() = adapter as? FastBindingAdapter
- ?: throw RuntimeException("${FastBindingAdapter::class.java.simpleName} not bound to recyclerview")
\ No newline at end of file
+ get() = adapter as? SingleFastAdapter
+ ?: throw RuntimeException("${SingleFastAdapter::class.java.simpleName} not bound to recyclerview")
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_issue_comment.xml b/views/src/main/res/layout/view_issue_comment.xml
index 76a3340..915da44 100644
--- a/views/src/main/res/layout/view_issue_comment.xml
+++ b/views/src/main/res/layout/view_issue_comment.xml
@@ -1,113 +1,96 @@
-
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="@dimen/kau_activity_horizontal_margin"
+ android:paddingTop="@dimen/kau_padding_normal"
+ android:paddingEnd="@dimen/kau_activity_horizontal_margin"
+ android:paddingBottom="@dimen/kau_padding_normal">
-
+
-
-
-
-
-
-
-
-
-
-
+ android:layout_marginStart="@dimen/kau_padding_small"
+ android:textColor="?android:textColorPrimary"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="@id/avatar"
+ app:layout_constraintStart_toEndOf="@id/avatar"
+ app:layout_constraintTop_toTopOf="@id/avatar"
+ app:layout_constraintVertical_bias="0.5"
+ tools:text="@tools:sample/full_names" />
-
+
-
+
-
+
-
+
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_issue_or_pr_item.xml b/views/src/main/res/layout/view_issue_or_pr_item.xml
index 214c41f..53249a9 100644
--- a/views/src/main/res/layout/view_issue_or_pr_item.xml
+++ b/views/src/main/res/layout/view_issue_or_pr_item.xml
@@ -1,143 +1,125 @@
-
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?android:windowBackground"
+ android:foreground="?selectableItemBackground">
-
-
-
+
-
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintGuide_end="@dimen/small_edge_end" />
+
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_login.xml b/views/src/main/res/layout/view_login.xml
index fcbb6e1..4682432 100644
--- a/views/src/main/res/layout/view_login.xml
+++ b/views/src/main/res/layout/view_login.xml
@@ -1,97 +1,92 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+ android:imeOptions="actionDone"
+ android:inputType="textPassword"
+ android:lines="1" />
-
+
-
+
-
-
-
+
-
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_login_container.xml b/views/src/main/res/layout/view_login_container.xml
index 2fce1fa..cabf4d6 100644
--- a/views/src/main/res/layout/view_login_container.xml
+++ b/views/src/main/res/layout/view_login_container.xml
@@ -1,49 +1,44 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_login_selection.xml b/views/src/main/res/layout/view_login_selection.xml
index 0b1c06a..fbd5b3b 100644
--- a/views/src/main/res/layout/view_login_selection.xml
+++ b/views/src/main/res/layout/view_login_selection.xml
@@ -1,47 +1,42 @@
-
+
-
+
-
+
-
+
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_main_issue_comment.xml b/views/src/main/res/layout/view_main_issue_comment.xml
index 079a695..7d00cd6 100644
--- a/views/src/main/res/layout/view_main_issue_comment.xml
+++ b/views/src/main/res/layout/view_main_issue_comment.xml
@@ -1,104 +1,89 @@
-
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/kau_padding_normal">
-
-
-
-
-
-
-
-
+ android:paddingStart="@dimen/kau_activity_horizontal_margin"
+ android:paddingTop="@dimen/kau_padding_small"
+ android:paddingEnd="@dimen/kau_activity_horizontal_margin"
+ android:paddingBottom="@dimen/kau_padding_small">
-
+
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_path_crumb.xml b/views/src/main/res/layout/view_path_crumb.xml
index 9a38f1b..d66bbdf 100644
--- a/views/src/main/res/layout/view_path_crumb.xml
+++ b/views/src/main/res/layout/view_path_crumb.xml
@@ -1,23 +1,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/views/src/main/res/layout/view_path_crumb_home.xml b/views/src/main/res/layout/view_path_crumb_home.xml
index 438d825..9188eab 100644
--- a/views/src/main/res/layout/view_path_crumb_home.xml
+++ b/views/src/main/res/layout/view_path_crumb_home.xml
@@ -1,30 +1,26 @@
-
+
-
+ android:layout_gravity="center_vertical"
+ android:paddingStart="@dimen/kau_padding_small"
+ android:paddingEnd="@dimen/kau_padding_small"
+ android:src="@drawable/ic_home"
+ android:tint="@android:color/white"
+ android:tintMode="src_in" />
-
+
+
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_placeholder.xml b/views/src/main/res/layout/view_placeholder.xml
index 5123bc6..0d6fd99 100644
--- a/views/src/main/res/layout/view_placeholder.xml
+++ b/views/src/main/res/layout/view_placeholder.xml
@@ -1,15 +1,12 @@
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_ref_entry.xml b/views/src/main/res/layout/view_ref_entry.xml
index 05dc0d4..2804e36 100644
--- a/views/src/main/res/layout/view_ref_entry.xml
+++ b/views/src/main/res/layout/view_ref_entry.xml
@@ -1,31 +1,19 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/ref_text"
+ style="@style/TextAppearance.AppCompat.Small"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:drawablePadding="@dimen/kau_padding_normal"
+ android:drawableTint="?android:textColorTertiary"
+ android:drawableTintMode="src_in"
+ android:foreground="?selectableItemBackground"
+ android:paddingStart="@dimen/kau_activity_horizontal_margin"
+ android:paddingTop="@dimen/kau_padding_small"
+ android:paddingEnd="@dimen/kau_activity_horizontal_margin"
+ android:paddingBottom="@dimen/kau_padding_small"
+ app:compoundDrawableSize="@dimen/icon_size"
+ tools:drawableStart="@drawable/ic_branch"
+ tools:text="@tools:sample/lorem" />
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_repo.xml b/views/src/main/res/layout/view_repo.xml
index 5885f01..a67c026 100644
--- a/views/src/main/res/layout/view_repo.xml
+++ b/views/src/main/res/layout/view_repo.xml
@@ -1,121 +1,99 @@
-
-
-
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?android:windowBackground"
+ android:foreground="?selectableItemBackground"
+ android:orientation="vertical"
+ android:paddingStart="@dimen/kau_activity_horizontal_margin"
+ android:paddingTop="@dimen/kau_padding_small"
+ android:paddingEnd="@dimen/kau_activity_horizontal_margin"
+ android:paddingBottom="@dimen/kau_padding_small">
+
+
-
-
+
+ android:gravity="top"
+ android:orientation="horizontal">
-
-
+
+
+
+
+
+
+
+
+ tools:text="Jupyter Notebook" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_weight="0.27"
+ android:drawableStart="@drawable/ic_time"
+ app:textStartPadding="4dp"
+ tools:text="@tools:sample/date/mmddyy" />
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_repo_files.xml b/views/src/main/res/layout/view_repo_files.xml
index 916ff6c..fd35f69 100644
--- a/views/src/main/res/layout/view_repo_files.xml
+++ b/views/src/main/res/layout/view_repo_files.xml
@@ -1,37 +1,33 @@
-
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/repo_refresh"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
-
+ android:layout_height="wrap_content"
+ android:background="?colorPrimaryDark"
+ android:clipToPadding="false"
+ android:paddingStart="@dimen/kau_padding_small"
+ android:paddingEnd="@dimen/kau_padding_small"
+ tools:listitem="@layout/view_path_crumb" />
-
-
-
-
-
-
+
-
\ No newline at end of file
+
+
diff --git a/views/src/main/res/layout/view_repo_orig.xml b/views/src/main/res/layout/view_repo_orig.xml
index f3482e5..e2d435b 100644
--- a/views/src/main/res/layout/view_repo_orig.xml
+++ b/views/src/main/res/layout/view_repo_orig.xml
@@ -1,127 +1,107 @@
-
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?android:windowBackground"
+ android:foreground="?selectableItemBackground"
+ android:paddingStart="@dimen/kau_activity_horizontal_margin"
+ android:paddingTop="@dimen/kau_padding_small"
+ android:paddingEnd="@dimen/kau_activity_horizontal_margin"
+ android:paddingBottom="@dimen/kau_padding_small">
-
-
-
-
-
-
-
-
+ android:textColor="?android:textColorPrimary"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="@tools:sample/full_names" />
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_repo_overview_header.xml b/views/src/main/res/layout/view_repo_overview_header.xml
index 97aeac0..f9171f6 100644
--- a/views/src/main/res/layout/view_repo_overview_header.xml
+++ b/views/src/main/res/layout/view_repo_overview_header.xml
@@ -1,44 +1,29 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+ android:clickable="true"
+ android:focusable="true"
+ tools:text="@tools:sample/full_names" />
-
-
\ No newline at end of file
+
+
diff --git a/views/src/main/res/layout/view_slim_entry.xml b/views/src/main/res/layout/view_slim_entry.xml
index a372a6e..b6cce8d 100644
--- a/views/src/main/res/layout/view_slim_entry.xml
+++ b/views/src/main/res/layout/view_slim_entry.xml
@@ -1,55 +1,41 @@
-
+
-
+
-
-
-
-
-
-
-
-
+ android:layout_marginStart="@dimen/kau_padding_small"
+ android:layout_marginEnd="@dimen/kau_padding_small"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:lines="1"
+ android:textColor="?android:textColorPrimary"
+ tools:text="@tools:sample/lorem/random" />
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_tree_entry.xml b/views/src/main/res/layout/view_tree_entry.xml
index 0197f71..3d1b2e7 100644
--- a/views/src/main/res/layout/view_tree_entry.xml
+++ b/views/src/main/res/layout/view_tree_entry.xml
@@ -1,56 +1,40 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+ android:layout_marginStart="@dimen/kau_padding_normal"
+ android:layout_marginEnd="@dimen/kau_padding_normal"
+ android:layout_weight="1"
+ android:ellipsize="end"
+ android:lines="1"
+ tools:text="@tools:sample/lorem" />
+
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_user_contributions.xml b/views/src/main/res/layout/view_user_contributions.xml
index 0e27604..dc75671 100644
--- a/views/src/main/res/layout/view_user_contributions.xml
+++ b/views/src/main/res/layout/view_user_contributions.xml
@@ -1,24 +1,11 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/layout/view_user_header.xml b/views/src/main/res/layout/view_user_header.xml
index d382439..4fd797d 100644
--- a/views/src/main/res/layout/view_user_header.xml
+++ b/views/src/main/res/layout/view_user_header.xml
@@ -1,138 +1,115 @@
-
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/kau_activity_vertical_margin"
+ android:paddingBottom="@dimen/kau_activity_vertical_margin">
-
+
+
-
-
+
-
+ android:layout_marginStart="@dimen/kau_padding_normal"
+ android:layout_marginEnd="@dimen/kau_padding_normal"
+ app:layout_constraintEnd_toStartOf="@id/user_header_follow_toggle"
+ app:layout_constraintHorizontal_bias="0"
+ app:layout_constraintStart_toEndOf="@id/user_header_avatar"
+ app:layout_constraintTop_toTopOf="@id/user_header_avatar"
+ tools:text="@tools:sample/full_names" />
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/src/main/res/values-night/styles.xml b/views/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..38d2244
--- /dev/null
+++ b/views/src/main/res/values-night/styles.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/views/src/main/res/values/styles.xml b/views/src/main/res/values/styles.xml
index 826966a..2fb3f31 100644
--- a/views/src/main/res/values/styles.xml
+++ b/views/src/main/res/values/styles.xml
@@ -1,6 +1,10 @@
+
+
+
+