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 /sample/src | |
parent | d6f213563be35b183f81e20e95d925dbd65e4694 (diff) | |
parent | a9407288fad0d30e71e2f6862b66533e043f9311 (diff) | |
download | kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.gz kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.bz2 kau-71dcceaf1970873596a59a734f1a574120beff6b.zip |
Fix conflicts
Diffstat (limited to 'sample/src')
3 files changed, 3 insertions, 5 deletions
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt index f6d5ccc..a5ef8c3 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/AnimActivity.kt @@ -45,9 +45,7 @@ class AnimActivity : KauBaseActivity() { val adapter = FastItemAdapter<PermissionCheckbox>() setContentView(fullLinearRecycler(adapter).apply { setBackgroundColor( - KPrefSample.bgColor.withAlpha( - 255 - ) + KPrefSample.bgColor.withAlpha(255) ) }) diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt index 11d19e5..4fe941b 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt @@ -47,7 +47,7 @@ class MainActivity : KPrefActivity() { companion object { - //some of the most common english words for show + // some of the most common english words for show val wordBank: List<String> by lazy { listOf( "the", "name", "of", "very", "to", "through", diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt index 7cf6cc1..68dde2a 100644 --- a/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt +++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/PermissionCheckbox.kt @@ -33,7 +33,7 @@ class PermissionCheckbox(val permission: String) : KauIItem<PermissionCheckbox.V holder.text.text = permission holder.checkbox.isChecked = holder.itemView.context.hasPermission(permission) holder.checkbox.isClickable = false - holder.checkbox.jumpDrawablesToCurrentState() //Cancel the animation + holder.checkbox.jumpDrawablesToCurrentState() // Cancel the animation } class ViewHolder(v: View) : RecyclerView.ViewHolder(v) { |