diff --git a/app/src/main/java/monnethic/mobile/search/DisplayWallet.java b/app/src/main/java/monnethic/mobile/search/DisplayWallet.java index 8413c8b..a123e7d 100644 --- a/app/src/main/java/monnethic/mobile/search/DisplayWallet.java +++ b/app/src/main/java/monnethic/mobile/search/DisplayWallet.java @@ -4,6 +4,7 @@ public class DisplayWallet { private String user_name; private String user_firstname; private String wallet_hash; + private String wallet_id; public DisplayWallet() { } @@ -14,6 +15,13 @@ public class DisplayWallet { this.wallet_hash = wallet_hash; } + public DisplayWallet(String user_name, String user_firstname, String wallet_hash, String wallet_id) { + this.user_name = user_name; + this.user_firstname = user_firstname; + this.wallet_hash = wallet_hash; + this.wallet_id = wallet_id; + } + public String getUser_name() { return user_name; } @@ -37,4 +45,7 @@ public class DisplayWallet { public void setWallet_hash(String wallet_hash) { this.wallet_hash = wallet_hash; } + + public String getWallet_id(){return wallet_id;} + public void setWallet_id(String wallet_id){this.wallet_id=wallet_id;} } diff --git a/app/src/main/java/monnethic/mobile/search/DisplayWalletAdapter.java b/app/src/main/java/monnethic/mobile/search/DisplayWalletAdapter.java index 141b7c5..c713f7d 100644 --- a/app/src/main/java/monnethic/mobile/search/DisplayWalletAdapter.java +++ b/app/src/main/java/monnethic/mobile/search/DisplayWalletAdapter.java @@ -26,14 +26,16 @@ public class DisplayWalletAdapter extends ArrayAdapter { TextView user_name = convertView.findViewById(R.id.userNameSearch); TextView wallet_hash = convertView.findViewById(R.id.walletHashSearch); + TextView wallet_id = convertView.findViewById(R.id.walletIdSearch); ViewGroup.LayoutParams params = convertView.getLayoutParams(); - params.height = 300; + //params.height = 400; convertView.setLayoutParams(params); String userFullName = dWallet.getUser_name()+" "+dWallet.getUser_firstname(); user_name.setText(userFullName); wallet_hash.setText(dWallet.getWallet_hash()); + wallet_id.setText(dWallet.getWallet_id()); return convertView; } diff --git a/app/src/main/java/monnethic/mobile/search/DisplayWalletSearch.java b/app/src/main/java/monnethic/mobile/search/DisplayWalletSearch.java index 9bc13fe..b1f3144 100644 --- a/app/src/main/java/monnethic/mobile/search/DisplayWalletSearch.java +++ b/app/src/main/java/monnethic/mobile/search/DisplayWalletSearch.java @@ -38,7 +38,7 @@ public class DisplayWalletSearch extends AppCompatActivity { ArrayList displayWallets = new ArrayList<>(); for(Wallet w : userWallets){ - displayWallets.add(new DisplayWallet(user_name,user_firstname,w.getWallet_hash())); + displayWallets.add(new DisplayWallet(user_name,user_firstname,w.getWallet_hash(),w.getType())); } DisplayWalletAdapter adapter = new DisplayWalletAdapter(this,displayWallets); listView.setAdapter(adapter); diff --git a/app/src/main/res/layout/wallet_search_template.xml b/app/src/main/res/layout/wallet_search_template.xml index 3169646..221239b 100644 --- a/app/src/main/res/layout/wallet_search_template.xml +++ b/app/src/main/res/layout/wallet_search_template.xml @@ -11,58 +11,81 @@ android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0"> - + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:orientation="horizontal"> - - + + + + + + - + + + +