kopia lustrzana https://github.com/ryukoposting/Signal-Android
Add better check boxes.
rodzic
a9d7417597
commit
bacad359b2
|
@ -138,19 +138,7 @@ public class ContactSelectionListItem extends ConstraintLayout implements Recipi
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setChecked(boolean selected, boolean animate) {
|
public void setChecked(boolean selected, boolean animate) {
|
||||||
boolean wasSelected = checkBox.isChecked();
|
checkBox.setChecked(selected);
|
||||||
|
|
||||||
if (wasSelected != selected) {
|
|
||||||
checkBox.setChecked(selected);
|
|
||||||
|
|
||||||
float alpha = selected ? 1f : 0f;
|
|
||||||
if (animate) {
|
|
||||||
checkBox.animate().setDuration(250L).alpha(alpha);
|
|
||||||
} else {
|
|
||||||
checkBox.animate().cancel();
|
|
||||||
checkBox.setAlpha(alpha);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:enterFadeDuration="250" android:exitFadeDuration="250">
|
||||||
<item android:state_checked="true" android:state_enabled="false">
|
<item android:state_checked="true" android:state_enabled="false">
|
||||||
<layer-list>
|
<layer-list>
|
||||||
<item>
|
<item>
|
||||||
|
@ -23,6 +23,8 @@
|
||||||
</layer-list>
|
</layer-list>
|
||||||
</item>
|
</item>
|
||||||
<item android:state_checked="false">
|
<item android:state_checked="false">
|
||||||
<color android:color="@null" />
|
<shape android:shape="oval">
|
||||||
|
<stroke android:width="2dp" android:color="@color/core_grey_75" />
|
||||||
|
</shape>
|
||||||
</item>
|
</item>
|
||||||
</selector>
|
</selector>
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:enterFadeDuration="250" android:exitFadeDuration="250">
|
||||||
<item android:state_checked="true" android:state_enabled="false">
|
<item android:state_checked="true" android:state_enabled="false">
|
||||||
<layer-list>
|
<layer-list>
|
||||||
<item>
|
<item>
|
||||||
|
@ -23,6 +23,8 @@
|
||||||
</layer-list>
|
</layer-list>
|
||||||
</item>
|
</item>
|
||||||
<item android:state_checked="false">
|
<item android:state_checked="false">
|
||||||
<color android:color="@null" />
|
<shape android:shape="oval">
|
||||||
|
<stroke android:width="2dp" android:color="@color/core_grey_25" />
|
||||||
|
</shape>
|
||||||
</item>
|
</item>
|
||||||
</selector>
|
</selector>
|
|
@ -37,9 +37,8 @@
|
||||||
|
|
||||||
<androidx.appcompat.widget.AppCompatCheckBox
|
<androidx.appcompat.widget.AppCompatCheckBox
|
||||||
android:id="@+id/check_box"
|
android:id="@+id/check_box"
|
||||||
android:layout_width="22dp"
|
android:layout_width="24dp"
|
||||||
android:layout_height="22dp"
|
android:layout_height="24dp"
|
||||||
android:alpha="0"
|
|
||||||
android:background="@drawable/contact_selection_checkbox"
|
android:background="@drawable/contact_selection_checkbox"
|
||||||
android:button="@null"
|
android:button="@null"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
|
@ -80,7 +79,11 @@
|
||||||
android:textColor="@color/signal_text_secondary"
|
android:textColor="@color/signal_text_secondary"
|
||||||
android:textDirection="ltr"
|
android:textDirection="ltr"
|
||||||
app:emoji_forceCustom="true"
|
app:emoji_forceCustom="true"
|
||||||
|
app:layout_constrainedWidth="true"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toStartOf="@id/label"
|
||||||
|
app:layout_constraintHorizontal_bias="0"
|
||||||
|
app:layout_constraintHorizontal_chainStyle="packed"
|
||||||
app:layout_constraintStart_toEndOf="@id/contact_photo_image"
|
app:layout_constraintStart_toEndOf="@id/contact_photo_image"
|
||||||
app:layout_constraintTop_toBottomOf="@id/name"
|
app:layout_constraintTop_toBottomOf="@id/name"
|
||||||
tools:text="@sample/contacts.json/data/number" />
|
tools:text="@sample/contacts.json/data/number" />
|
||||||
|
@ -94,6 +97,7 @@
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textAppearance="@style/TextAppearance.Signal.Body2"
|
android:textAppearance="@style/TextAppearance.Signal.Body2"
|
||||||
android:textColor="@color/signal_text_secondary"
|
android:textColor="@color/signal_text_secondary"
|
||||||
|
app:layout_constraintEnd_toEndOf="@id/name"
|
||||||
app:layout_constraintStart_toEndOf="@id/number"
|
app:layout_constraintStart_toEndOf="@id/number"
|
||||||
app:layout_constraintTop_toTopOf="@id/number"
|
app:layout_constraintTop_toTopOf="@id/number"
|
||||||
tools:ignore="RtlSymmetry"
|
tools:ignore="RtlSymmetry"
|
||||||
|
|
Ładowanie…
Reference in New Issue