Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Rearrange layout so sending link comes first

Browse Source
This commit is contained in:
Torsten Grote
2018-10-22 12:38:51 -03:00
parent 6706fea2d3
commit 1cd4134cb0
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
briar-android/src/main/res/layout/fragment_contact_link_exchange.xml
View File

@@ -4,8 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:fillViewport="true">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -23,17 +22,16 @@
android:hint="@string/contact_name_hint" android:hint="@string/contact_name_hint"
android:importantForAutofill="no" android:importantForAutofill="no"
android:inputType="text|textCapWords" android:inputType="text|textCapWords"
app:layout_constraintBottom_toTopOf="@id/linkInput" app:layout_constraintBottom_toTopOf="@+id/addButton"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/pasteButton"/>
app:layout_constraintVertical_chainStyle="packed"/>
<EditText <EditText
android:id="@+id/linkInput" android:id="@+id/linkInput"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_xlarge" android:layout_marginTop="16dp"
android:drawableLeft="@drawable/ic_link" android:drawableLeft="@drawable/ic_link"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_link" android:drawableStart="@drawable/ic_link"
@@ -41,25 +39,25 @@
android:hint="@string/contact_link_hint" android:hint="@string/contact_link_hint"
android:importantForAutofill="no" android:importantForAutofill="no"
android:inputType="textUri" android:inputType="textUri"
app:layout_constraintBottom_toTopOf="@id/pasteButton"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/contactNameInput"/> app:layout_constraintTop_toBottomOf="@+id/copyButton"/>
<Button <Button
android:id="@+id/pasteButton" android:id="@+id/pasteButton"
style="@style/BriarButtonFlat.Positive.Tiny" style="@style/BriarButtonFlat.Positive.Tiny"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:drawableLeft="@drawable/ic_content_paste" android:drawableLeft="@drawable/ic_content_paste"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_content_paste" android:drawableStart="@drawable/ic_content_paste"
android:text="@string/paste_button" android:text="@string/paste_button"
app:layout_constraintBottom_toTopOf="@id/linkIntro" app:layout_constraintBottom_toTopOf="@+id/contactNameInput"
app:layout_constraintEnd_toStartOf="@id/scanCodeButton" app:layout_constraintEnd_toStartOf="@id/scanCodeButton"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linkInput"/> app:layout_constraintTop_toBottomOf="@+id/linkInput"/>
<Button <Button
android:id="@+id/scanCodeButton" android:id="@+id/scanCodeButton"
@@ -74,53 +72,54 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@id/pasteButton" app:layout_constraintStart_toEndOf="@id/pasteButton"
app:layout_constraintTop_toBottomOf="@id/linkInput"/> app:layout_constraintTop_toTopOf="@+id/pasteButton"
tools:visibility="visible"/>
<TextView <TextView
android:id="@+id/linkIntro" android:id="@+id/linkIntro"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_xlarge" android:gravity="left|start"
android:gravity="center"
android:text="@string/send_link_instructions" android:text="@string/send_link_instructions"
android:textIsSelectable="true"
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@id/linkView" app:layout_constraintBottom_toTopOf="@+id/linkView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/pasteButton"/> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"/>
<TextView <TextView
android:id="@+id/linkView" android:id="@+id/linkView"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="16dp"
android:background="@color/briar_white" android:background="@color/briar_white"
android:padding="8dp" android:padding="8dp"
android:textColor="@color/briar_primary" android:textColor="@color/briar_primary"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="18sp" android:textSize="18sp"
android:typeface="monospace" android:typeface="monospace"
app:layout_constraintBottom_toTopOf="@id/copyButton" app:layout_constraintBottom_toTopOf="@+id/copyButton"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linkIntro" app:layout_constraintTop_toBottomOf="@+id/linkIntro"
tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv"/> tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv"
/>
<Button <Button
android:id="@+id/copyButton" android:id="@+id/copyButton"
style="@style/BriarButtonFlat.Positive.Tiny" style="@style/BriarButtonFlat.Positive.Tiny"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:drawableLeft="@drawable/ic_content_copy" android:drawableLeft="@drawable/ic_content_copy"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_content_copy" android:drawableStart="@drawable/ic_content_copy"
android:text="@string/copy_button" android:text="@string/copy_button"
app:layout_constraintBottom_toTopOf="@id/addButton" app:layout_constraintBottom_toTopOf="@+id/linkInput"
app:layout_constraintEnd_toStartOf="@id/shareButton" app:layout_constraintEnd_toStartOf="@id/shareButton"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linkView"/> app:layout_constraintTop_toBottomOf="@+id/linkView"/>
<Button <Button
android:id="@+id/shareButton" android:id="@+id/shareButton"
@@ -133,7 +132,6 @@
android:text="@string/share_button" android:text="@string/share_button"
app:layout_constraintBottom_toBottomOf="@id/copyButton" app:layout_constraintBottom_toBottomOf="@id/copyButton"
app:layout_constraintEnd_toStartOf="@id/showCodeButton" app:layout_constraintEnd_toStartOf="@id/showCodeButton"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@id/copyButton" app:layout_constraintStart_toEndOf="@id/copyButton"
app:layout_constraintTop_toTopOf="@id/copyButton"/> app:layout_constraintTop_toTopOf="@id/copyButton"/>
@@ -150,22 +148,23 @@
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/copyButton" app:layout_constraintBottom_toBottomOf="@id/copyButton"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@id/shareButton" app:layout_constraintStart_toEndOf="@id/shareButton"
app:layout_constraintTop_toTopOf="@id/copyButton"/> app:layout_constraintTop_toTopOf="@id/copyButton"
tools:visibility="visible"/>
<Button <Button
android:id="@+id/addButton" android:id="@+id/addButton"
style="@style/BriarButton" style="@style/BriarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_xlarge" android:layout_marginBottom="8dp"
android:layout_marginTop="16dp"
android:enabled="false" android:enabled="false"
android:text="@string/add_contact_button" android:text="@string/add_contact_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.75"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/copyButton" app:layout_constraintTop_toBottomOf="@+id/contactNameInput"
tools:enabled="true"/> tools:enabled="true"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

4
briar-android/src/main/res/values/strings.xml
View File

@@ -153,8 +153,8 @@
<string name="add_contact_nearby_title">Add Contact Nearby</string> <string name="add_contact_nearby_title">Add Contact Nearby</string>
<string name="add_contact_remotely_title">Add Contact with Link</string> <string name="add_contact_remotely_title">Add Contact with Link</string>
<string name="contact_name_hint">Contact name</string> <string name="contact_name_hint">Give contact a nickname</string>
<string name="contact_link_hint">Contact link</string> <string name="contact_link_hint">Your contact\'s link</string>
<string name="paste_button">Paste</string> <string name="paste_button">Paste</string>
<string name="scan_qr_code_button">QR Code</string> <string name="scan_qr_code_button">QR Code</string>
<string name="add_contact_button">Add Contact</string> <string name="add_contact_button">Add Contact</string>