k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #368 from 1552980358/master

Browse Source 
Modify code style of package `io.legado.app.base` and `io.legado.app.constant`
pull/370/head
kunfei 4 years ago committed by GitHub
parent 9183e716ff d230d79bc7
commit 6430673f94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 149 additions and 212 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      app/src/main/java/io/legado/app/base/BaseActivity.kt
  2. 4
      app/src/main/java/io/legado/app/base/BaseDialogFragment.kt
  3. 8
      app/src/main/java/io/legado/app/base/BaseService.kt
  4. 175
      app/src/main/java/io/legado/app/base/adapter/CommonRecyclerAdapter.kt
  5. 23
      app/src/main/java/io/legado/app/base/adapter/ItemAnimation.kt
  6. 19
      app/src/main/java/io/legado/app/constant/Theme.kt

8
app/src/main/java/io/legado/app/base/BaseActivity.kt
Unescape View File

@ -108,9 +108,7 @@ abstract class BaseActivity(
return true return true
} }
open fun onCompatCreateOptionsMenu(menu: Menu): Boolean { open fun onCompatCreateOptionsMenu(menu: Menu) = super.onCreateOptionsMenu(menu)
return super.onCreateOptionsMenu(menu)
}
final override fun onOptionsItemSelected(item: MenuItem?): Boolean { final override fun onOptionsItemSelected(item: MenuItem?): Boolean {
item?.let { item?.let {
@ -122,9 +120,7 @@ abstract class BaseActivity(
return item != null && onCompatOptionsItemSelected(item) return item != null && onCompatOptionsItemSelected(item)
} }
open fun onCompatOptionsItemSelected(item: MenuItem): Boolean { open fun onCompatOptionsItemSelected(item: MenuItem) = super.onOptionsItemSelected(item)
return super.onOptionsItemSelected(item)
}
private fun initTheme() { private fun initTheme() {
when (theme) { when (theme) {

4
app/src/main/java/io/legado/app/base/BaseDialogFragment.kt
Unescape View File

@ -51,9 +51,7 @@ abstract class BaseDialogFragment : DialogFragment(), CoroutineScope {
scope: CoroutineScope = this, scope: CoroutineScope = this,
context: CoroutineContext = Dispatchers.IO, context: CoroutineContext = Dispatchers.IO,
block: suspend CoroutineScope.() -> T block: suspend CoroutineScope.() -> T
): Coroutine<T> { ) = Coroutine.async(scope, context) { block() }
return Coroutine.async(scope, context) { block() }
}
open fun observeLiveBus() { open fun observeLiveBus() {
} }

8
app/src/main/java/io/legado/app/base/BaseService.kt
Unescape View File

@ -16,13 +16,9 @@ abstract class BaseService : Service(), CoroutineScope by MainScope() {
scope: CoroutineScope = this, scope: CoroutineScope = this,
context: CoroutineContext = Dispatchers.IO, context: CoroutineContext = Dispatchers.IO,
block: suspend CoroutineScope.() -> T block: suspend CoroutineScope.() -> T
): Coroutine<T> { ) = Coroutine.async(scope, context) { block() }
return Coroutine.async(scope, context) { block() }
}
override fun onBind(intent: Intent?): IBinder? { override fun onBind(intent: Intent?) = null
return null
}
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()

175
app/src/main/java/io/legado/app/base/adapter/CommonRecyclerAdapter.kt
Unescape View File

@ -10,23 +10,22 @@ import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import java.util.* import java.util.*
/** /**
* Created by Invincible on 2017/11/24. * Created by Invincible on 2017/11/24.
* *
* 通用的adapter 可添加header，footer，以及不同类型item * 通用的adapter 可添加header，footer，以及不同类型item
*/ */
abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) : abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context):
RecyclerView.Adapter<ItemViewHolder>() { RecyclerView.Adapter<ItemViewHolder>() {
constructor(context: Context, vararg delegates: ItemViewDelegate<ITEM>) : this(context) { constructor(context: Context, vararg delegates: ItemViewDelegate<ITEM>): this(context) {
addItemViewDelegates(*delegates) addItemViewDelegates(*delegates)
} }
constructor( constructor(
context: Context, context: Context,
vararg delegates: Pair<Int, ItemViewDelegate<ITEM>> vararg delegates: Pair<Int, ItemViewDelegate<ITEM>>
) : this(context) { ): this(context) {
addItemViewDelegates(*delegates) addItemViewDelegates(*delegates)
} }
@ -43,7 +42,8 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
private var itemClickListener: ((holder: ItemViewHolder, item: ITEM) -> Unit)? = null private var itemClickListener: ((holder: ItemViewHolder, item: ITEM) -> Unit)? = null
private var itemLongClickListener: ((holder: ItemViewHolder, item: ITEM) -> Boolean)? = null private var itemLongClickListener: ((holder: ItemViewHolder, item: ITEM) -> Boolean)? = null
private var itemAnimation: ItemAnimation? = null // 这个用Kotlin的setter就行了, 不需要手动开一个函数进行设置
var itemAnimation: ItemAnimation? = null
fun setOnItemClickListener(listener: (holder: ItemViewHolder, item: ITEM) -> Unit) { fun setOnItemClickListener(listener: (holder: ItemViewHolder, item: ITEM) -> Unit) {
itemClickListener = listener itemClickListener = listener
@ -57,25 +57,24 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
recyclerView.adapter = this recyclerView.adapter = this
} }
fun <DELEGATE : ItemViewDelegate<ITEM>> addItemViewDelegate(viewType: Int, delegate: DELEGATE) { fun <DELEGATE: ItemViewDelegate<ITEM>> addItemViewDelegate(viewType: Int, delegate: DELEGATE) {
itemDelegates[viewType] = delegate itemDelegates[viewType] = delegate
} }
fun <DELEGATE : ItemViewDelegate<ITEM>> addItemViewDelegate(delegate: DELEGATE) { fun <DELEGATE: ItemViewDelegate<ITEM>> addItemViewDelegate(delegate: DELEGATE) {
itemDelegates[itemDelegates.size] = delegate itemDelegates[itemDelegates.size] = delegate
} }
fun <DELEGATE : ItemViewDelegate<ITEM>> addItemViewDelegates(vararg delegates: DELEGATE) { fun <DELEGATE: ItemViewDelegate<ITEM>> addItemViewDelegates(vararg delegates: DELEGATE) {
delegates.forEach { delegates.forEach {
addItemViewDelegate(it) addItemViewDelegate(it)
} }
} }
fun addItemViewDelegates(vararg delegates: Pair<Int, ItemViewDelegate<ITEM>>) { fun addItemViewDelegates(vararg delegates: Pair<Int, ItemViewDelegate<ITEM>>) =
delegates.forEach { delegates.forEach {
addItemViewDelegate(it.first, it.second) addItemViewDelegate(it.first, it.second)
} }
}
fun addHeaderView(header: View) { fun addHeaderView(header: View) {
synchronized(lock) { synchronized(lock) {
@ -90,7 +89,7 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
} }
} }
fun addFooterView(footer: View) { fun addFooterView(footer: View) =
synchronized(lock) { synchronized(lock) {
if (footerItems == null) { if (footerItems == null) {
footerItems = SparseArray() footerItems = SparseArray()
@ -101,9 +100,9 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
notifyItemInserted(index) notifyItemInserted(index)
} }
} }
}
fun removeHeaderView(header: View) {
fun removeHeaderView(header: View) =
synchronized(lock) { synchronized(lock) {
headerItems?.let { headerItems?.let {
val index = it.indexOfValue(header) val index = it.indexOfValue(header)
@ -113,9 +112,8 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
} }
} }
} }
}
fun removeFooterView(footer: View) { fun removeFooterView(footer: View) =
synchronized(lock) { synchronized(lock) {
footerItems?.let { footerItems?.let {
val index = it.indexOfValue(footer) val index = it.indexOfValue(footer)
@ -125,7 +123,6 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
} }
} }
} }
}
fun setItems(items: List<ITEM>?) { fun setItems(items: List<ITEM>?) {
synchronized(lock) { synchronized(lock) {
@ -228,7 +225,7 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
} }
} }
fun updateItem(item: ITEM) { fun updateItem(item: ITEM) =
synchronized(lock) { synchronized(lock) {
val index = this.items.indexOf(item) val index = this.items.indexOf(item)
if (index >= 0) { if (index >= 0) {
@ -236,18 +233,16 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
notifyItemChanged(index) notifyItemChanged(index)
} }
} }
}
fun updateItem(position: Int, payload: Any) { fun updateItem(position: Int, payload: Any) =
synchronized(lock) { synchronized(lock) {
val size = getActualItemCount() val size = getActualItemCount()
if (position in 0 until size) { if (position in 0 until size) {
notifyItemChanged(position + getHeaderCount(), payload) notifyItemChanged(position + getHeaderCount(), payload)
} }
} }
}
fun updateItems(fromPosition: Int, toPosition: Int, payloads: Any) { fun updateItems(fromPosition: Int, toPosition: Int, payloads: Any) =
synchronized(lock) { synchronized(lock) {
val size = getActualItemCount() val size = getActualItemCount()
if (fromPosition in 0 until size && toPosition in 0 until size) { if (fromPosition in 0 until size && toPosition in 0 until size) {
@ -258,118 +253,93 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
) )
} }
} }
}
fun clearItems() { fun clearItems() =
synchronized(lock) { synchronized(lock) {
this.items.clear() this.items.clear()
notifyDataSetChanged() notifyDataSetChanged()
} }
}
fun isEmpty(): Boolean { fun isEmpty() = items.isEmpty()
return items.isEmpty()
}
fun isNotEmpty(): Boolean { fun isNotEmpty() = items.isNotEmpty()
return items.isNotEmpty()
}
/** /**
* 除去header和footer * 除去header和footer
*/ */
fun getActualItemCount(): Int { fun getActualItemCount() = items.size
return items.size
}
fun getHeaderCount(): Int {
return headerItems?.size() ?: 0
}
fun getFooterCount(): Int { fun getHeaderCount() = headerItems?.size() ?: 0
return footerItems?.size() ?: 0
}
fun getFooterCount() = footerItems?.size() ?: 0
fun getItem(position: Int): ITEM? = items.getOrNull(position) fun getItem(position: Int): ITEM? = items.getOrNull(position)
fun getItemByLayoutPosition(position: Int): ITEM? { fun getItemByLayoutPosition(position: Int) = items.getOrNull(position - getHeaderCount())
val pos = position - getHeaderCount()
return items.getOrNull(pos)
}
fun getItems(): List<ITEM> = items fun getItems(): List<ITEM> = items
protected open fun getItemViewType(item: ITEM, position: Int): Int { protected open fun getItemViewType(item: ITEM, position: Int) = 0
return 0
}
/** /**
* grid 模式下使用 * grid 模式下使用
*/ */
protected open fun getSpanSize(item: ITEM, viewType: Int, position: Int): Int { protected open fun getSpanSize(item: ITEM, viewType: Int, position: Int) = 1
return 1
}
final override fun getItemCount(): Int { final override fun getItemCount() = getActualItemCount() + getHeaderCount() + getFooterCount()
return getActualItemCount() + getHeaderCount() + getFooterCount()
}
final override fun getItemViewType(position: Int): Int { final override fun getItemViewType(position: Int) = when {
return when { isHeader(position) -> TYPE_HEADER_VIEW + position
isHeader(position) -> TYPE_HEADER_VIEW + position isFooter(position) -> TYPE_FOOTER_VIEW + position - getActualItemCount() - getHeaderCount()
isFooter(position) -> TYPE_FOOTER_VIEW + position - getActualItemCount() - getHeaderCount() else -> getItem(getActualPosition(position))?.let {
else -> getItem(getActualPosition(position))?.let { getItemViewType(it, getActualPosition(position))
getItemViewType(it, getActualPosition(position)) } ?: 0
} ?: 0
}
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = when {
return when { viewType < TYPE_HEADER_VIEW + getHeaderCount() -> {
viewType < TYPE_HEADER_VIEW + getHeaderCount() -> { ItemViewHolder(headerItems!!.get(viewType))
ItemViewHolder(headerItems!!.get(viewType)) }
}
viewType >= TYPE_FOOTER_VIEW -> { viewType >= TYPE_FOOTER_VIEW -> {
ItemViewHolder(footerItems!!.get(viewType)) ItemViewHolder(footerItems!!.get(viewType))
} }
else -> { else -> {
val holder = ItemViewHolder( val holder = ItemViewHolder(
inflater.inflate( inflater.inflate(
itemDelegates.getValue(viewType).layoutId, itemDelegates.getValue(viewType).layoutId,
parent, parent,
false false
)
) )
)
itemDelegates.getValue(viewType) itemDelegates.getValue(viewType)
.registerListener(holder) .registerListener(holder)
if (itemClickListener != null) { if (itemClickListener != null) {
holder.itemView.setOnClickListener { holder.itemView.setOnClickListener {
getItem(holder.layoutPosition)?.let { getItem(holder.layoutPosition)?.let {
itemClickListener?.invoke(holder, it) itemClickListener?.invoke(holder, it)
}
} }
} }
}
if (itemLongClickListener != null) { if (itemLongClickListener != null) {
holder.itemView.setOnLongClickListener { holder.itemView.setOnLongClickListener {
getItem(holder.layoutPosition)?.let { getItem(holder.layoutPosition)?.let {
itemLongClickListener?.invoke(holder, it) ?: true itemLongClickListener?.invoke(holder, it) ?: true
} ?: true } ?: true
}
} }
holder
} }
holder
} }
} }
final override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {}
final override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
}
final override fun onBindViewHolder( final override fun onBindViewHolder(
holder: ItemViewHolder, holder: ItemViewHolder,
@ -395,7 +365,7 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
super.onAttachedToRecyclerView(recyclerView) super.onAttachedToRecyclerView(recyclerView)
val manager = recyclerView.layoutManager val manager = recyclerView.layoutManager
if (manager is GridLayoutManager) { if (manager is GridLayoutManager) {
manager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { manager.spanSizeLookup = object: GridLayoutManager.SpanSizeLookup() {
override fun getSpanSize(position: Int): Int { override fun getSpanSize(position: Int): Int {
return getItem(position)?.let { return getItem(position)?.let {
if (isHeader(position) || isFooter(position)) manager.spanCount else getSpanSize( if (isHeader(position) || isFooter(position)) manager.spanCount else getSpanSize(
@ -407,21 +377,11 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
} }
} }
fun setItemAnimation(item: ItemAnimation) { private fun isHeader(position: Int) = position < getHeaderCount()
itemAnimation = item
}
private fun isHeader(position: Int): Boolean { private fun isFooter(position: Int) = position >= getActualItemCount() + getHeaderCount()
return position < getHeaderCount()
}
private fun isFooter(position: Int): Boolean { private fun getActualPosition(position: Int) = position - getHeaderCount()
return position >= getActualItemCount() + getHeaderCount()
}
private fun getActualPosition(position: Int): Int {
return position - getHeaderCount()
}
private fun addAnimation(holder: ItemViewHolder) { private fun addAnimation(holder: ItemViewHolder) {
itemAnimation?.let { itemAnimation?.let {
@ -434,7 +394,6 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
} }
} }
protected open fun startAnimation(holder: ItemViewHolder, item: ItemAnimation) { protected open fun startAnimation(holder: ItemViewHolder, item: ItemAnimation) {
item.itemAnimation?.let { item.itemAnimation?.let {
for (anim in it.getAnimators(holder.itemView)) { for (anim in it.getAnimators(holder.itemView)) {

23
app/src/main/java/io/legado/app/base/adapter/ItemAnimation.kt
Unescape View File

@ -16,22 +16,19 @@ class ItemAnimation private constructor() {
var itemAnimDuration: Long = 300L var itemAnimDuration: Long = 300L
var itemAnimStartPosition: Int = -1 var itemAnimStartPosition: Int = -1
fun interpolator(interpolator: Interpolator): ItemAnimation { fun interpolator(interpolator: Interpolator) = apply {
itemAnimInterpolator = interpolator itemAnimInterpolator = interpolator
return this
} }
fun duration(duration: Long): ItemAnimation { fun duration(duration: Long) = apply {
itemAnimDuration = duration itemAnimDuration = duration
return this
} }
fun startPostion(startPos: Int): ItemAnimation { fun startPosition(startPos: Int) = apply {
itemAnimStartPosition = startPos itemAnimStartPosition = startPos
return this
} }
fun animation(animationType: Int = NONE, animation: BaseAnimation? = null): ItemAnimation { fun animation(animationType: Int = NONE, animation: BaseAnimation? = null) = apply {
if (animation != null) { if (animation != null) {
itemAnimation = animation itemAnimation = animation
} else { } else {
@ -43,17 +40,14 @@ class ItemAnimation private constructor() {
RIGHT_SLIDE_IN -> itemAnimation = SlideInRightAnimation() RIGHT_SLIDE_IN -> itemAnimation = SlideInRightAnimation()
} }
} }
return this
} }
fun enabled(enabled: Boolean): ItemAnimation { fun enabled(enabled: Boolean) = apply {
itemAnimEnabled = enabled itemAnimEnabled = enabled
return this
} }
fun firstOnly(firstOnly: Boolean): ItemAnimation { fun firstOnly(firstOnly: Boolean) = apply {
itemAnimFirstOnly = firstOnly itemAnimFirstOnly = firstOnly
return this
} }
companion object { companion object {
@ -79,8 +73,7 @@ class ItemAnimation private constructor() {
*/ */
const val RIGHT_SLIDE_IN: Int = 0x00000005 const val RIGHT_SLIDE_IN: Int = 0x00000005
fun create(): ItemAnimation { fun create() = ItemAnimation()
return ItemAnimation()
}
} }
} }

19
app/src/main/java/io/legado/app/constant/Theme.kt
Unescape View File

@ -7,18 +7,13 @@ enum class Theme {
Dark, Light, Auto, Transparent; Dark, Light, Auto, Transparent;
companion object { companion object {
fun getTheme(): Theme { fun getTheme() =
return if (AppConfig.isNightTheme) { if (AppConfig.isNightTheme) Dark
Dark else Light
} else Light
} fun getTheme(backgroundColor: Int) =
if (ColorUtils.isColorLight(backgroundColor)) Light
else Dark
fun getTheme(backgroundColor: Int): Theme {
return if (ColorUtils.isColorLight(backgroundColor)) {
Light
} else {
Dark
}
}
} }
} }
Write Preview
Loading…
Cancel
Save