From dfcb45e5305597cff01c5025a4afd1990817b6eb Mon Sep 17 00:00:00 2001 From: GME Date: Thu, 18 Apr 2019 22:20:58 +0200 Subject: [PATCH] Fix Bug --- .../monnethic/mobile/search/SearchUser.java | 25 +++++++++++-------- .../res/layout/activity_receive_payement.xml | 21 +++++++--------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/monnethic/mobile/search/SearchUser.java b/app/src/main/java/monnethic/mobile/search/SearchUser.java index 6b8d752..838b909 100644 --- a/app/src/main/java/monnethic/mobile/search/SearchUser.java +++ b/app/src/main/java/monnethic/mobile/search/SearchUser.java @@ -78,11 +78,10 @@ public class SearchUser extends AppCompatActivity { private class SearchUserTask extends AsyncTask { Context mContext; private SearchUserTask(final Context context){mContext=context;} - + ProgressDialog progDailog = new ProgressDialog(SearchUser.this); @Override protected void onPreExecute() { super.onPreExecute(); - ProgressDialog progDailog = new ProgressDialog(SearchUser.this); progDailog.setMessage("Searching user..."); progDailog.setIndeterminate(false); progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); @@ -93,14 +92,20 @@ public class SearchUser extends AppCompatActivity { @Override protected void onPostExecute(User user) { try{ - Intent displayWalletIntent = new Intent(SearchUser.this, DisplayWalletSearch.class); - displayWalletIntent.putExtra("user_name",user.getName()); - displayWalletIntent.putExtra("user_firstname",user.getFirstname()); - displayWalletIntent.putExtra("user_hash",user.getUser_hash()); - displayWalletIntent.putExtra("SESSION_ID",session_id); - displayWalletIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); - SearchUser.this.startActivity(displayWalletIntent); - finish(); + progDailog.dismiss(); + if(user!=null){ + Intent displayWalletIntent = new Intent(SearchUser.this, DisplayWalletSearch.class); + displayWalletIntent.putExtra("user_name",user.getName()); + displayWalletIntent.putExtra("user_firstname",user.getFirstname()); + displayWalletIntent.putExtra("user_hash",user.getUser_hash()); + displayWalletIntent.putExtra("SESSION_ID",session_id); + displayWalletIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); + SearchUser.this.startActivity(displayWalletIntent); + finish(); + }else{ + Toast.makeText(mContext,"User dosen't exist",Toast.LENGTH_SHORT).show(); + } + }catch (Exception e){ e.printStackTrace(); } diff --git a/app/src/main/res/layout/activity_receive_payement.xml b/app/src/main/res/layout/activity_receive_payement.xml index 5533c9b..2f73ae4 100644 --- a/app/src/main/res/layout/activity_receive_payement.xml +++ b/app/src/main/res/layout/activity_receive_payement.xml @@ -10,13 +10,10 @@ android:id="@+id/amountValue" android:layout_width="wrap_content" android:layout_height="50dp" - android:layout_marginEnd="8dp" - android:layout_marginStart="8dp" - android:layout_marginTop="184dp" + android:layout_marginTop="200dp" android:ems="10" android:inputType="numberDecimal" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.568" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -24,19 +21,19 @@ android:id="@+id/buttonValidate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="176dp" - android:layout_marginEnd="72dp" + android:layout_marginEnd="90dp" + android:layout_marginTop="50dp" android:text="Validate" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/amountValue" />