agorise
/
crystal-wallet-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Include layout in the buttons to fix orientación and correct size with the new properties

feat_androidx_migration
dtvv 2018-10-12 04:08:44 -05:00
parent b4cc708970
commit 046e21d725
2 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt
View File

@ -320,7 +320,7 @@ class CreateSeedActivity : CustomActivity() {
* */ * */
private fun enableCreate() { private fun enableCreate() {
runOnUiThread(Runnable { runOnUiThread(Runnable {
btnCreate?.setBackgroundColor(resources.getColor(R.color.colorPrimary)) //btnCreate?.setBackgroundColor(resources.getColor(R.color.colorPrimary))
btnCreate?.setEnabled(true) btnCreate?.setEnabled(true)
}) })
} }
@ -331,7 +331,7 @@ class CreateSeedActivity : CustomActivity() {
private fun disableCreate() { private fun disableCreate() {
runOnUiThread(Runnable { runOnUiThread(Runnable {
btnCreate?.setEnabled(false) btnCreate?.setEnabled(false)
btnCreate?.setBackground(resources.getDrawable(R.drawable.disable_style)) //btnCreate?.setBackground(resources.getDrawable(R.drawable.disable_style))
}) })
} }
} }

66
app/src/main/res/layout/create_seed.xml
View File

@ -68,7 +68,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
app:layout_constraintBottom_toTopOf="@+id/btnCancel" app:layout_constraintBottom_toTopOf="@+id/layoutBtns"
app:layout_constraintTop_toBottomOf="@+id/tilPinConfirmation" app:layout_constraintTop_toBottomOf="@+id/tilPinConfirmation"
app:layout_constraintStart_toStartOf="@id/tilPinConfirmation" app:layout_constraintStart_toStartOf="@id/tilPinConfirmation"
app:layout_constraintEnd_toEndOf="@id/tilPinConfirmation"> app:layout_constraintEnd_toEndOf="@id/tilPinConfirmation">
@ -85,38 +85,48 @@
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/btnCancel"
android:layout_width="140dp"
android:layout_height="57dp"
android:layout_gravity="center"
android:layout_marginStart="4dp"
android:layout_marginTop="28dp"
android:theme="@style/RedButton"
android:text="@string/cancel"
android:textColor="@color/white"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/bottomStatusBar"
app:layout_constraintStart_toStartOf="@id/tilAccountName"
app:layout_constraintTop_toBottomOf="@+id/tilAccountName" />
<Button
android:id="@+id/btnCreate" <LinearLayout
android:layout_width="140dp" android:id="@+id/layoutBtns"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_gravity="center" android:layout_height="65dp"
android:layout_marginEnd="4dp" android:background="@android:color/white"
android:padding="10dp" android:padding="4dp"
android:theme="@style/BlueButton" android:orientation="horizontal"
android:text="@string/create_wallet" app:layout_constraintTop_toBottomOf="@+id/tilAccountName"
android:textColor="@color/white" android:layout_marginTop="60dp">
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="@id/tilAccountName" <Button
app:layout_constraintTop_toTopOf="@id/btnCancel" /> android:id="@+id/btnCancel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="0.50"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:theme="@style/RedButton"
android:textColor="@color/white"
android:textSize="14sp"
android:text="@string/cancel" />
<Button
android:id="@+id/btnCreate"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:theme="@style/BlueButton"
android:text="@string/create_wallet"
android:textSize="14sp"
android:textColor="@color/white" />
</LinearLayout>
<cy.agorise.crystalwallet.util.BottomStatusBar <cy.agorise.crystalwallet.util.BottomStatusBar
android:id="@+id/bottomStatusBar" android:id="@+id/bottomStatusBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintBottom_toBottomOf="parent"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>