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

Commit

Permalink
Remove redundant @IntRange
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler committed Jun 24, 2024
1 parent fa50451 commit 343b62b
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 33 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.goooler.demoapp.adapter.rv.core

import android.view.ViewGroup
import androidx.annotation.IntRange
import androidx.annotation.LayoutRes
import androidx.recyclerview.widget.RecyclerView
import kotlinx.collections.immutable.toImmutableList
Expand Down Expand Up @@ -35,25 +34,25 @@ abstract class BaseRvAdapter<M : IVhModelType> :
override fun onCreateViewHolder(parent: ViewGroup, @LayoutRes viewType: Int): BindingViewHolder =
helper.onCreateViewHolder(parent, viewType)

override fun onBindViewHolder(holder: BindingViewHolder, @IntRange(from = 0) position: Int) {
override fun onBindViewHolder(holder: BindingViewHolder, position: Int) {
helper.onBindViewHolder(holder, position)
}

override fun onBindViewHolder(
holder: BindingViewHolder,
@IntRange(from = 0)position: Int,
position: Int,
payloads: List<Any>,
) {
helper.onBindViewHolder(holder, position, payloads)
}

@LayoutRes
override fun getItemViewType(@IntRange(from = 0) position: Int): Int =
override fun getItemViewType(position: Int): Int =
helper.list[position].viewType

override fun getItemCount(): Int = helper.list.size

override operator fun get(@IntRange(from = 0) position: Int): M = helper.list[position]
override operator fun get(position: Int): M = helper.list[position]

override var list: List<M>
get() = helper.list.toImmutableList()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package io.goooler.demoapp.adapter.rv.core

import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.annotation.IntRange
import androidx.annotation.LayoutRes
import androidx.databinding.BindingAdapter
import androidx.databinding.DataBindingUtil
Expand Down Expand Up @@ -56,7 +55,7 @@ internal interface IRvAdapter<M : IVhModelType> {
/**
* Get item by position.
*/
operator fun get(@IntRange(from = 0) position: Int): M?
operator fun get(position: Int): M?
}

internal interface IMutableRvAdapter<M : IVhModelType> : IRvAdapter<M> {
Expand All @@ -71,7 +70,7 @@ internal interface IMutableRvAdapter<M : IVhModelType> : IRvAdapter<M> {
*/
fun refreshItems(items: List<M>)

fun removeItem(@IntRange(from = 0) index: Int)
fun removeItem(index: Int)

fun removeItem(item: M)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.goooler.demoapp.adapter.rv.core

import androidx.annotation.IntRange
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.RecyclerView

Expand Down Expand Up @@ -39,8 +38,8 @@ class ItemTouchHelperCallback(

interface ItemChangeListener {

fun onItemMove(@IntRange(from = 0) fromPosition: Int, @IntRange(from = 0) toPosition: Int)
fun onItemMove(fromPosition: Int, toPosition: Int)

fun onItemDismiss(@IntRange(from = 0) position: Int)
fun onItemDismiss(position: Int)
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.goooler.demoapp.adapter.rv.core

import android.view.ViewGroup
import androidx.annotation.IntRange
import androidx.annotation.LayoutRes
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
Expand Down Expand Up @@ -61,7 +60,7 @@ internal class RvAdapterHelper<M : IVhModelType>(private val adapter: IRvAdapter
*/
fun onBindViewHolder(
holder: BindingViewHolder,
@IntRange(from = 0) position: Int,
position: Int,
payloads: List<Any> = emptyList(),
) {
adapter[position]?.let {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.goooler.demoapp.adapter.rv.diff

import android.view.ViewGroup
import androidx.annotation.IntRange
import androidx.annotation.LayoutRes
import androidx.recyclerview.widget.AsyncDifferConfig
import androidx.recyclerview.widget.DiffUtil
Expand Down Expand Up @@ -48,24 +47,24 @@ abstract class BaseRvDiffAdapter<M : IDiffVhModelType> :

override fun onBindViewHolder(
holder: BindingViewHolder,
@IntRange(from = 0) position: Int,
position: Int,
) {
helper.onBindViewHolder(holder, position)
}

override fun onBindViewHolder(
holder: BindingViewHolder,
@IntRange(from = 0) position: Int,
position: Int,
payloads: List<Any>,
) {
helper.onBindViewHolder(holder, position, payloads)
}

@LayoutRes
override fun getItemViewType(@IntRange(from = 0) position: Int): Int =
override fun getItemViewType(position: Int): Int =
getItem(position).viewType

override operator fun get(@IntRange(from = 0) position: Int): M = getItem(position)
override operator fun get(position: Int): M = getItem(position)

override var list: List<M>
get() = helper.list.toImmutableList()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.goooler.demoapp.adapter.rv.paging

import android.view.ViewGroup
import androidx.annotation.IntRange
import androidx.annotation.LayoutRes
import androidx.paging.LoadState
import androidx.paging.PagingDataAdapter
Expand Down Expand Up @@ -47,24 +46,24 @@ abstract class BaseRvPagingAdapter<M : IDiffVhModelType>(callback: DiffCallBack<

override fun onBindViewHolder(
holder: BindingViewHolder,
@IntRange(from = 0) position: Int,
position: Int,
) {
helper.onBindViewHolder(holder, position)
}

override fun onBindViewHolder(
holder: BindingViewHolder,
@IntRange(from = 0) position: Int,
position: Int,
payloads: List<Any>,
) {
helper.onBindViewHolder(holder, position, payloads)
}

@LayoutRes
override fun getItemViewType(@IntRange(from = 0) position: Int): Int =
override fun getItemViewType(position: Int): Int =
getItem(position)?.viewType ?: 0

override operator fun get(@IntRange(from = 0) position: Int): M? = getItem(position)
override operator fun get(position: Int): M? = getItem(position)

private fun observeLoadState() {
addLoadStateListener {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

package io.goooler.demoapp.adapter.vp

import androidx.annotation.IntRange
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentStatePagerAdapter
Expand Down Expand Up @@ -33,9 +32,9 @@ open class CommonFragmentStatePagerAdapter(
notifyDataSetChanged()
}

override fun getItem(@IntRange(from = 0) position: Int): Fragment = fragmentList[position]
override fun getItem(position: Int): Fragment = fragmentList[position]

override fun getPageTitle(@IntRange(from = 0) position: Int): CharSequence? =
override fun getPageTitle(position: Int): CharSequence? =
titleList[position]

override fun getCount(): Int = fragmentList.size
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package io.goooler.demoapp.obsolete.util
import android.content.Context
import android.graphics.drawable.Drawable
import android.widget.ImageView
import androidx.annotation.IntRange
import com.bumptech.glide.Glide
import com.bumptech.glide.RequestBuilder
import com.bumptech.glide.load.engine.DiskCacheStrategy
Expand All @@ -20,7 +19,7 @@ object GlideImageLoader {
url: String?,
placeholderDrawable: Drawable? = null,
errorDrawable: Drawable? = null,
@IntRange(from = 0) cornerRadius: Int = 0,
cornerRadius: Int = 0,
useCache: Boolean = true,
) = imageView.loadBase(url, placeholderDrawable, errorDrawable, useCache) {
if (cornerRadius > 0) transform(RoundedCorners(cornerRadius))
Expand All @@ -41,7 +40,7 @@ object GlideImageLoader {
url: String?,
placeholderDrawable: Drawable? = null,
errorDrawable: Drawable? = null,
@IntRange(from = 0) cornerRadius: Int = 0,
cornerRadius: Int = 0,
useCache: Boolean = true,
) = imageView.loadBase(url, placeholderDrawable, errorDrawable, useCache) {
if (cornerRadius > 0) transform(CenterCrop(), RoundedCorners(cornerRadius)) else centerCrop()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import android.webkit.WebChromeClient
import android.webkit.WebResourceRequest
import android.webkit.WebSettings
import android.webkit.WebView
import androidx.annotation.IntRange
import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.findViewTreeLifecycleOwner
Expand Down Expand Up @@ -122,7 +121,7 @@ open class CompatWebView(context: Context, attrs: AttributeSet? = null) : WebVie
fileChooserParams: WebChromeClient.FileChooserParams,
): Boolean

fun onProgressChanged(@IntRange(from = 0) i: Int)
fun onProgressChanged(i: Int)

fun loadFinish()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import android.webkit.ValueCallback
import android.webkit.WebChromeClient
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.IntRange
import io.goooler.demoapp.base.util.extension2MimeType
import io.goooler.demoapp.base.util.isNetworkUrl
import io.goooler.demoapp.base.util.putArguments
Expand Down Expand Up @@ -97,7 +96,7 @@ class WebFragment : BaseBindingFragment<WebFragmentBinding>() {

interface OnEventListener {
fun onReceivedTitle(title: String)
fun onProgressChanged(@IntRange(from = 0) i: Int)
fun onProgressChanged(i: Int)
}

companion object {
Expand Down

0 comments on commit 343b62b

Please sign in to comment.