From 0a462f2cc9093f7cf5b5b841503002030d8f5ab6 Mon Sep 17 00:00:00 2001 From: GME Date: Wed, 17 Apr 2019 22:08:19 +0200 Subject: [PATCH] loading and clean --- .../mobile/database/Transaction.java | 6 -- .../java/monnethic/mobile/database/User.java | 6 -- .../mobile/homepage/HomepageActivity.java | 4 -- .../mobile/homepage/InputController.java | 3 - .../mobile/homepage/LoginActivity.java | 12 ++++ .../mobile/homepage/RegisterActivity.java | 12 ++++ .../mobile/qrcode/QrCodeScannerActivity.java | 3 - .../mobile/restApi/HttpCallHandler.java | 1 - .../mobile/restApi/TransactionApiHandler.java | 3 - .../mobile/restApi/UserApiHandler.java | 6 +- .../mobile/restApi/WalletApiHandler.java | 2 - .../mobile/search/DisplayWalletSearch.java | 20 +++++- .../monnethic/mobile/search/SearchUser.java | 23 +++---- .../transaction/ApprovePayementActivity.java | 12 ++++ .../transaction/MakePayementActivity.java | 2 - .../transaction/ReceivePayementActivity.java | 2 - .../transaction/TransactionActivity.java | 13 +++- .../mobile/user/UserAccountActivity.java | 15 +---- .../mobile/wallet/CreateWalletActivity.java | 14 +++- .../mobile/wallet/HomeWalletActivity.java | 4 -- .../mobile/wallet/SelectWalletActivity.java | 21 +++++- .../mobile/wallet/WalletAdapter.java | 4 +- .../wallet/WalletPresenterActivity.java | 3 - .../main/res/layout/activity_home_wallet.xml | 49 ++++++++------ app/src/main/res/layout/activity_homepage.xml | 18 ++---- .../res/layout/activity_make_payement.xml | 21 +++--- .../res/layout/activity_select_wallet.xml | 1 + .../main/res/layout/activity_user_account.xml | 27 +++----- .../main/res/layout/wallet_view_template.xml | 64 +++++++++++-------- 29 files changed, 200 insertions(+), 171 deletions(-) diff --git a/app/src/main/java/monnethic/mobile/database/Transaction.java b/app/src/main/java/monnethic/mobile/database/Transaction.java index 964dec6..614e124 100644 --- a/app/src/main/java/monnethic/mobile/database/Transaction.java +++ b/app/src/main/java/monnethic/mobile/database/Transaction.java @@ -1,11 +1,5 @@ package monnethic.mobile.database; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; - -import java.math.BigInteger; -import java.util.Date; - public class Transaction { private int transactionId; private long transactionDate; diff --git a/app/src/main/java/monnethic/mobile/database/User.java b/app/src/main/java/monnethic/mobile/database/User.java index ae82209..56a956e 100644 --- a/app/src/main/java/monnethic/mobile/database/User.java +++ b/app/src/main/java/monnethic/mobile/database/User.java @@ -1,11 +1,5 @@ package monnethic.mobile.database; -import java.util.Date; - -/** - * Created by Guillaume on 15/04/2018. - */ - //Class User which represent an User for api rest public class User { private int user_id; diff --git a/app/src/main/java/monnethic/mobile/homepage/HomepageActivity.java b/app/src/main/java/monnethic/mobile/homepage/HomepageActivity.java index a7826e6..c1e3061 100644 --- a/app/src/main/java/monnethic/mobile/homepage/HomepageActivity.java +++ b/app/src/main/java/monnethic/mobile/homepage/HomepageActivity.java @@ -3,18 +3,14 @@ package monnethic.mobile.homepage; import android.Manifest; import android.content.Intent; import android.content.pm.PackageManager; -import android.os.AsyncTask; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Button; - import com.example.monnthic.monnethicmobile.R; -import monnethic.mobile.database.User; - public class HomepageActivity extends AppCompatActivity { @Override diff --git a/app/src/main/java/monnethic/mobile/homepage/InputController.java b/app/src/main/java/monnethic/mobile/homepage/InputController.java index 4da0cd3..e91fa84 100644 --- a/app/src/main/java/monnethic/mobile/homepage/InputController.java +++ b/app/src/main/java/monnethic/mobile/homepage/InputController.java @@ -2,11 +2,8 @@ package monnethic.mobile.homepage; import android.os.AsyncTask; import android.widget.EditText; - import java.util.regex.Matcher; import java.util.regex.Pattern; - -import monnethic.mobile.restApi.Config; import monnethic.mobile.restApi.UserApiHandler; public class InputController { diff --git a/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java b/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java index 6bf10da..181e264 100644 --- a/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java +++ b/app/src/main/java/monnethic/mobile/homepage/LoginActivity.java @@ -1,5 +1,6 @@ package monnethic.mobile.homepage; +import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; import android.os.AsyncTask; @@ -69,6 +70,17 @@ public class LoginActivity extends AppCompatActivity { mContext = context; } + @Override + protected void onPreExecute() { + super.onPreExecute(); + ProgressDialog progDailog = new ProgressDialog(LoginActivity.this); + progDailog.setMessage("Login..."); + progDailog.setIndeterminate(false); + progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + progDailog.setCancelable(true); + progDailog.show(); + } + @Override protected void onPostExecute(JSONObject jsonObject) { try{ diff --git a/app/src/main/java/monnethic/mobile/homepage/RegisterActivity.java b/app/src/main/java/monnethic/mobile/homepage/RegisterActivity.java index 8b02d8a..3447afa 100644 --- a/app/src/main/java/monnethic/mobile/homepage/RegisterActivity.java +++ b/app/src/main/java/monnethic/mobile/homepage/RegisterActivity.java @@ -1,5 +1,6 @@ package monnethic.mobile.homepage; +import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; import android.os.AsyncTask; @@ -123,6 +124,17 @@ public class RegisterActivity extends AppCompatActivity { Context mContext; private UserRegisterTask(final Context context){mContext=context;} + @Override + protected void onPreExecute() { + super.onPreExecute(); + ProgressDialog progDailog = new ProgressDialog(RegisterActivity.this); + progDailog.setMessage("Register..."); + progDailog.setIndeterminate(false); + progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + progDailog.setCancelable(true); + progDailog.show(); + } + @Override protected void onPostExecute(JSONObject jsonObject){ try{ diff --git a/app/src/main/java/monnethic/mobile/qrcode/QrCodeScannerActivity.java b/app/src/main/java/monnethic/mobile/qrcode/QrCodeScannerActivity.java index 2b53e97..11c2bc9 100644 --- a/app/src/main/java/monnethic/mobile/qrcode/QrCodeScannerActivity.java +++ b/app/src/main/java/monnethic/mobile/qrcode/QrCodeScannerActivity.java @@ -9,15 +9,12 @@ import android.os.Bundle; import android.util.SparseArray; import android.view.SurfaceHolder; import android.view.SurfaceView; -import android.widget.TextView; import android.widget.Toast; - import com.example.monnthic.monnethicmobile.R; import com.google.android.gms.vision.CameraSource; import com.google.android.gms.vision.Detector; import com.google.android.gms.vision.barcode.Barcode; import com.google.android.gms.vision.barcode.BarcodeDetector; - import monnethic.mobile.transaction.ApprovePayementActivity; public class QrCodeScannerActivity extends AppCompatActivity { diff --git a/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java b/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java index f3e248d..97712fc 100644 --- a/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java +++ b/app/src/main/java/monnethic/mobile/restApi/HttpCallHandler.java @@ -1,7 +1,6 @@ package monnethic.mobile.restApi; import android.util.Log; - import org.json.JSONObject; import java.io.BufferedReader; import java.io.DataOutputStream; diff --git a/app/src/main/java/monnethic/mobile/restApi/TransactionApiHandler.java b/app/src/main/java/monnethic/mobile/restApi/TransactionApiHandler.java index a19a519..45cbd37 100644 --- a/app/src/main/java/monnethic/mobile/restApi/TransactionApiHandler.java +++ b/app/src/main/java/monnethic/mobile/restApi/TransactionApiHandler.java @@ -1,13 +1,10 @@ package monnethic.mobile.restApi; import android.util.Log; - import org.json.JSONObject; - import java.net.URL; import java.util.HashMap; import java.util.Map; - import monnethic.mobile.transaction.SendingTransaction; public class TransactionApiHandler { diff --git a/app/src/main/java/monnethic/mobile/restApi/UserApiHandler.java b/app/src/main/java/monnethic/mobile/restApi/UserApiHandler.java index 2a3f4c5..dd3c050 100644 --- a/app/src/main/java/monnethic/mobile/restApi/UserApiHandler.java +++ b/app/src/main/java/monnethic/mobile/restApi/UserApiHandler.java @@ -1,14 +1,10 @@ package monnethic.mobile.restApi; import android.util.Log; - import org.json.JSONObject; - import java.net.URL; import java.util.HashMap; import java.util.Map; -import java.util.logging.Logger; - import monnethic.mobile.database.User; public class UserApiHandler { @@ -62,6 +58,8 @@ public class UserApiHandler { jsonReturn.put("status",200); jsonReturn.put("user_hash",u.getUser_hash()); //jsonReturn.put("session_id",String.valueOf(jsonObject.getString("session_id"))); //TODO + + jsonReturn.put("session_id",String.valueOf(0)); return jsonReturn; diff --git a/app/src/main/java/monnethic/mobile/restApi/WalletApiHandler.java b/app/src/main/java/monnethic/mobile/restApi/WalletApiHandler.java index 468a709..bded32f 100644 --- a/app/src/main/java/monnethic/mobile/restApi/WalletApiHandler.java +++ b/app/src/main/java/monnethic/mobile/restApi/WalletApiHandler.java @@ -2,12 +2,10 @@ package monnethic.mobile.restApi; import org.json.JSONArray; import org.json.JSONObject; - import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; - import monnethic.mobile.wallet.Wallet; public class WalletApiHandler { diff --git a/app/src/main/java/monnethic/mobile/search/DisplayWalletSearch.java b/app/src/main/java/monnethic/mobile/search/DisplayWalletSearch.java index d7f2d8d..4051842 100644 --- a/app/src/main/java/monnethic/mobile/search/DisplayWalletSearch.java +++ b/app/src/main/java/monnethic/mobile/search/DisplayWalletSearch.java @@ -1,4 +1,6 @@ package monnethic.mobile.search; + +import android.app.ProgressDialog; import android.content.Intent; import android.os.AsyncTask; import android.support.v7.app.AppCompatActivity; @@ -6,7 +8,6 @@ import android.os.Bundle; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; - import com.example.monnthic.monnethicmobile.R; import java.util.ArrayList; import monnethic.mobile.restApi.WalletApiHandler; @@ -53,6 +54,23 @@ public class DisplayWalletSearch extends AppCompatActivity { private class SearchWalletTask extends AsyncTask> { + ProgressDialog progDailog = new ProgressDialog(DisplayWalletSearch.this); + + @Override + protected void onPreExecute() { + super.onPreExecute(); + progDailog.setMessage("Searching user wallets..."); + progDailog.setIndeterminate(false); + progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + progDailog.setCancelable(true); + progDailog.show(); + } + + @Override + protected void onPostExecute(ArrayList listWallet) { + progDailog.dismiss(); + } + @Override protected ArrayList doInBackground(String... strings) { ArrayList walletsList = new ArrayList<>(); diff --git a/app/src/main/java/monnethic/mobile/search/SearchUser.java b/app/src/main/java/monnethic/mobile/search/SearchUser.java index aff746a..dcb72e0 100644 --- a/app/src/main/java/monnethic/mobile/search/SearchUser.java +++ b/app/src/main/java/monnethic/mobile/search/SearchUser.java @@ -1,5 +1,6 @@ package monnethic.mobile.search; +import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; import android.os.AsyncTask; @@ -8,22 +9,11 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.widget.TextView; import android.widget.Toast; - import com.example.monnthic.monnethicmobile.R; -import com.google.gson.JsonObject; -import com.j256.ormlite.stmt.query.In; - -import org.json.JSONObject; - -import java.util.ArrayList; - import monnethic.mobile.database.User; import monnethic.mobile.homepage.InputController; import monnethic.mobile.restApi.UserApiHandler; -import monnethic.mobile.restApi.WalletApiHandler; -import monnethic.mobile.wallet.Wallet; public class SearchUser extends AppCompatActivity { EditText emailAddress; @@ -80,6 +70,17 @@ public class SearchUser extends AppCompatActivity { Context mContext; private SearchUserTask(final Context context){mContext=context;} + @Override + protected void onPreExecute() { + super.onPreExecute(); + ProgressDialog progDailog = new ProgressDialog(SearchUser.this); + progDailog.setMessage("Searching user..."); + progDailog.setIndeterminate(false); + progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + progDailog.setCancelable(true); + progDailog.show(); + } + @Override protected void onPostExecute(User user) { try{ diff --git a/app/src/main/java/monnethic/mobile/transaction/ApprovePayementActivity.java b/app/src/main/java/monnethic/mobile/transaction/ApprovePayementActivity.java index b14160e..d628ce8 100644 --- a/app/src/main/java/monnethic/mobile/transaction/ApprovePayementActivity.java +++ b/app/src/main/java/monnethic/mobile/transaction/ApprovePayementActivity.java @@ -1,5 +1,6 @@ package monnethic.mobile.transaction; +import android.app.ProgressDialog; import android.content.Intent; import android.os.AsyncTask; import android.support.v7.app.AppCompatActivity; @@ -83,6 +84,17 @@ public class ApprovePayementActivity extends AppCompatActivity { } private class TransactionTask extends AsyncTask { + @Override + protected void onPreExecute() { + super.onPreExecute(); + ProgressDialog progDailog = new ProgressDialog(ApprovePayementActivity.this); + progDailog.setMessage("Sending transaction..."); + progDailog.setIndeterminate(false); + progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + progDailog.setCancelable(true); + progDailog.show(); + } + @Override protected String doInBackground(SendingTransaction... sendingTransactions) { try{ diff --git a/app/src/main/java/monnethic/mobile/transaction/MakePayementActivity.java b/app/src/main/java/monnethic/mobile/transaction/MakePayementActivity.java index 7f0b5d8..955812b 100644 --- a/app/src/main/java/monnethic/mobile/transaction/MakePayementActivity.java +++ b/app/src/main/java/monnethic/mobile/transaction/MakePayementActivity.java @@ -7,9 +7,7 @@ import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.Toast; - import com.example.monnthic.monnethicmobile.R; - import monnethic.mobile.qrcode.QrCodeScannerActivity; public class MakePayementActivity extends AppCompatActivity { diff --git a/app/src/main/java/monnethic/mobile/transaction/ReceivePayementActivity.java b/app/src/main/java/monnethic/mobile/transaction/ReceivePayementActivity.java index ee8b490..fdb2cdd 100644 --- a/app/src/main/java/monnethic/mobile/transaction/ReceivePayementActivity.java +++ b/app/src/main/java/monnethic/mobile/transaction/ReceivePayementActivity.java @@ -7,9 +7,7 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.Toast; - import com.example.monnthic.monnethicmobile.R; - import monnethic.mobile.qrcode.QrCodeActivity; public class ReceivePayementActivity extends AppCompatActivity { diff --git a/app/src/main/java/monnethic/mobile/transaction/TransactionActivity.java b/app/src/main/java/monnethic/mobile/transaction/TransactionActivity.java index 88061ab..043add1 100644 --- a/app/src/main/java/monnethic/mobile/transaction/TransactionActivity.java +++ b/app/src/main/java/monnethic/mobile/transaction/TransactionActivity.java @@ -1,5 +1,6 @@ package monnethic.mobile.transaction; +import android.app.ProgressDialog; import android.content.Intent; import android.os.AsyncTask; import android.support.v7.app.AppCompatActivity; @@ -10,7 +11,6 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Toast; import com.example.monnthic.monnethicmobile.R; - import monnethic.mobile.homepage.InputController; import monnethic.mobile.restApi.TransactionApiHandler; import monnethic.mobile.search.SearchUser; @@ -118,6 +118,17 @@ public class TransactionActivity extends AppCompatActivity { private class TransactionTask extends AsyncTask { + @Override + protected void onPreExecute() { + super.onPreExecute(); + ProgressDialog progDailog = new ProgressDialog(TransactionActivity.this); + progDailog.setMessage("Sending transaction..."); + progDailog.setIndeterminate(false); + progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + progDailog.setCancelable(true); + progDailog.show(); + } + @Override protected String doInBackground(SendingTransaction... sendingTransactions) { try{ diff --git a/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java b/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java index ea2ac5a..7fe1a8f 100644 --- a/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java +++ b/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java @@ -7,23 +7,9 @@ import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.Button; -import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; - import com.example.monnthic.monnethicmobile.R; - -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -import monnethic.mobile.database.User; -import monnethic.mobile.restApi.Config; -import monnethic.mobile.restApi.HttpCallHandler; import monnethic.mobile.restApi.WalletApiHandler; import monnethic.mobile.transaction.MakePayementActivity; import monnethic.mobile.transaction.ReceivePayementActivity; @@ -69,6 +55,7 @@ public class UserAccountActivity extends AppCompatActivity { receivePayement(); } }); + buttonSettings.setVisibility(View.GONE); buttonSettings.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/java/monnethic/mobile/wallet/CreateWalletActivity.java b/app/src/main/java/monnethic/mobile/wallet/CreateWalletActivity.java index 353a3b3..6361241 100644 --- a/app/src/main/java/monnethic/mobile/wallet/CreateWalletActivity.java +++ b/app/src/main/java/monnethic/mobile/wallet/CreateWalletActivity.java @@ -1,5 +1,6 @@ package monnethic.mobile.wallet; +import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; import android.os.AsyncTask; @@ -9,9 +10,7 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.Toast; - import com.example.monnthic.monnethicmobile.R; - import monnethic.mobile.restApi.WalletApiHandler; import monnethic.mobile.user.UserAccountActivity; @@ -59,6 +58,17 @@ public class CreateWalletActivity extends AppCompatActivity { mContext = context; } + @Override + protected void onPreExecute() { + super.onPreExecute(); + ProgressDialog progDailog = new ProgressDialog(CreateWalletActivity.this); + progDailog.setMessage("Creating..."); + progDailog.setIndeterminate(false); + progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + progDailog.setCancelable(true); + progDailog.show(); + } + @Override protected void onPostExecute(Wallet w) { try{ diff --git a/app/src/main/java/monnethic/mobile/wallet/HomeWalletActivity.java b/app/src/main/java/monnethic/mobile/wallet/HomeWalletActivity.java index f13406f..fca454c 100644 --- a/app/src/main/java/monnethic/mobile/wallet/HomeWalletActivity.java +++ b/app/src/main/java/monnethic/mobile/wallet/HomeWalletActivity.java @@ -3,15 +3,11 @@ package monnethic.mobile.wallet; import android.content.Intent; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.Toast; - import com.example.monnthic.monnethicmobile.R; -import monnethic.mobile.transaction.TransactionActivity; - public class HomeWalletActivity extends AppCompatActivity { private String user_hash; private String user_password; diff --git a/app/src/main/java/monnethic/mobile/wallet/SelectWalletActivity.java b/app/src/main/java/monnethic/mobile/wallet/SelectWalletActivity.java index b7af452..16159be 100644 --- a/app/src/main/java/monnethic/mobile/wallet/SelectWalletActivity.java +++ b/app/src/main/java/monnethic/mobile/wallet/SelectWalletActivity.java @@ -1,15 +1,14 @@ package monnethic.mobile.wallet; +import android.app.ProgressDialog; import android.content.Intent; import android.os.AsyncTask; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; import android.widget.Toast; - import com.example.monnthic.monnethicmobile.R; import java.util.ArrayList; import monnethic.mobile.restApi.WalletApiHandler; @@ -63,7 +62,18 @@ public class SelectWalletActivity extends AppCompatActivity { } //AsyncTask to get user wallets - static private class getUserWalletTask extends AsyncTask> { + private class getUserWalletTask extends AsyncTask,ArrayList> { + ProgressDialog progDailog = new ProgressDialog(SelectWalletActivity.this); + @Override + protected void onPreExecute() { + super.onPreExecute(); + progDailog.setMessage("Searching..."); + progDailog.setIndeterminate(false); + progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + progDailog.setCancelable(true); + progDailog.show(); + } + @Override protected ArrayList doInBackground(String... params) { ArrayList walletsList = new ArrayList<>(); @@ -75,6 +85,11 @@ public class SelectWalletActivity extends AppCompatActivity { } return walletsList; } + + @Override + protected void onPostExecute(ArrayList listWallet) { + progDailog.dismiss(); + } } @Override diff --git a/app/src/main/java/monnethic/mobile/wallet/WalletAdapter.java b/app/src/main/java/monnethic/mobile/wallet/WalletAdapter.java index 532632f..25f026e 100644 --- a/app/src/main/java/monnethic/mobile/wallet/WalletAdapter.java +++ b/app/src/main/java/monnethic/mobile/wallet/WalletAdapter.java @@ -6,9 +6,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; - import com.example.monnthic.monnethicmobile.R; - import java.util.ArrayList; public class WalletAdapter extends ArrayAdapter { @@ -29,7 +27,7 @@ public class WalletAdapter extends ArrayAdapter { TextView wallet_balance = convertView.findViewById(R.id.wallet_balance); ViewGroup.LayoutParams params = convertView.getLayoutParams(); - params.height = 300; + params.height = 270; convertView.setLayoutParams(params); wallet_hash.setText(wallet.getWallet_hash()); diff --git a/app/src/main/java/monnethic/mobile/wallet/WalletPresenterActivity.java b/app/src/main/java/monnethic/mobile/wallet/WalletPresenterActivity.java index d958f7b..a209262 100644 --- a/app/src/main/java/monnethic/mobile/wallet/WalletPresenterActivity.java +++ b/app/src/main/java/monnethic/mobile/wallet/WalletPresenterActivity.java @@ -7,10 +7,7 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.TextView; - import com.example.monnthic.monnethicmobile.R; - - import monnethic.mobile.transaction.TransactionActivity; public class WalletPresenterActivity extends AppCompatActivity { diff --git a/app/src/main/res/layout/activity_home_wallet.xml b/app/src/main/res/layout/activity_home_wallet.xml index 84e7780..d73c5a2 100644 --- a/app/src/main/res/layout/activity_home_wallet.xml +++ b/app/src/main/res/layout/activity_home_wallet.xml @@ -6,27 +6,34 @@ android:layout_height="match_parent" tools:context="monnethic.mobile.wallet.HomeWalletActivity"> -