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

Improved ReceiveTransactionFragment using SquaredImageView and ScrollView

Browse source
This commit is contained in:
Severiano Jaramillo 2018-01-25 14:27:30 -06:00
parent 902d2c77ef
commit ff971ee492
2 changed files with 142 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java
View file

@ -54,7 +54,7 @@ public class IntroActivity extends AppCompatActivity {
//Checks if the user has any seed created //Checks if the user has any seed created
AccountSeedListViewModel accountSeedListViewModel = ViewModelProviders.of(this).get(AccountSeedListViewModel.class); AccountSeedListViewModel accountSeedListViewModel = ViewModelProviders.of(this).get(AccountSeedListViewModel.class);
/*if (accountSeedListViewModel.accountSeedsCount() == 0){ if (accountSeedListViewModel.accountSeedsCount() == 0){
//If the user doesn't have any seeds created, then //If the user doesn't have any seeds created, then
//send the user to create/import an account //send the user to create/import an account
//Intent intent = new Intent(this, AccountSeedsManagementActivity.class); //Intent intent = new Intent(this, AccountSeedsManagementActivity.class);
@ -65,7 +65,7 @@ public class IntroActivity extends AppCompatActivity {
//Intent intent = new Intent(this, CreateSeedActivity.class); //Intent intent = new Intent(this, CreateSeedActivity.class);
Intent intent = new Intent(this, BoardActivity.class); Intent intent = new Intent(this, BoardActivity.class);
startActivity(intent); startActivity(intent);
}*/ }
/*CrystalDatabase db = CrystalDatabase.getAppDatabase(getApplicationContext()); /*CrystalDatabase db = CrystalDatabase.getAppDatabase(getApplicationContext());
List<AccountSeed> seeds = RandomSeedGenerator.generateSeeds(2); List<AccountSeed> seeds = RandomSeedGenerator.generateSeeds(2);

29
app/src/main/res/layout/receive_transaction.xml
View file

@ -1,9 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" 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="match_parent">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="24dp">
<View <View
android:id="@+id/topView" android:id="@+id/topView"
@ -111,10 +116,10 @@
app:layout_constraintEnd_toEndOf="@+id/spAsset" app:layout_constraintEnd_toEndOf="@+id/spAsset"
app:layout_constraintStart_toStartOf="@+id/spAsset" /> app:layout_constraintStart_toStartOf="@+id/spAsset" />
<ImageView <cy.agorise.crystalwallet.util.SquaredImageView
android:id="@+id/ivQrCode" android:id="@+id/ivQrCode"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="wrap_content"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -123,32 +128,32 @@
android:src="@color/gray" android:src="@color/gray"
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/tvAmountError" /> app:layout_constraintTop_toBottomOf="@+id/tvAmountError"/>
<TextView <TextView
android:id="@+id/tvShare" android:id="@+id/tvShare"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:text="@string/share_this_qr" android:text="@string/share_this_qr"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/ivQrCode"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"/>
app:layout_constraintTop_toBottomOf="@+id/ivQrCode" />
<TextView <TextView
android:id="@+id/tvCancel" android:id="@+id/tvCancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginBottom="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:text="@string/close" android:text="@string/close"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="@id/tvShare"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</ScrollView>