From 5eb4242e6e8a13c08b0b2dc43279da6371cc520d Mon Sep 17 00:00:00 2001 From: GME Date: Thu, 13 Jun 2019 15:32:22 +0200 Subject: [PATCH] update layjout & textSize --- .../transaction/TransactionAdapter.java | 1 - .../mobile/user/UserAccountActivity.java | 6 +- .../mobile/wallet/WalletAdapter.java | 1 - app/src/main/res/layout/activity_homepage.xml | 1 + app/src/main/res/layout/activity_qr_code.xml | 131 ++++++------ .../main/res/layout/activity_user_account.xml | 200 ++++++++++-------- .../res/layout/transaction_view_template.xml | 51 +++-- .../res/layout/wallet_search_template.xml | 21 +- .../main/res/layout/wallet_view_template.xml | 85 ++++---- 9 files changed, 273 insertions(+), 224 deletions(-) diff --git a/app/src/main/java/monnethic/mobile/transaction/TransactionAdapter.java b/app/src/main/java/monnethic/mobile/transaction/TransactionAdapter.java index 3cf9a75..329b12f 100644 --- a/app/src/main/java/monnethic/mobile/transaction/TransactionAdapter.java +++ b/app/src/main/java/monnethic/mobile/transaction/TransactionAdapter.java @@ -39,7 +39,6 @@ public class TransactionAdapter extends ArrayAdapter { ViewGroup.LayoutParams params = convertView.getLayoutParams(); - params.height = 250; convertView.setLayoutParams(params); String myFormat = "dd-MM-yyyy HH:mm:ss"; diff --git a/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java b/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java index 10e0b4a..e197d9f 100644 --- a/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java +++ b/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java @@ -28,7 +28,7 @@ public class UserAccountActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_user_account); balance = findViewById(R.id.balanceView); - TextView userHashView = findViewById(R.id.userHash); + TextView walletHashView = findViewById(R.id.walletHash); Button buttonPayement = findViewById(R.id.buttonPayement); Button buttonReceive = findViewById(R.id.buttonReceive); Button buttonSettings = findViewById(R.id.buttonSettings); @@ -43,7 +43,7 @@ public class UserAccountActivity extends AppCompatActivity { String wallet_type = intent.getStringExtra("WALLET_TYPE"); String wallet_balance = intent.getStringExtra("WALLET_BALANCE"); - userHashView.setText(wallet_hash); + walletHashView.setText(wallet_hash); balance.setText(wallet_balance); buttonPayement.setOnClickListener(new View.OnClickListener() { @@ -58,7 +58,7 @@ public class UserAccountActivity extends AppCompatActivity { receivePayement(); } }); - buttonSettings.setVisibility(View.GONE); + buttonSettings.setVisibility(View.INVISIBLE); buttonSettings.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/java/monnethic/mobile/wallet/WalletAdapter.java b/app/src/main/java/monnethic/mobile/wallet/WalletAdapter.java index 25f026e..25b7406 100644 --- a/app/src/main/java/monnethic/mobile/wallet/WalletAdapter.java +++ b/app/src/main/java/monnethic/mobile/wallet/WalletAdapter.java @@ -27,7 +27,6 @@ public class WalletAdapter extends ArrayAdapter { TextView wallet_balance = convertView.findViewById(R.id.wallet_balance); ViewGroup.LayoutParams params = convertView.getLayoutParams(); - params.height = 270; convertView.setLayoutParams(params); wallet_hash.setText(wallet.getWallet_hash()); diff --git a/app/src/main/res/layout/activity_homepage.xml b/app/src/main/res/layout/activity_homepage.xml index 373dcc5..20845b1 100644 --- a/app/src/main/res/layout/activity_homepage.xml +++ b/app/src/main/res/layout/activity_homepage.xml @@ -13,6 +13,7 @@ android:layout_gravity="center" android:layout_marginTop="75dp" android:text="Welcome on Monnethic !" + android:textSize="16sp" android:textStyle="bold"/>