diff options
author | Allan Wang <me@allanwang.ca> | 2019-08-16 00:24:22 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2019-08-16 00:24:22 -0700 |
commit | 71dcceaf1970873596a59a734f1a574120beff6b (patch) | |
tree | d8d79984f591ec5fc43ac93a15715eaef9b887d3 /about/src/main/kotlin/ca | |
parent | d6f213563be35b183f81e20e95d925dbd65e4694 (diff) | |
parent | a9407288fad0d30e71e2f6862b66533e043f9311 (diff) | |
download | kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.gz kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.bz2 kau-71dcceaf1970873596a59a734f1a574120beff6b.zip |
Fix conflicts
Diffstat (limited to 'about/src/main/kotlin/ca')
-rw-r--r-- | about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt | 6 | ||||
-rw-r--r-- | about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt | 2 |
2 files changed, 4 insertions, 4 deletions
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 f7eddb9..5c3a00b 100644 --- a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt +++ b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt @@ -111,14 +111,14 @@ abstract class AboutActivityBase(val rClass: Class<*>?, private val configBuilde var libPageTitle: String? = null set(value) { field = value - libPageTitleRes = INVALID_ID //reset res so we don't use our default + libPageTitleRes = INVALID_ID // reset res so we don't use our default } var faqXmlRes: Int = INVALID_ID var faqPageTitleRes: Int = R.string.kau_about_faq_intro var faqPageTitle: String? = null set(value) { field = value - faqPageTitleRes = INVALID_ID //reset res so we don't use our default + faqPageTitleRes = INVALID_ID // reset res so we don't use our default } /** * Whether new lines should be included @@ -190,7 +190,7 @@ abstract class AboutActivityBase(val rClass: Class<*>?, private val configBuilde } override fun onDestroy() { - AnimHolder.decelerateInterpolator.invalidate() //clear the reference to the interpolators we've used + AnimHolder.decelerateInterpolator.invalidate() // clear the reference to the interpolators we've used super.onDestroy() } } diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt b/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt index d51db46..d92f6a7 100644 --- a/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt +++ b/about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt @@ -47,7 +47,7 @@ class CutoutIItem(val config: CutoutView.() -> Unit = {}) : KauIItem<CutoutIItem super.unbindView(holder) with(holder) { cutout.drawable = null - cutout.text = "Text" //back to default + cutout.text = "Text" // back to default } } |