Skip to content

Commit

Permalink
Moved the copy button in wallet_information.xml, fixed layout order a…
Browse files Browse the repository at this point in the history 
…nd constraints.
  • Loading branch information
@Aldin-SXR
Aldin-SXR committed May 27, 2021
1 parent 0083065 commit 77c2e27
Show file tree
Hide file tree
Showing 2 changed files with 111 additions and 95 deletions.
3 changes: 1 addition & 2 deletions android/app/src/main/java/org/electroncash/electroncash3/Main.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -676,8 +676,7 @@ class SeedDialog : AlertDialogFragment() {
class WalletInformationDialog : AlertDialogFragment() {
override fun onBuildDialog(builder: AlertDialog.Builder) {

builder.setTitle(R.string.wallet_information)
.setView(R.layout.wallet_information)
builder.setView(R.layout.wallet_information)
.setPositiveButton(android.R.string.ok, null)
}

Expand Down
203 changes: 110 additions & 93 deletions android/app/src/main/res/layout/wallet_information.xml
View file
Original file line number Diff line number Diff line change
@@ -1,122 +1,139 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:orientation="vertical">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView
android:id="@+id/textView28"
android:layout_width="0dp"
android:layout_height="21dp"
android:layout_marginStart="24dp"
android:gravity="fill_horizontal"
android:text="@string/wallet_name"
app:layout_constraintBaseline_toBaselineOf="@+id/idWalletName"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/textView29"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="@string/wallet_type"
app:layout_constraintBaseline_toBaselineOf="@+id/idWalletType"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/textView30"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="@string/script_type"
app:layout_constraintBaseline_toBaselineOf="@+id/idScriptType"
app:layout_constraintStart_toStartOf="parent" />

<EditText
android:id="@+id/walletMasterKey"
android:id="@+id/tvWalletInformation"
style="@style/DialogTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:editable="false"
android:ems="10"
android:gravity="start|top"
android:inputType="textMultiLine"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginLeft="24dp"
android:text="@string/wallet_information"
app:layout_constraintEnd_toStartOf="@+id/fabCopyMasterKey2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView25" />

<TextView
android:id="@+id/textView25"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:text="@string/here_is"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView30"
tools:text="@string/here_is" />
app:layout_constraintTop_toTopOf="parent" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabCopyMasterKey2"
style="@style/FAB.Dialog"
style="@style/FAB.Dialog.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginRight="24dp"
android:clickable="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/textView25"
app:layout_constraintTop_toBottomOf="@+id/textView30"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_copy_24dp" />
</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.Barrier
android:id="@+id/idBarrier2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="end"
app:constraint_referenced_ids="textView28,textView29,textView30"
tools:layout_editor_absoluteX="118dp" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp">

<TextView
android:id="@+id/idWalletName"
style="@style/Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="24dp"
android:text="@string/wallet_name"
app:layout_constraintStart_toEndOf="@id/idBarrier2"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView
android:id="@+id/idWalletType"
style="@style/Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:text="@string/wallet_type"
app:layout_constraintStart_toEndOf="@id/idBarrier2"
app:layout_constraintTop_toBottomOf="@+id/idWalletName" />
<TextView
android:id="@+id/textView28"
android:layout_width="0dp"
android:layout_height="21dp"
android:gravity="fill_horizontal"
android:text="@string/wallet_name"
app:layout_constraintBaseline_toBaselineOf="@+id/idWalletName"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/idScriptType"
style="@style/Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:text="@string/script_type"
app:layout_constraintStart_toEndOf="@id/idBarrier2"
app:layout_constraintTop_toBottomOf="@+id/idWalletType" />
<TextView
android:id="@+id/idWalletName"
style="@style/Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:text="@string/wallet_name"
app:layout_constraintStart_toEndOf="@id/idBarrier2"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<TextView
android:id="@+id/textView29"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/wallet_type"
app:layout_constraintBaseline_toBaselineOf="@+id/idWalletType"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/idWalletType"
style="@style/Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:text="@string/wallet_type"
app:layout_constraintStart_toEndOf="@id/idBarrier2"
app:layout_constraintTop_toBottomOf="@+id/idWalletName" />

<TextView
android:id="@+id/textView30"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/script_type"
app:layout_constraintBaseline_toBaselineOf="@+id/idScriptType"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/idScriptType"
style="@style/Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:text="@string/script_type"
app:layout_constraintStart_toEndOf="@id/idBarrier2"
app:layout_constraintTop_toBottomOf="@+id/idWalletType" />

<TextView
android:id="@+id/textView25"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/here_is"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/idScriptType"
tools:text="@string/here_is" />

<EditText
android:id="@+id/walletMasterKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:editable="false"
android:ems="10"
android:gravity="start|top"
android:inputType="textMultiLine"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView25" />

<androidx.constraintlayout.widget.Barrier
android:id="@+id/idBarrier2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="end"
app:constraint_referenced_ids="textView28,textView29,textView30"
tools:layout_editor_absoluteX="118dp" />

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</LinearLayout>

0 comments on commit 77c2e27

Please sign in to comment.