diff options
author | Allan Wang <me@allanwang.ca> | 2018-02-13 16:53:41 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-13 16:53:41 -0500 |
commit | e9111feb62bf245309d1ffde9f8579195d8f6449 (patch) | |
tree | d99509f5759b542484e4663e8a6d33b92a74057f | |
parent | cdb1bd6eec2c90abc9d3d982814552443c7fc3b2 (diff) | |
download | kau-e9111feb62bf245309d1ffde9f8579195d8f6449.tar.gz kau-e9111feb62bf245309d1ffde9f8579195d8f6449.tar.bz2 kau-e9111feb62bf245309d1ffde9f8579195d8f6449.zip |
Reorder final override (#136)
7 files changed, 12 insertions, 10 deletions
@@ -176,7 +176,7 @@ Special thanks to the following awesome people for translating significant porti | French | [Vincent Kulak](https://github.com/VonOx) • [Jean-Philippe Gravel](https://crowdin.com/profile/wokija) | | Galician | [Xesús M. Mosquera](https://twitter.com/xesusmmc?lang=en) | | German | [Bushido1992](https://forum.xda-developers.com/member.php?u=5179246) • [Marcel Soehnchen](https://crowdin.com/profile/msoehnchen) • [3LD0mi HA](https://forum.xda-developers.com/member.php?u=5860523) | -| Indonesian | | +| Indonesian | [M. Angga Ariska](https://www.youtube.com/channel/UCkqMw81s2aw7bYO-U2YhD7w) | | Italian | [Bonnee](https://github.com/Bonnee) | | Korean | [잇스테이크](https://crowdin.com/profile/bexco2010) | | Norwegian | | diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt index bfbc941..7a14d95 100644 --- a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt +++ b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt @@ -38,7 +38,7 @@ abstract class AboutActivityBase(val rClass: Class<*>?, private val configBuilde private val pager: ViewPager by bindView(R.id.about_pager) private val indicator: InkPageIndicator by bindView(R.id.about_indicator) - val currentPage + val currentPage: Int get() = pager.currentItem /** diff --git a/adapter/src/main/kotlin/ca/allanwang/kau/iitems/KauIItem.kt b/adapter/src/main/kotlin/ca/allanwang/kau/iitems/KauIItem.kt index 335b89c..7918a26 100644 --- a/adapter/src/main/kotlin/ca/allanwang/kau/iitems/KauIItem.kt +++ b/adapter/src/main/kotlin/ca/allanwang/kau/iitems/KauIItem.kt @@ -18,8 +18,8 @@ open class KauIItem<Item, VH : RecyclerView.ViewHolder>( private val viewHolder: (v: View) -> VH, private val type: Int = layoutRes ) : AbstractItem<Item, VH>() where Item : IItem<*, *>, Item : IClickable<*> { - override final fun getType(): Int = type - override final fun getViewHolder(v: View): VH = viewHolder(v) - override final fun getLayoutRes(): Int = layoutRes + final override fun getType(): Int = type + final override fun getViewHolder(v: View): VH = viewHolder(v) + final override fun getLayoutRes(): Int = layoutRes }
\ No newline at end of file diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt index d2c1190..4510744 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/activities/ElasticRecyclerActivity.kt @@ -41,7 +41,7 @@ abstract class ElasticRecyclerActivity : KauBaseActivity() { var exitTransitionTop = R.transition.kau_exit_slide_top } - override final fun onCreate(savedInstanceState: Bundle?) { + final override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.kau_elastic_recycler_activity) setSupportActionBar(toolbar) diff --git a/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt b/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt index 514b483..8923775 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/ui/views/CollapsibleViewDelegate.kt @@ -37,7 +37,7 @@ interface CollapsibleView { class CollapsibleViewDelegate : CollapsibleView { private lateinit var viewRef: WeakReference<View> - private inline val view + private inline val view: View? get() = viewRef.get() private var animator: ValueAnimator? = null diff --git a/core/src/main/kotlin/ca/allanwang/kau/utils/ViewUtils.kt b/core/src/main/kotlin/ca/allanwang/kau/utils/ViewUtils.kt index 1946dbc..484e5bd 100644 --- a/core/src/main/kotlin/ca/allanwang/kau/utils/ViewUtils.kt +++ b/core/src/main/kotlin/ca/allanwang/kau/utils/ViewUtils.kt @@ -248,7 +248,7 @@ fun RecyclerView.withLinearAdapter(rvAdapter: RecyclerView.Adapter<*>) = apply { /** * Animate a transition a given imageview - * If it is not shown, the action will be invoked directly and the fab will be shown + * If it is not shown, the action will be invoked directly and no further actions will be made * If it is already shown, scaling and alpha animations will be added to the action */ inline fun <T : ImageView> T.fadeScaleTransition(duration: Long = 500L, minScale: Float = 0.7f, crossinline action: T.() -> Unit) { diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml index d668eb6..31163d0 100644 --- a/sample/src/main/res/xml/kau_changelog.xml +++ b/sample/src/main/res/xml/kau_changelog.xml @@ -6,6 +6,10 @@ <item text="" /> --> + <version title="v3.6.4" /> + <item text="Update documentation" /> + <item text="" /> + <version title="v3.6.3" /> <item text=":core: Check for tablet in email builder" /> <item text=":kpref-activity: Simplify internal code and add better encapsulation" /> @@ -13,8 +17,6 @@ <item text="Add Chinese, Indonesian, Norwegian, Polish, Thai, and Turkish translations" /> <item text="Add back git versioning" /> <item text="Created gradle plugin for getting version updates" /> - <item text="" /> - <item text="" /> <version title="v3.6.2" /> <item text=":core: Pass null instead of bundle if bundle is empty for startActivity" /> |