diff options
author | Allan Wang <me@allanwang.ca> | 2019-08-16 00:11:37 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-16 00:11:37 -0700 |
commit | a9407288fad0d30e71e2f6862b66533e043f9311 (patch) | |
tree | a357e6cd419123d69ca5d2977c8ce839c56f3d87 /about | |
parent | 807a3661e4d234c525ea855ebb7a43a02d5184a1 (diff) | |
parent | 5aefeee08f68777dd07a16bd42a7d2392db6bbc9 (diff) | |
download | kau-a9407288fad0d30e71e2f6862b66533e043f9311.tar.gz kau-a9407288fad0d30e71e2f6862b66533e043f9311.tar.bz2 kau-a9407288fad0d30e71e2f6862b66533e043f9311.zip |
Merge pull request #225 from AllanWang/versions
Versions
Diffstat (limited to 'about')
-rw-r--r-- | about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt | 8 | ||||
-rw-r--r-- | about/src/main/kotlin/ca/allanwang/kau/about/CutoutIItem.kt | 2 |
2 files changed, 5 insertions, 5 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 452d28c..d17c3ec 100644 --- a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt +++ b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt @@ -77,7 +77,7 @@ abstract class AboutActivityBase(val rClass: Class<*>?, private val configBuilde super.onCreate(savedInstanceState) setContentView(R.layout.kau_activity_about) pageStatus = IntArray(panels.size) - pageStatus[0] = 2 //the first page is instantly visible + pageStatus[0] = 2 // the first page is instantly visible if (configs.textColor != null) about_indicator.setColour(configs.textColor!!) with(about_pager) { adapter = AboutPagerAdapter() @@ -107,14 +107,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 @@ -186,7 +186,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 } } |