Merge pull request #368 from 1552980358/master

Modify code style of package `io.legado.app.base` and `io.legado.app.constant`

app/src/main/java/io/legado/app/base/BaseActivity.kt

@@ -108,9 +108,7 @@ abstract class BaseActivity(
         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 {
         item?.let {
@@ -122,9 +120,7 @@ abstract class BaseActivity(
         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() {
         when (theme) {

app/src/main/java/io/legado/app/base/BaseDialogFragment.kt

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

app/src/main/java/io/legado/app/base/BaseService.kt

@@ -16,13 +16,9 @@ abstract class BaseService : Service(), CoroutineScope by MainScope() {
         scope: CoroutineScope = this,
         context: CoroutineContext = Dispatchers.IO,
         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() {
         super.onDestroy()

app/src/main/java/io/legado/app/base/adapter/CommonRecyclerAdapter.kt

@@ -10,7 +10,6 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import java.util.*
 
-
 /**
  * Created by Invincible on 2017/11/24.
  *
@@ -43,7 +42,8 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
     private var itemClickListener: ((holder: ItemViewHolder, item: ITEM) -> Unit)? = 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) {
         itemClickListener = listener
@@ -71,11 +71,10 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
         }
     }
     
-    fun addItemViewDelegates(vararg delegates: Pair<Int, ItemViewDelegate<ITEM>>) {
+    fun addItemViewDelegates(vararg delegates: Pair<Int, ItemViewDelegate<ITEM>>) =
         delegates.forEach {
             addItemViewDelegate(it.first, it.second)
         }
-    }
     
     fun addHeaderView(header: View) {
         synchronized(lock) {
@@ -90,7 +89,7 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
         }
     }
     
-    fun addFooterView(footer: View) {
+    fun addFooterView(footer: View) =
         synchronized(lock) {
             if (footerItems == null) {
                 footerItems = SparseArray()
@@ -101,9 +100,9 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
                 notifyItemInserted(index)
             }
         }
-    }
     
-    fun removeHeaderView(header: View) {
+    
+    fun removeHeaderView(header: View) =
         synchronized(lock) {
             headerItems?.let {
                 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) {
             footerItems?.let {
                 val index = it.indexOfValue(footer)
@@ -125,7 +123,6 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
                 }
             }
         }
-    }
     
     fun setItems(items: List<ITEM>?) {
         synchronized(lock) {
@@ -228,7 +225,7 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
         }
     }
     
-    fun updateItem(item: ITEM) {
+    fun updateItem(item: ITEM) =
         synchronized(lock) {
             val index = this.items.indexOf(item)
             if (index >= 0) {
@@ -236,18 +233,16 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
                 notifyItemChanged(index)
             }
         }
-    }
     
-    fun updateItem(position: Int, payload: Any) {
+    fun updateItem(position: Int, payload: Any) =
         synchronized(lock) {
             val size = getActualItemCount()
             if (position in 0 until size) {
                 notifyItemChanged(position + getHeaderCount(), payload)
             }
         }
-    }
     
-    fun updateItems(fromPosition: Int, toPosition: Int, payloads: Any) {
+    fun updateItems(fromPosition: Int, toPosition: Int, payloads: Any) =
         synchronized(lock) {
             val size = getActualItemCount()
             if (fromPosition in 0 until size && toPosition in 0 until size) {
@@ -258,74 +253,52 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
                 )
             }
         }
-    }
     
-    fun clearItems() {
+    fun clearItems() =
         synchronized(lock) {
             this.items.clear()
             notifyDataSetChanged()
         }
-    }
     
-    fun isEmpty(): Boolean {
+    fun isEmpty() = items.isEmpty()
-        return items.isEmpty()
-    }
     
-    fun isNotEmpty(): Boolean {
+    fun isNotEmpty() = items.isNotEmpty()
-        return items.isNotEmpty()
-    }
     
     /**
      * 除去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 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
     
-    protected open fun getItemViewType(item: ITEM, position: Int): Int {
+    protected open fun getItemViewType(item: ITEM, position: Int) = 0
-        return 0
-    }
     
     /**
      * 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
         isFooter(position) -> TYPE_FOOTER_VIEW + position - getActualItemCount() - getHeaderCount()
         else -> getItem(getActualPosition(position))?.let {
             getItemViewType(it, getActualPosition(position))
         } ?: 0
     }
-    }
     
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = when {
-        return when {
         viewType < TYPE_HEADER_VIEW + getHeaderCount() -> {
             ItemViewHolder(headerItems!!.get(viewType))
         }
@@ -365,11 +338,8 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
             holder
         }
     }
-    }
     
-
+    final override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {}
-    final override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-    }
     
     final override fun onBindViewHolder(
         holder: ItemViewHolder,
@@ -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) {
         itemAnimation?.let {
@@ -434,7 +394,6 @@ abstract class CommonRecyclerAdapter<ITEM>(protected val context: Context) :
         }
     }
     
-
     protected open fun startAnimation(holder: ItemViewHolder, item: ItemAnimation) {
         item.itemAnimation?.let {
             for (anim in it.getAnimators(holder.itemView)) {

app/src/main/java/io/legado/app/base/adapter/ItemAnimation.kt

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

app/src/main/java/io/legado/app/constant/Theme.kt

@@ -7,18 +7,13 @@ enum class Theme {
     Dark, Light, Auto, Transparent;
 
     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
-            }
-        }
     }
 }