Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit e9de426

Browse files
Ktlint 1.3.0 (#621)
* Update dependency com.pinterest.ktlint:ktlint-cli to v1.3.0 * Disable ktlint_standard_function-expression-body * Fix style * Refine style --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Goooler <[email protected]>
1 parent 85b95e1 commit e9de426

File tree

11 files changed

+26
-13
lines changed

11 files changed

+26
-13
lines changed

.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ij_kotlin_name_count_to_use_star_import_for_members = 999
1717
ij_kotlin_packages_to_use_import_on_demand = unset
1818
ktlint_code_style = intellij_idea
1919
ktlint_function_naming_ignore_when_annotated_with = Composable
20+
ktlint_standard_function-expression-body = disabled
2021

2122
[*.md]
2223
trim_trailing_whitespace = false

adapter/src/main/kotlin/io/goooler/demoapp/adapter/rv/paging/BaseRvPagingAdapter.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import io.goooler.demoapp.adapter.rv.diff.IDiffVhModelType
2020
* @since 1.0.0
2121
*/
2222
abstract class BaseRvPagingAdapter<M : IDiffVhModelType>(callback: DiffCallBack<M> = DiffCallBack()) :
23-
PagingDataAdapter<M, BindingViewHolder>(callback), IRvAdapter<M> {
23+
PagingDataAdapter<M, BindingViewHolder>(callback),
24+
IRvAdapter<M> {
2425

2526
private val helper by lazy(LazyThreadSafetyMode.NONE) { RvAdapterHelper(this) }
2627

base/src/main/kotlin/io/goooler/demoapp/base/core/BaseApplication.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import android.webkit.WebView
77
import kotlinx.coroutines.CoroutineScope
88
import kotlinx.coroutines.MainScope
99

10-
abstract class BaseApplication : Application(), CoroutineScope by MainScope() {
10+
abstract class BaseApplication :
11+
Application(),
12+
CoroutineScope by MainScope() {
1113

1214
override fun onCreate() {
1315
super.onCreate()

base/src/main/kotlin/io/goooler/demoapp/base/core/BaseDialogFragment.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import android.os.Bundle
88
import android.view.KeyEvent
99
import androidx.fragment.app.DialogFragment
1010

11-
abstract class BaseDialogFragment : DialogFragment(), IFragment {
11+
abstract class BaseDialogFragment :
12+
DialogFragment(),
13+
IFragment {
1214

1315
var onDismissListener: DialogInterface.OnDismissListener? = null
1416
var onCancelListener: DialogInterface.OnCancelListener? = null

base/src/main/kotlin/io/goooler/demoapp/base/core/BaseFragment.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import android.os.Bundle
44
import androidx.activity.addCallback
55
import androidx.fragment.app.Fragment
66

7-
abstract class BaseFragment : Fragment(), IFragment {
7+
abstract class BaseFragment :
8+
Fragment(),
9+
IFragment {
810

911
override fun onCreate(savedInstanceState: Bundle?) {
1012
super.onCreate(savedInstanceState)

biz/main/src/main/kotlin/io/goooler/demoapp/main/model/MainCommonVhModel.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import io.goooler.demoapp.adapter.rv.core.ISpanSize
44
import io.goooler.demoapp.adapter.rv.diff.IDiffVhModelType
55
import io.goooler.demoapp.main.R
66

7-
sealed interface MainCommonVhModel : IDiffVhModelType, ISpanSize {
7+
sealed interface MainCommonVhModel :
8+
IDiffVhModelType,
9+
ISpanSize {
810

911
data class Repo(
1012
val logoUrl: String?,

biz/main/src/main/kotlin/io/goooler/demoapp/main/ui/adapter/MainPagingRvAdapter.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import io.goooler.demoapp.main.model.MainCommonVhModel
66
import io.goooler.demoapp.main.util.bindListener
77
import io.goooler.demoapp.main.util.bindModel
88

9-
class MainPagingRvAdapter(private val listener: OnEventListener) :
10-
BaseRvPagingAdapter<MainCommonVhModel>() {
9+
class MainPagingRvAdapter(
10+
private val listener: OnEventListener,
11+
) : BaseRvPagingAdapter<MainCommonVhModel>() {
1112

1213
override fun onCreateVHForAll(binding: ViewDataBinding) {
1314
binding.bindListener(listener)

biz/main/src/main/kotlin/io/goooler/demoapp/main/ui/adapter/MainSrlRvAdapter.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import io.goooler.demoapp.main.model.MainCommonVhModel
88
import io.goooler.demoapp.main.util.bindListener
99
import io.goooler.demoapp.main.util.bindModel
1010

11-
class MainSrlRvAdapter(private val listener: OnEventListener) :
12-
BaseRvDiffAdapter<MainCommonVhModel>(DiffCallBack<MainCommonVhModel>().asConfig()) {
11+
class MainSrlRvAdapter(
12+
private val listener: OnEventListener,
13+
) : BaseRvDiffAdapter<MainCommonVhModel>(DiffCallBack<MainCommonVhModel>().asConfig()) {
1314

1415
override fun onCreateVHForAll(binding: ViewDataBinding) {
1516
binding.bindListener(listener)

common/src/main/kotlin/io/goooler/demoapp/common/base/binding/BaseBindingActivity.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import com.blankj.utilcode.util.AdaptScreenUtils
1111
import com.blankj.utilcode.util.ScreenUtils
1212
import io.goooler.demoapp.base.core.BaseActivity
1313

14-
abstract class BaseBindingActivity<VB : ViewBinding> : BaseActivity(), IBinding<VB> {
14+
abstract class BaseBindingActivity<VB : ViewBinding> :
15+
BaseActivity(),
16+
IBinding<VB> {
1517

1618
override lateinit var binding: VB
1719

common/src/main/kotlin/io/goooler/demoapp/common/ui/FullScreenDialogFragment.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import io.goooler.demoapp.common.R
77
import io.goooler.demoapp.common.base.binding.BaseBindingDialogFragment
88
import io.goooler.demoapp.common.databinding.CommonFullScreenDialogFragmentBinding
99

10-
class FullScreenDialogFragment :
11-
BaseBindingDialogFragment<CommonFullScreenDialogFragmentBinding>() {
10+
class FullScreenDialogFragment : BaseBindingDialogFragment<CommonFullScreenDialogFragmentBinding>() {
1211

1312
override fun onResume() {
1413
super.onResume()

gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ srl-footer = { module = "io.github.scwang90:refresh-footer-classics", version.re
8989
srl-header = { module = "io.github.scwang90:refresh-header-classics", version.ref = "srl" }
9090
srl-kernel = { module = "io.github.scwang90:refresh-layout-kernel", version.ref = "srl" }
9191
utils = "com.blankj:utilcodex:1.31.1"
92-
ktlint = "com.pinterest.ktlint:ktlint-cli:1.2.1"
92+
ktlint = "com.pinterest.ktlint:ktlint-cli:1.3.0"
9393
composeRules = "io.nlopez.compose.rules:detekt:0.4.1"
9494

9595
[bundles]

0 commit comments

Comments
 (0)