From bf136d76b81835a44a0d9038b2a87806247296e8 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 21 Aug 2017 14:39:00 -0700 Subject: Fix/kpref-inner-frame-size (#42) * Fix kpref item barriers * Revert and add text constraint --- .../kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSeekbar.kt | 1 - kpref-activity/src/main/res/layout/kau_pref_core.xml | 6 +++--- kpref-activity/src/main/res/layout/kau_pref_text.xml | 7 +++++-- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'kpref-activity') diff --git a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSeekbar.kt b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSeekbar.kt index 6a9f6b0..3afa614 100644 --- a/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSeekbar.kt +++ b/kpref-activity/src/main/kotlin/ca/allanwang/kau/kpref/activity/items/KPrefSeekbar.kt @@ -3,7 +3,6 @@ package ca.allanwang.kau.kpref.activity.items import android.view.View import android.widget.SeekBar import android.widget.TextView -import ca.allanwang.kau.kpref.KPrefException import ca.allanwang.kau.kpref.activity.GlobalOptions import ca.allanwang.kau.kpref.activity.R import ca.allanwang.kau.utils.tint diff --git a/kpref-activity/src/main/res/layout/kau_pref_core.xml b/kpref-activity/src/main/res/layout/kau_pref_core.xml index 4b5de56..183c53e 100644 --- a/kpref-activity/src/main/res/layout/kau_pref_core.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_core.xml @@ -81,10 +81,10 @@ diff --git a/kpref-activity/src/main/res/layout/kau_pref_text.xml b/kpref-activity/src/main/res/layout/kau_pref_text.xml index bae83f2..40fed2a 100644 --- a/kpref-activity/src/main/res/layout/kau_pref_text.xml +++ b/kpref-activity/src/main/res/layout/kau_pref_text.xml @@ -2,6 +2,9 @@ android:id="@id/kau_pref_inner_content" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:focusable="false" + android:background="@null" android:clickable="false" - android:background="@null" /> \ No newline at end of file + android:ellipsize="end" + android:focusable="false" + android:maxLines="3" + android:maxWidth="150dp" /> \ No newline at end of file -- cgit v1.2.3