diff options
Diffstat (limited to 'core/src/main/res/layout')
6 files changed, 42 insertions, 9 deletions
diff --git a/core/src/main/res/layout/kau_preference.xml b/core/src/main/res/layout/kau_preference.xml index c49951b..7ee4f01 100644 --- a/core/src/main/res/layout/kau_preference.xml +++ b/core/src/main/res/layout/kau_preference.xml @@ -40,7 +40,7 @@ android:id="@+id/kau_pref_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="16dp" + android:layout_marginTop="@dimen/kau_padding_normal" android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceListItem" android:textColor="?android:attr/textColorPrimary" @@ -49,23 +49,36 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@id/kau_pref_icon" app:layout_constraintTop_toTopOf="parent" - app:layout_goneMarginBottom="16dp" + app:layout_goneMarginBottom="@dimen/kau_padding_normal" tools:layout_editor_absoluteX="-175dp" /> <TextView android:id="@id/kau_pref_desc" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="16dp" android:ellipsize="end" android:maxLines="10" android:textAppearance="?android:attr/textAppearanceListItemSecondary" android:textColor="?android:attr/textColorSecondary" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@+id/kau_pref_lower_frame" app:layout_constraintEnd_toStartOf="@id/kau_pref_inner_frame" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@id/kau_pref_icon" app:layout_constraintTop_toBottomOf="@id/kau_pref_title" + app:layout_goneMarginBottom="@dimen/kau_padding_normal" + tools:layout_editor_absoluteX="-175dp" /> + + <LinearLayout + android:id="@id/kau_pref_lower_frame" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/kau_padding_normal" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/kau_pref_inner_frame" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintStart_toEndOf="@id/kau_pref_icon" + app:layout_constraintTop_toBottomOf="@id/kau_pref_desc" tools:layout_editor_absoluteX="-175dp" /> <android.support.constraint.Barrier @@ -73,7 +86,7 @@ android:layout_width="1dp" android:layout_height="wrap_content" app:barrierDirection="end" - app:constraint_referenced_ids="kau_pref_title,kau_pref_desc" + app:constraint_referenced_ids="kau_pref_title,kau_pref_desc,kau_pref_lower_frame" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -83,7 +96,7 @@ android:layout_height="0dp" android:gravity="center_vertical|end" android:orientation="horizontal" - android:paddingStart="16dp" + android:paddingStart="@dimen/kau_padding_normal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" diff --git a/core/src/main/res/layout/kau_preference_checkbox.xml b/core/src/main/res/layout/kau_preference_checkbox.xml index 5ab368b..016394f 100644 --- a/core/src/main/res/layout/kau_preference_checkbox.xml +++ b/core/src/main/res/layout/kau_preference_checkbox.xml @@ -1,5 +1,5 @@ <CheckBox xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/kau_pref_inner_content" + android:id="@id/kau_pref_inner_content" android:layout_width="wrap_content" android:layout_height="wrap_content" android:focusable="false" diff --git a/core/src/main/res/layout/kau_preference_color_preview.xml b/core/src/main/res/layout/kau_preference_color_preview.xml index 2374971..18ca35a 100644 --- a/core/src/main/res/layout/kau_preference_color_preview.xml +++ b/core/src/main/res/layout/kau_preference_color_preview.xml @@ -1,5 +1,5 @@ <ca.allanwang.kau.dialogs.color.CircleView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/kau_pref_inner_content" + android:id="@id/kau_pref_inner_content" android:layout_width="40dp" android:layout_height="40dp" android:focusable="false" diff --git a/core/src/main/res/layout/kau_preference_seekbar.xml b/core/src/main/res/layout/kau_preference_seekbar.xml new file mode 100644 index 0000000..8da4d5d --- /dev/null +++ b/core/src/main/res/layout/kau_preference_seekbar.xml @@ -0,0 +1,8 @@ +<SeekBar xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@id/kau_pref_lower_content" + android:layout_width="match_parent" + android:paddingTop="@dimen/kau_padding_normal" + android:layout_height="wrap_content" + android:focusable="false" + android:clickable="false" + android:background="@null" />
\ No newline at end of file diff --git a/core/src/main/res/layout/kau_preference_seekbar_text.xml b/core/src/main/res/layout/kau_preference_seekbar_text.xml new file mode 100644 index 0000000..6ba2543 --- /dev/null +++ b/core/src/main/res/layout/kau_preference_seekbar_text.xml @@ -0,0 +1,12 @@ +<!--TextView that aligns to the bottom--> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@id/kau_pref_inner_content" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:background="@null" + android:clickable="false" + android:focusable="false" + android:gravity="bottom|end" + android:paddingBottom="@dimen/kau_padding_normal" />
\ No newline at end of file diff --git a/core/src/main/res/layout/kau_preference_text.xml b/core/src/main/res/layout/kau_preference_text.xml index bbabdfb..a4d901e 100644 --- a/core/src/main/res/layout/kau_preference_text.xml +++ b/core/src/main/res/layout/kau_preference_text.xml @@ -1,5 +1,5 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/kau_pref_inner_content" + android:id="@id/kau_pref_inner_content" android:layout_width="wrap_content" android:layout_height="wrap_content" android:focusable="false" |