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 /core-ui/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 'core-ui/src/main/kotlin/ca')
| -rw-r--r-- | core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt index 51f7ab9..726f5b6 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt @@ -138,7 +138,7 @@ class TextSlider @JvmOverloads constructor( init { setFactory { TextView(context).apply { - //replica of toolbar title + // replica of toolbar title gravity = Gravity.START setSingleLine() ellipsize = TextUtils.TruncateAt.END |