mirror of
https://github.com/M66B/FairEmail.git
synced 2024-12-29 11:15:51 +00:00
Rule layout improvement
This commit is contained in:
parent
9232393a9c
commit
8e8f30bc32
1 changed files with 50 additions and 13 deletions
|
@ -80,6 +80,15 @@
|
||||||
|
|
||||||
<!-- condition -->
|
<!-- condition -->
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/vSeparatorSender"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:background="?attr/colorSeparator"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/cbStop" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvSender"
|
android:id="@+id/tvSender"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -97,10 +106,9 @@
|
||||||
android:id="@+id/cbSender"
|
android:id="@+id/cbSender"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="24dp"
|
|
||||||
android:text="@string/title_rule_regex"
|
android:text="@string/title_rule_regex"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbStop" />
|
app:layout_constraintTop_toBottomOf="@id/vSeparatorSender" />
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/etSender"
|
android:id="@+id/etSender"
|
||||||
|
@ -114,7 +122,7 @@
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbSender" />
|
app:layout_constraintTop_toBottomOf="@id/cbSender" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvAndSender"
|
android:id="@+id/tvAndSubject"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="12dp"
|
||||||
|
@ -125,6 +133,14 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/etSender" />
|
app:layout_constraintTop_toBottomOf="@+id/etSender" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/vSeparatorSubject"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:background="?attr/colorSeparator"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvAndSubject" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvSubject"
|
android:id="@+id/tvSubject"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -142,10 +158,9 @@
|
||||||
android:id="@+id/cbSubject"
|
android:id="@+id/cbSubject"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:text="@string/title_rule_regex"
|
android:text="@string/title_rule_regex"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvAndSender" />
|
app:layout_constraintTop_toBottomOf="@id/vSeparatorSubject" />
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/etSubject"
|
android:id="@+id/etSubject"
|
||||||
|
@ -159,7 +174,7 @@
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbSubject" />
|
app:layout_constraintTop_toBottomOf="@id/cbSubject" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvAndSubject"
|
android:id="@+id/tvAndHeader"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
android:layout_marginTop="12dp"
|
||||||
|
@ -170,6 +185,14 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/etSubject" />
|
app:layout_constraintTop_toBottomOf="@+id/etSubject" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/vSeparatorHeader"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:background="?attr/colorSeparator"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvAndHeader" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvHeader"
|
android:id="@+id/tvHeader"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
@ -187,10 +210,9 @@
|
||||||
android:id="@+id/cbHeader"
|
android:id="@+id/cbHeader"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:text="@string/title_rule_regex"
|
android:text="@string/title_rule_regex"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvAndSubject" />
|
app:layout_constraintTop_toBottomOf="@id/vSeparatorHeader" />
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/etHeader"
|
android:id="@+id/etHeader"
|
||||||
|
@ -203,15 +225,23 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/cbHeader" />
|
app:layout_constraintTop_toBottomOf="@id/cbHeader" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/vSeparatorAction"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:background="?attr/colorSeparator"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/etHeader" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvAction"
|
android:id="@+id/tvAction"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="24dp"
|
|
||||||
android:text="@string/title_rule_action"
|
android:text="@string/title_rule_action"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/etHeader" />
|
app:layout_constraintTop_toBottomOf="@+id/vSeparatorAction" />
|
||||||
|
|
||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/spAction"
|
android:id="@+id/spAction"
|
||||||
|
@ -221,15 +251,23 @@
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvAction" />
|
app:layout_constraintTop_toBottomOf="@id/tvAction" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/vSeparatorParameters"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:background="?attr/colorSeparator"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/spAction" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvMoveTarget"
|
android:id="@+id/tvMoveTarget"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:text="@string/title_rule_folder"
|
android:text="@string/title_rule_folder"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/spAction" />
|
app:layout_constraintTop_toBottomOf="@+id/vSeparatorParameters" />
|
||||||
|
|
||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/spTarget"
|
android:id="@+id/spTarget"
|
||||||
|
@ -243,7 +281,6 @@
|
||||||
android:id="@+id/tvAnswerIdentity"
|
android:id="@+id/tvAnswerIdentity"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:text="@string/title_rule_identity"
|
android:text="@string/title_rule_identity"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
|
Loading…
Reference in a new issue