Small layout improvement

pull/168/head
M66B 5 years ago
parent 1a5541ebfa
commit 5cb6a725c9

@ -1,149 +1,154 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="24dp"> android:padding="24dp">
<TextView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/tvCaption" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:labelFor="@+id/etLink"
android:text="@string/title_open_link"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tvTitle" android:id="@+id/tvCaption"
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:labelFor="@+id/etLink"
android:labelFor="@+id/etLink" android:text="@string/title_open_link"
android:text="Link title" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" app:layout_constraintStart_toStartOf="parent"
android:textStyle="italic" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCaption" />
<EditText <TextView
android:id="@+id/etLink" android:id="@+id/tvTitle"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="24dp"
android:imeOptions="actionDone" android:labelFor="@+id/etLink"
android:inputType="textUri|textMultiLine" android:text="Link title"
android:text="https://email.faircode.eu/" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvCaption" />
app:layout_constraintTop_toBottomOf="@id/tvTitle">
<requestFocus /> <EditText
</EditText> android:id="@+id/etLink"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:imeOptions="actionDone"
android:inputType="textUri|textMultiLine"
android:text="https://email.faircode.eu/"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvTitle">
<TextView <requestFocus />
android:id="@+id/tvDifferent" </EditText>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:labelFor="@+id/etLink"
android:text="@string/title_different_link"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etLink" />
<CheckBox <TextView
android:id="@+id/cbSecure" android:id="@+id/tvDifferent"
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="24dp"
android:text="@string/title_link_http" android:labelFor="@+id/etLink"
android:textColor="?attr/colorWarning" android:text="@string/title_different_link"
android:textStyle="bold" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" android:textColor="?attr/colorWarning"
app:layout_constraintTop_toBottomOf="@id/tvDifferent" /> android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etLink" />
<CheckBox <CheckBox
android:id="@+id/cbSanitize" android:id="@+id/cbSecure"
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"
android:text="@string/title_sanitize_link" android:text="@string/title_link_http"
app:layout_constraintStart_toStartOf="parent" android:textColor="?attr/colorWarning"
app:layout_constraintTop_toBottomOf="@id/cbSecure" /> android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDifferent" />
<Button <CheckBox
android:id="@+id/btnOwner" android:id="@+id/cbSanitize"
style="@style/buttonStyleSmall" 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" android:text="@string/title_sanitize_link"
android:minWidth="0dp" app:layout_constraintStart_toStartOf="parent"
android:minHeight="0dp" app:layout_constraintTop_toBottomOf="@id/cbSecure" />
android:text="@string/title_check_owner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbSanitize" />
<eu.faircode.email.ContentLoadingProgressBar <Button
android:id="@+id/pbWait" android:id="@+id/btnOwner"
style="@style/Base.Widget.AppCompat.ProgressBar" style="@style/buttonStyleSmall"
android:layout_width="24dp" android:layout_width="wrap_content"
android:layout_height="24dp" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginTop="12dp"
android:indeterminate="true" android:minWidth="0dp"
app:layout_constraintBottom_toBottomOf="@id/btnOwner" android:minHeight="0dp"
app:layout_constraintStart_toEndOf="@id/btnOwner" android:text="@string/title_check_owner"
app:layout_constraintTop_toTopOf="@id/btnOwner" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbSanitize" />
<TextView <eu.faircode.email.ContentLoadingProgressBar
android:id="@+id/tvOwnerRemark" android:id="@+id/pbWait"
android:layout_width="wrap_content" style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_height="wrap_content" android:layout_width="24dp"
android:text="@string/title_remark_owner" android:layout_height="24dp"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:layout_marginStart="12dp"
android:textStyle="italic" android:indeterminate="true"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="@id/btnOwner"
app:layout_constraintTop_toBottomOf="@id/btnOwner" /> app:layout_constraintStart_toEndOf="@id/btnOwner"
app:layout_constraintTop_toTopOf="@id/btnOwner" />
<TextView <TextView
android:id="@+id/tvOwnerTitle" android:id="@+id/tvOwnerRemark"
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_remark_owner"
android:labelFor="@+id/etLink" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:text="@string/title_ip_owner" android:textStyle="italic"
android:textAppearance="@style/TextAppearance.AppCompat.Small" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/btnOwner" />
app:layout_constraintTop_toBottomOf="@id/tvOwnerRemark" />
<TextView <TextView
android:id="@+id/tvHost" android:id="@+id/tvOwnerTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="example.org" android:layout_marginTop="12dp"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:labelFor="@+id/etLink"
android:textColor="?android:textColorPrimary" android:text="@string/title_ip_owner"
app:layout_constraintStart_toStartOf="parent" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintTop_toBottomOf="@id/tvOwnerTitle" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvOwnerRemark" />
<TextView <TextView
android:id="@+id/tvOwner" android:id="@+id/tvHost"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:labelFor="@+id/etLink" android:text="example.org"
android:text="Cloudflare" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textColor="?android:textColorPrimary"
android:textColor="?android:textColorPrimary" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvOwnerTitle" />
app:layout_constraintTop_toBottomOf="@id/tvHost" />
<androidx.constraintlayout.widget.Group <TextView
android:id="@+id/grpOwner" android:id="@+id/tvOwner"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
app:constraint_referenced_ids="tvOwnerTitle,tvHost,tvOwner" /> android:labelFor="@+id/etLink"
</androidx.constraintlayout.widget.ConstraintLayout> android:text="Cloudflare"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:textColorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvHost" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpOwner"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvOwnerTitle,tvHost,tvOwner" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
Loading…
Cancel
Save