Skip to content

Commit

Permalink
Bump Ktlint plugin to 12.1.1 & ktlint to 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mars885 committed Aug 4, 2024
1 parent 05f0b53 commit ec55cda
Show file tree
Hide file tree
Showing 35 changed files with 192 additions and 176 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,13 @@ max_line_length = 120

[*.yml]
indent_size = 2

[*.{kt,kts}]
ktlint_standard_annotation = disabled
ktlint_standard_no-empty-first-line-in-class-body = disabled
ktlint_standard_blank-line-before-declaration = disabled
ktlint_standard_multiline-expression-wrapping = disabled
ktlint_standard_string-template-indent = disabled
ktlint_standard_spacing-between-declarations-with-annotations = disabled
ktlint_standard_function-signature = disabled
ktlint_standard_class-signature = disabled
2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ allprojects {
}

configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
version.set(versions.ktlint)
android.set(true)
outputToConsole.set(true)
verbose.set(true)
reporters {
reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.HTML)
}
Expand Down
3 changes: 2 additions & 1 deletion buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ object versions {
const val kotlin = "2.0.0" // also in buildSrc build.gradle.kts file
const val androidPlugin = "8.3.1" // also in buildSrc build.gradle.kts file and lint version
const val detektPlugin = "1.23.6"
const val ktlintPlugin = "10.3.0"
const val ktlintPlugin = "12.1.1"
const val gradleVersionsPlugin = "0.51.0"
const val dokkaPlugin = "1.9.20"
const val appCompat = "1.7.0"
Expand All @@ -68,6 +68,7 @@ object versions {
const val commonsCore = "1.0.3"
const val commonsKtx = "1.0.3"
const val commonsRecyclerView = "1.0.1"
const val ktlint = "1.3.1"
const val autoService = "1.1.1"
const val lint = "31.3.1" // lintVersion = androidPlugin + 23.0.0
const val jUnit = "4.13.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import androidx.fragment.app.Fragment
import androidx.viewbinding.ViewBinding

internal abstract class BaseFragment<
VB : ViewBinding
VB : ViewBinding,
>(@LayoutRes contentLayoutId: Int) : Fragment(contentLayoutId) {

private var isViewCreated = false
Expand All @@ -36,7 +36,7 @@ internal abstract class BaseFragment<
final override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
savedInstanceState: Bundle?,
): View? {
// Prevent the view from recreation until onDestroy is called
return if (isViewCreated) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import com.paulrybitskyi.valuepicker.sample.databinding.FragmentClothingSizePick

@Suppress("MagicNumber")
internal class ClothingSizePickerFragment : BaseFragment<
FragmentClothingSizePickerBinding
FragmentClothingSizePickerBinding,
>(R.layout.fragment_clothing_size_picker) {

override val viewBinding by viewBinding(FragmentClothingSizePickerBinding::bind)
Expand All @@ -55,7 +55,7 @@ internal class ClothingSizePickerFragment : BaseFragment<
dividerDrawable = getDrawable(R.drawable.clothing_size_picker_divider)
fixedItemSize = Size.withFixedSize(
width = getDimensionPixelSize(R.dimen.clothing_size_picker_item_width),
height = getDimensionPixelSize(R.dimen.clothing_size_picker_item_height)
height = getDimensionPixelSize(R.dimen.clothing_size_picker_item_height),
)
orientation = Orientation.HORIZONTAL
onItemSelectedListener = ValuePickerView.OnItemSelectedListener {
Expand All @@ -71,7 +71,7 @@ internal class ClothingSizePickerFragment : BaseFragment<
return ClothingSize.values().map {
PickerItem(
id = it.ordinal,
title = it.name
title = it.name,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ internal enum class ClothingSize {
M,
L,
XL,
XXL
XXL,
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,43 +22,43 @@ import com.paulrybitskyi.valuepicker.sample.R
internal enum class DashboardDestination(
val title: String,
val description: String,
@IdRes val destinationId: Int
@IdRes val destinationId: Int,
) {
TIME_PICKER(
title = "Time Picker",
description = "Three vertical pickers for picking time.",
destinationId = R.id.timePickerFragment
destinationId = R.id.timePickerFragment,
),
DATE_PICKER(
title = "Date Picker",
description = "Three vertical pickers with infinite scroll enabled for picking date.",
destinationId = R.id.datePickerFragment
destinationId = R.id.datePickerFragment,
),
TEAM_PICKER(
title = "Team Picker",
description = "A vertical picker with a fixed item size, custom divider, " +
"and text font for picking the NBA team.",
destinationId = R.id.teamPickerFragment
destinationId = R.id.teamPickerFragment,
),
MOVIE_FILTERING_PICKER(
title = "Movie Filtering Picker",
description = "Three vertical pickers each with a custom effect for picking a movie.",
destinationId = R.id.movieFilteringPicker
destinationId = R.id.movieFilteringPicker,
),
RATING_PICKER(
title = "Rating Picker",
description = "A horizontal picker for picking a rating.",
destinationId = R.id.ratingPickerFragment
destinationId = R.id.ratingPickerFragment,
),
CLOTHING_SIZE_PICKER(
title = "Clothing Size Picker",
description = "A horizontal picker with a fixed item size, custom divider, " +
"and infinite scroll enabled for picking the clothing size.",
destinationId = R.id.clothingSizePickerFragment
destinationId = R.id.clothingSizePickerFragment,
),
PERSON_INFO_PICKER(
title = "Person Info Picker",
description = "Three horizontal pickers each with a custom effect for picking person's information.",
destinationId = R.id.personInfoPickerFragment
)
destinationId = R.id.personInfoPickerFragment,
),
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.paulrybitskyi.valuepicker.sample.R
import com.paulrybitskyi.valuepicker.sample.databinding.FragmentDashboardBinding

internal class DashboardFragment : BaseFragment<
FragmentDashboardBinding
FragmentDashboardBinding,
>(R.layout.fragment_dashboard) {

override val viewBinding by viewBinding(FragmentDashboardBinding::bind)
Expand All @@ -42,7 +42,7 @@ internal class DashboardFragment : BaseFragment<
return DashboardRecyclerViewAdapter(
context = requireContext(),
items = DashboardDestination.values().toList(),
onItemClickListener = ::navigateToDestination
onItemClickListener = ::navigateToDestination,
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import com.paulrybitskyi.valuepicker.sample.dashboard.DashboardRecyclerViewAdapt
internal class DashboardRecyclerViewAdapter(
context: Context,
private val items: List<DashboardDestination>,
private val onItemClickListener: (DashboardDestination) -> Unit
private val onItemClickListener: (DashboardDestination) -> Unit,
) : RecyclerView.Adapter<ViewHolder>() {

private val layoutInflater = LayoutInflater.from(context)
Expand All @@ -38,8 +38,8 @@ internal class DashboardRecyclerViewAdapter(
layoutInflater.inflate(
R.layout.item_view_dashboard,
parent,
false
)
false,
),
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import com.paulrybitskyi.valuepicker.sample.datepicker.model.Month

@Suppress("MagicNumber")
internal class DatePickerFragment : BaseFragment<
FragmentDatePickerBinding
FragmentDatePickerBinding,
>(R.layout.fragment_date_picker) {

override val viewBinding by viewBinding(FragmentDatePickerBinding::bind)
Expand Down Expand Up @@ -75,7 +75,7 @@ internal class DatePickerFragment : BaseFragment<
PickerItem(
id = it.ordinal,
title = if (longMonthNames) it.longName else it.shortName,
payload = it
payload = it,
)
}
}
Expand All @@ -97,8 +97,8 @@ internal class DatePickerFragment : BaseFragment<
add(
PickerItem(
id = day,
title = if (day < 10) "0$day" else day.toString()
)
title = if (day < 10) "0$day" else day.toString(),
),
)
}
}
Expand All @@ -121,8 +121,8 @@ internal class DatePickerFragment : BaseFragment<
add(
PickerItem(
id = year,
title = year.toString()
)
title = year.toString(),
),
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,54 +18,54 @@ package com.paulrybitskyi.valuepicker.sample.datepicker.model

internal enum class Month(
val longName: String,
val shortName: String
val shortName: String,
) {
JANUARY(
longName = "January",
shortName = "Jan"
shortName = "Jan",
),
FEBRUARY(
longName = "February",
shortName = "Feb"
shortName = "Feb",
),
MARCH(
longName = "March",
shortName = "Mar"
shortName = "Mar",
),
APRIL(
longName = "April",
shortName = "Apr"
shortName = "Apr",
),
MAY(
longName = "May",
shortName = "May"
shortName = "May",
),
JUNE(
longName = "June",
shortName = "Jun"
shortName = "Jun",
),
JULY(
longName = "July",
shortName = "Jul"
shortName = "Jul",
),
AUGUST(
longName = "August",
shortName = "Aug"
shortName = "Aug",
),
SEPTEMBER(
longName = "September",
shortName = "Sept"
shortName = "Sept",
),
OCTOBER(
longName = "October",
shortName = "Oct"
shortName = "Oct",
),
NOVEMBER(
longName = "November",
shortName = "Nov"
shortName = "Nov",
),
DECEMBER(
longName = "December",
shortName = "Dec"
)
shortName = "Dec",
),
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import com.paulrybitskyi.valuepicker.valueeffects.concrete.FadingValueEffect

@Suppress("MagicNumber")
internal class MovieFilteringPickerFragment : BaseFragment<
FragmentMovieFilteringPickerBinding
FragmentMovieFilteringPickerBinding,
>(R.layout.fragment_movie_filtering_picker) {

override val viewBinding by viewBinding(FragmentMovieFilteringPickerBinding::bind)
Expand Down Expand Up @@ -80,7 +80,7 @@ internal class MovieFilteringPickerFragment : BaseFragment<
PickerItem(
id = it.ordinal,
title = it.title,
payload = it
payload = it,
)
}
}
Expand All @@ -103,8 +103,8 @@ internal class MovieFilteringPickerFragment : BaseFragment<
add(
PickerItem(
id = year,
title = year.toString()
)
title = year.toString(),
),
)
}
}
Expand All @@ -115,8 +115,8 @@ internal class MovieFilteringPickerFragment : BaseFragment<
valueEffect = CompositeValueEffect(
listOf(
FadingValueEffect(),
RotationValueEffect(RotationValueEffect.Property.ROTATION_X)
)
RotationValueEffect(RotationValueEffect.Property.ROTATION_X),
),
)
onItemSelectedListener = ValuePickerView.OnItemSelectedListener {
viewBinding.serviceTv.text = "Service: ${it.title}"
Expand All @@ -132,7 +132,7 @@ internal class MovieFilteringPickerFragment : BaseFragment<
PickerItem(
id = it.ordinal,
title = it.title,
payload = it
payload = it,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ internal enum class StreamingService(val title: String) {
HULU("Hulu"),
HBO_MAX("HBO"),
DISNEY("Disney"),
APPLE_TV("Apple")
APPLE_TV("Apple"),
}
Loading

0 comments on commit ec55cda

Please sign in to comment.