Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Remove circle, make button flat to improve setup UX.

Browse Source
This commit is contained in:
akwizgran
2018-05-09 10:50:23 +01:00
parent 0ad9415850
commit dc5bd39ce4
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/login/PowerView.java
View File

@@ -89,9 +89,9 @@ abstract class PowerView extends ConstraintLayout {
public void setChecked(boolean checked) { public void setChecked(boolean checked) {
this.checked = checked; this.checked = checked;
if (checked) { if (checked) {
checkImage.setImageResource(R.drawable.ic_check_white); checkImage.setVisibility(VISIBLE);
} else { } else {
checkImage.setImageResource(R.drawable.contact_disconnected); checkImage.setVisibility(INVISIBLE);
} }
if (onCheckedChangedListener != null) { if (onCheckedChangedListener != null) {
onCheckedChangedListener.onCheckedChanged(); onCheckedChangedListener.onCheckedChanged();

20
briar-android/src/main/res/layout/power_view.xml
View File

@@ -20,10 +20,12 @@
<ImageView <ImageView
android:id="@+id/checkImage" android:id="@+id/checkImage"
android:layout_width="wrap_content" android:layout_width="24dp"
android:layout_height="wrap_content" android:layout_height="24dp"
android:src="@drawable/contact_disconnected" android:layout_margin="8dp"
android:src="@drawable/ic_check_white"
android:tint="?colorControlNormal" android:tint="?colorControlNormal"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/button" app:layout_constraintBottom_toBottomOf="@+id/button"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/button" app:layout_constraintTop_toTopOf="@+id/button"
@@ -34,9 +36,7 @@
style="@style/BriarButton.Default" style="@style/BriarButton.Default"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_margin="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toStartOf="@+id/helpButton" app:layout_constraintEnd_toStartOf="@+id/helpButton"
app:layout_constraintStart_toEndOf="@+id/checkImage" app:layout_constraintStart_toEndOf="@+id/checkImage"
app:layout_constraintTop_toBottomOf="@+id/textView" app:layout_constraintTop_toBottomOf="@+id/textView"
@@ -44,11 +44,13 @@
<ImageButton <ImageButton
android:id="@+id/helpButton" android:id="@+id/helpButton"
style="@style/BriarButton.Default" style="@style/BriarButtonFlat.Positive"
android:layout_width="48dp" android:layout_width="24dp"
android:layout_height="wrap_content" android:layout_height="24dp"
android:layout_margin="8dp"
android:contentDescription="@string/help" android:contentDescription="@string/help"
android:src="@drawable/ic_help_outline_white" android:src="@drawable/ic_help_outline_white"
android:tint="@color/briar_button_positive"
app:layout_constraintBottom_toBottomOf="@+id/button" app:layout_constraintBottom_toBottomOf="@+id/button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/button"/> app:layout_constraintTop_toTopOf="@+id/button"/>