Update : Wallet
Added Wallet in app mobile, still work todo
This commit is contained in:
parent
7b38b0e58f
commit
389886f3c6
Binary file not shown.
|
@ -29,7 +29,9 @@ android {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||||
implementation 'com.android.support:appcompat-v7:27.1.1'
|
implementation 'com.android.support:appcompat-v7:27.1.1'
|
||||||
|
implementation 'com.android.support:design:27.1.1'
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
|
testImplementation 'org.json:json:20140107'
|
||||||
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
|
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
|
||||||
androidTestImplementation 'com.android.support.test:runner:1.0.2'
|
androidTestImplementation 'com.android.support.test:runner:1.0.2'
|
||||||
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
|
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
|
||||||
|
|
|
@ -37,7 +37,10 @@
|
||||||
<activity android:name="monnethic.mobile.transaction.ReceivePayementActivity" />
|
<activity android:name="monnethic.mobile.transaction.ReceivePayementActivity" />
|
||||||
<activity android:name="monnethic.mobile.transaction.MakePayementActivity" />
|
<activity android:name="monnethic.mobile.transaction.MakePayementActivity" />
|
||||||
<activity android:name="monnethic.mobile.qrcode.QrCodeScannerActivity" />
|
<activity android:name="monnethic.mobile.qrcode.QrCodeScannerActivity" />
|
||||||
<activity android:name="monnethic.mobile.transaction.ApprovePayementActivity"></activity>
|
<activity android:name="monnethic.mobile.transaction.ApprovePayementActivity" />
|
||||||
|
<activity android:name="monnethic.mobile.wallet.HomeWalletActivity" />
|
||||||
|
<activity android:name="monnethic.mobile.wallet.CreateWalletActivity" />
|
||||||
|
<activity android:name="monnethic.mobile.wallet.SelectWalletActivity"></activity>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
|
@ -17,6 +17,7 @@ import org.json.JSONObject;
|
||||||
import monnethic.mobile.restApi.Config;
|
import monnethic.mobile.restApi.Config;
|
||||||
import monnethic.mobile.restApi.HttpCallHandler;
|
import monnethic.mobile.restApi.HttpCallHandler;
|
||||||
import monnethic.mobile.user.UserAccountActivity;
|
import monnethic.mobile.user.UserAccountActivity;
|
||||||
|
import monnethic.mobile.wallet.HomeWalletActivity;
|
||||||
|
|
||||||
public class LoginActivity extends AppCompatActivity {
|
public class LoginActivity extends AppCompatActivity {
|
||||||
private EditText email;
|
private EditText email;
|
||||||
|
@ -81,9 +82,12 @@ public class LoginActivity extends AppCompatActivity {
|
||||||
try{
|
try{
|
||||||
if(result!=null){
|
if(result!=null){
|
||||||
if(result.getInt("status") == 200){
|
if(result.getInt("status") == 200){
|
||||||
Intent accountIntent = new Intent(LoginActivity.this, UserAccountActivity.class);
|
//Intent accountIntent = new Intent(LoginActivity.this, UserAccountActivity.class);
|
||||||
accountIntent.putExtra("userHash", result.getString("userHash"));
|
Intent walletHomeIntent = new Intent(LoginActivity.this, HomeWalletActivity.class);
|
||||||
LoginActivity.this.startActivity(accountIntent);
|
walletHomeIntent.putExtra("USER_HASH", result.getString("userHash"));
|
||||||
|
walletHomeIntent.putExtra("USER_PWD",password.getText().toString());
|
||||||
|
walletHomeIntent.putExtra("SESSION_ID","0");
|
||||||
|
LoginActivity.this.startActivity(walletHomeIntent);
|
||||||
finish();
|
finish();
|
||||||
}else{
|
}else{
|
||||||
Toast.makeText(mContext, result.getString("response"), Toast.LENGTH_SHORT).show();
|
Toast.makeText(mContext, result.getString("response"), Toast.LENGTH_SHORT).show();
|
||||||
|
|
|
@ -3,10 +3,10 @@ package monnethic.mobile.restApi;
|
||||||
public class Config {
|
public class Config {
|
||||||
//BASE
|
//BASE
|
||||||
static private String BASE_URL = "http://10.0.2.2:10053/";
|
static private String BASE_URL = "http://10.0.2.2:10053/";
|
||||||
|
//static private String BASE_URL = "http://localhost:10053/";
|
||||||
//DATABASE
|
|
||||||
static private String BASE_URL_USER = BASE_URL+"api/rest/user/";
|
static private String BASE_URL_USER = BASE_URL+"api/rest/user/";
|
||||||
static private String BASE_URL_TRANSACTION = BASE_URL+"api/rest/transaction/";
|
static private String BASE_URL_TRANSACTION = BASE_URL+"api/rest/transaction/";
|
||||||
|
static private String BASE_URL_WALLET = BASE_URL+"api/rest/wallet/";
|
||||||
|
|
||||||
//USER
|
//USER
|
||||||
static public String USER_LOGIN = BASE_URL_USER+"login";
|
static public String USER_LOGIN = BASE_URL_USER+"login";
|
||||||
|
@ -21,6 +21,14 @@ public class Config {
|
||||||
static public String TRANSACTION_RECEIVED = BASE_URL_TRANSACTION+"received";
|
static public String TRANSACTION_RECEIVED = BASE_URL_TRANSACTION+"received";
|
||||||
static public String TRANSACTION_SAVE = BASE_URL_TRANSACTION+"save";
|
static public String TRANSACTION_SAVE = BASE_URL_TRANSACTION+"save";
|
||||||
|
|
||||||
|
//WALLET
|
||||||
|
static public String WALLET_CREATE = BASE_URL_WALLET+"create";
|
||||||
|
static public String WALLET_GET_WALLET = BASE_URL_WALLET+"getWallet";
|
||||||
|
static public String WALLET_GET_USER_WALLETS = BASE_URL_WALLET+"getUserWallets";
|
||||||
|
static public String WALLET_DELETE = BASE_URL_WALLET+"delete";
|
||||||
|
static public String WALLET_TRANSFER = BASE_URL_WALLET+"transfer";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//BLOCKCHAIN
|
//BLOCKCHAIN
|
||||||
static private String BASE_URL_QUERY = BASE_URL+"/api/rest/query/";
|
static private String BASE_URL_QUERY = BASE_URL+"/api/rest/query/";
|
||||||
|
|
|
@ -14,6 +14,36 @@ import monnethic.mobile.database.User;
|
||||||
|
|
||||||
public class HttpCallHandler {
|
public class HttpCallHandler {
|
||||||
|
|
||||||
|
public String getHttp(URL url) throws Exception {
|
||||||
|
InputStream inputStream;
|
||||||
|
BufferedReader bufferedReader = null;
|
||||||
|
HttpURLConnection urlConnection = null;
|
||||||
|
|
||||||
|
urlConnection = (HttpURLConnection) url.openConnection();
|
||||||
|
urlConnection.setRequestMethod("GET");
|
||||||
|
urlConnection.connect();
|
||||||
|
|
||||||
|
int responseCode = urlConnection.getResponseCode();
|
||||||
|
if(responseCode != 200){
|
||||||
|
throw new Exception("ERROR != 200");
|
||||||
|
}
|
||||||
|
inputStream = urlConnection.getInputStream();
|
||||||
|
if(inputStream == null){
|
||||||
|
throw new Exception("ERROR inputStream");
|
||||||
|
}
|
||||||
|
|
||||||
|
bufferedReader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
|
||||||
|
StringBuilder stringBuilder = new StringBuilder();
|
||||||
|
String line;
|
||||||
|
|
||||||
|
while ((line = bufferedReader.readLine())!=null){
|
||||||
|
stringBuilder.append(line);
|
||||||
|
}
|
||||||
|
|
||||||
|
return stringBuilder.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public String executeGetHttp(String urlParam, String[] params){
|
public String executeGetHttp(String urlParam, String[] params){
|
||||||
InputStream inputStream;
|
InputStream inputStream;
|
||||||
BufferedReader bufferedReader = null;
|
BufferedReader bufferedReader = null;
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
package monnethic.mobile.restApi;
|
||||||
|
|
||||||
|
import org.json.JSONArray;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
|
||||||
|
import java.net.URL;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import monnethic.mobile.wallet.Wallet;
|
||||||
|
|
||||||
|
public class WalletApiHandler {
|
||||||
|
|
||||||
|
public ArrayList<Wallet> getUserWallets(String[] params){
|
||||||
|
ArrayList<Wallet> walletList = new ArrayList<>();
|
||||||
|
HttpCallHandler httpCallHandler = new HttpCallHandler();
|
||||||
|
try {
|
||||||
|
String url = Config.WALLET_GET_USER_WALLETS+"?userHash="+params[0];
|
||||||
|
String responseCall = httpCallHandler.getHttp(new URL(url));
|
||||||
|
JSONArray jsonArray = new JSONArray(responseCall);
|
||||||
|
|
||||||
|
for(int i=0; i<jsonArray.length(); i++){
|
||||||
|
Wallet wallet = new Wallet();
|
||||||
|
JSONObject jsonObject = jsonArray.getJSONObject(i);
|
||||||
|
|
||||||
|
wallet.setType(jsonObject.getJSONObject("Record").getJSONObject("walletType").getString("string"));
|
||||||
|
wallet.setWallet_hash(jsonObject.getJSONObject("Record").getJSONObject("id").getString("string"));
|
||||||
|
wallet.setUser_hash(jsonObject.getJSONObject("Record").getJSONObject("owner").getString("string"));
|
||||||
|
|
||||||
|
String urlGetWallet = Config.WALLET_GET_WALLET+"?walletHash="+wallet.getWallet_hash();
|
||||||
|
String responseWallet = httpCallHandler.getHttp(new URL(urlGetWallet));
|
||||||
|
JSONObject jsonWallet = new JSONObject(responseWallet);
|
||||||
|
|
||||||
|
wallet.setBalance(jsonWallet.getDouble("balance"));
|
||||||
|
walletList.add(wallet);
|
||||||
|
}
|
||||||
|
} catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
return walletList;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,15 @@
|
||||||
|
package monnethic.mobile.wallet;
|
||||||
|
|
||||||
|
import android.support.v7.app.AppCompatActivity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import com.example.monnthic.monnethicmobile.R;
|
||||||
|
|
||||||
|
public class CreateWalletActivity extends AppCompatActivity {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_create_wallet);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,69 @@
|
||||||
|
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 com.example.monnthic.monnethicmobile.R;
|
||||||
|
|
||||||
|
import monnethic.mobile.transaction.TransactionActivity;
|
||||||
|
|
||||||
|
public class HomeWalletActivity extends AppCompatActivity {
|
||||||
|
private String user_hash;
|
||||||
|
private String user_password;
|
||||||
|
private int session_id;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_home_wallet);
|
||||||
|
Button buttonCreateWallet = findViewById(R.id.buttonCreateWallet);
|
||||||
|
Button buttonSelectWallet = findViewById(R.id.buttonSelectWallet);
|
||||||
|
|
||||||
|
Intent intent = getIntent();
|
||||||
|
user_hash = intent.getStringExtra("USER_HASH");
|
||||||
|
user_password = intent.getStringExtra("USER_PWD");
|
||||||
|
session_id = Integer.parseInt(intent.getStringExtra("SESSION_ID"));
|
||||||
|
|
||||||
|
Log.i("HomeWalletActivity","user_hash: "+user_hash);
|
||||||
|
Log.i("HomeWalletActivity","user_password: "+user_password);
|
||||||
|
Log.i("HomeWalletActivity","session_id: "+session_id);
|
||||||
|
|
||||||
|
buttonCreateWallet.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View view) {
|
||||||
|
launchCreateWalletActivity();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
buttonSelectWallet.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View view) {
|
||||||
|
launchSelectWalletActivity();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void launchCreateWalletActivity() {
|
||||||
|
Log.i("HomeWalletActivity","launchCreateWalletActivity");
|
||||||
|
Log.i("HomeWalletActivity",user_hash);
|
||||||
|
Intent createWalletIntent = new Intent(HomeWalletActivity.this, CreateWalletActivity.class);
|
||||||
|
createWalletIntent.putExtra("USER_HASH",user_hash);
|
||||||
|
createWalletIntent.putExtra("USER_PWD",user_password);
|
||||||
|
createWalletIntent.putExtra("SESSION_ID",String.valueOf(session_id));
|
||||||
|
HomeWalletActivity.this.startActivity(createWalletIntent);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void launchSelectWalletActivity() {
|
||||||
|
Log.i("HomeWalletActivity","launchSelectWalletActivity");
|
||||||
|
Log.i("HomeWalletActivity",user_hash);
|
||||||
|
Intent selectWalletIntent = new Intent(HomeWalletActivity.this, SelectWalletActivity.class);
|
||||||
|
selectWalletIntent.putExtra("USER_HASH",user_hash);
|
||||||
|
selectWalletIntent.putExtra("USER_PWD",user_password);
|
||||||
|
selectWalletIntent.putExtra("SESSION_ID",String.valueOf(session_id));
|
||||||
|
HomeWalletActivity.this.startActivity(selectWalletIntent);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,69 @@
|
||||||
|
package monnethic.mobile.wallet;
|
||||||
|
|
||||||
|
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.ArrayAdapter;
|
||||||
|
import android.widget.ListView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.example.monnthic.monnethicmobile.R;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import monnethic.mobile.restApi.WalletApiHandler;
|
||||||
|
|
||||||
|
public class SelectWalletActivity extends AppCompatActivity {
|
||||||
|
private ArrayList<Wallet> userWallets;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_select_wallet);
|
||||||
|
|
||||||
|
ListView listView = (ListView) findViewById(R.id.listViewWallet);
|
||||||
|
Intent intent = getIntent();
|
||||||
|
String user_hash = intent.getStringExtra("USER_HASH");
|
||||||
|
String[] params = {user_hash};
|
||||||
|
|
||||||
|
Log.i("SelectWalletActivity", "user_hash : "+user_hash);
|
||||||
|
try {
|
||||||
|
userWallets = new getUserWalletTask().execute(params).get();
|
||||||
|
} catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i("SelectWalletActivity", "userWallets : "+userWallets);
|
||||||
|
ArrayAdapter<Wallet> adapter = new ArrayAdapter<Wallet>(this, R.layout.activity_select_wallet, userWallets);
|
||||||
|
listView.setAdapter(adapter);
|
||||||
|
|
||||||
|
//TODO
|
||||||
|
//ON CLICK ITEM
|
||||||
|
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
|
||||||
|
Wallet w = (Wallet) listView.getItemAtPosition(i);
|
||||||
|
Toast.makeText(getBaseContext(),w.getType(),Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
//AsyncTask for login
|
||||||
|
static private class getUserWalletTask extends AsyncTask<String,String,ArrayList<Wallet>> {
|
||||||
|
@Override
|
||||||
|
protected ArrayList<Wallet> doInBackground(String... params) {
|
||||||
|
ArrayList<Wallet> walletsList = new ArrayList<>();
|
||||||
|
try{
|
||||||
|
WalletApiHandler walletApiHandler = new WalletApiHandler();
|
||||||
|
walletsList = walletApiHandler.getUserWallets(params);
|
||||||
|
Log.i("SelectWalletActivity", "walletsList : "+walletsList);
|
||||||
|
}catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
Log.i("SelectWalletActivity", "BEFORE RETURN : walletsList : "+walletsList);
|
||||||
|
return walletsList;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
102
app/src/main/java/monnethic/mobile/wallet/Wallet.java
Normal file
102
app/src/main/java/monnethic/mobile/wallet/Wallet.java
Normal file
|
@ -0,0 +1,102 @@
|
||||||
|
package monnethic.mobile.wallet;
|
||||||
|
|
||||||
|
public class Wallet {
|
||||||
|
private int wallet_id;
|
||||||
|
private String wallet_hash;
|
||||||
|
private String user_hash;
|
||||||
|
private String type;
|
||||||
|
private Double balance;
|
||||||
|
private long creation_date;
|
||||||
|
private long modification_date;
|
||||||
|
private boolean is_active;
|
||||||
|
|
||||||
|
//Constructors
|
||||||
|
//Default constructor for ORMLite
|
||||||
|
public Wallet() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public Wallet(String type,String user_hash){
|
||||||
|
this.type=type;
|
||||||
|
this.user_hash=user_hash;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Wallet(String wallet_hash, String user_hash, String type, boolean isActive) {
|
||||||
|
this.wallet_hash = wallet_hash;
|
||||||
|
this.user_hash = user_hash;
|
||||||
|
this.type = type;
|
||||||
|
this.is_active = isActive;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Wallet(String wallet_hash, String user_hash, String type, Double balance, boolean isActive) {
|
||||||
|
this.wallet_hash = wallet_hash;
|
||||||
|
this.user_hash = user_hash;
|
||||||
|
this.type = type;
|
||||||
|
this.balance = balance;
|
||||||
|
this.is_active = isActive;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getWallet_id() {
|
||||||
|
return wallet_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWallet_id(int wallet_id) {
|
||||||
|
this.wallet_id = wallet_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getWallet_hash() {
|
||||||
|
return wallet_hash;
|
||||||
|
}
|
||||||
|
public void setWallet_hash(String wallet_hash) {
|
||||||
|
this.wallet_hash = wallet_hash;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUser_hash() {
|
||||||
|
return user_hash;
|
||||||
|
}
|
||||||
|
public void setUser_hash(String user_hash) {
|
||||||
|
this.user_hash = user_hash;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getType() {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
public void setType(String type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Double getBalance() {
|
||||||
|
return balance;
|
||||||
|
}
|
||||||
|
public void setBalance(Double balance) {
|
||||||
|
this.balance = balance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean is_active() {
|
||||||
|
return is_active;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIs_active(boolean is_active) {
|
||||||
|
this.is_active = is_active;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getCreation_date() {
|
||||||
|
return creation_date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCreation_date(long creation_date) {
|
||||||
|
this.creation_date = creation_date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getModification_date() {
|
||||||
|
return modification_date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setModification_date(long modification_date) {
|
||||||
|
this.modification_date = modification_date;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "{wallet_hash:"+wallet_hash+",user_hash:"+user_hash+",type:"+type+",balance:"+balance+"}";
|
||||||
|
}
|
||||||
|
}
|
60
app/src/main/res/layout/activity_create_wallet.xml
Normal file
60
app/src/main/res/layout/activity_create_wallet.xml
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context="monnethic.mobile.wallet.CreateWalletActivity">
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:fillViewport="true"
|
||||||
|
>
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/editTextWalletType"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="32dp"
|
||||||
|
android:layout_marginTop="168dp"
|
||||||
|
android:layout_marginEnd="32dp"
|
||||||
|
android:ems="10"
|
||||||
|
android:hint="Wallet name"
|
||||||
|
android:inputType="text"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.6"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="52dp"
|
||||||
|
android:layout_marginBottom="188dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/buttonCancel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_marginStart="86dp"
|
||||||
|
android:layout_marginTop="0dp"
|
||||||
|
android:text="Cancel" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/buttonOk"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignTop="@+id/buttonCancel"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_marginTop="0dp"
|
||||||
|
android:layout_marginEnd="86dp"
|
||||||
|
android:text="OK" />
|
||||||
|
</RelativeLayout>
|
||||||
|
</ScrollView>
|
||||||
|
</android.support.constraint.ConstraintLayout>
|
32
app/src/main/res/layout/activity_home_wallet.xml
Normal file
32
app/src/main/res/layout/activity_home_wallet.xml
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context="monnethic.mobile.wallet.HomeWalletActivity">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/buttonCreateWallet"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="32dp"
|
||||||
|
android:layout_marginTop="200dp"
|
||||||
|
android:layout_marginEnd="32dp"
|
||||||
|
android:text="CREATE WALLET"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/buttonSelectWallet"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="32dp"
|
||||||
|
android:layout_marginEnd="32dp"
|
||||||
|
android:layout_marginBottom="200dp"
|
||||||
|
android:text="SELECT WALLET"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
</android.support.constraint.ConstraintLayout>
|
22
app/src/main/res/layout/activity_select_wallet.xml
Normal file
22
app/src/main/res/layout/activity_select_wallet.xml
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context="monnethic.mobile.wallet.SelectWalletActivity">
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:fillViewport="true">
|
||||||
|
|
||||||
|
|
||||||
|
<ListView
|
||||||
|
android:id="@+id/listViewWallet"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</ScrollView>
|
||||||
|
</android.support.constraint.ConstraintLayout>
|
10
app/src/main/res/menu/menu_select_wallet.xml
Normal file
10
app/src/main/res/menu/menu_select_wallet.xml
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
tools:context="monnethic.mobile.wallet.SelectWalletActivity">
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_settings"
|
||||||
|
android:orderInCategory="100"
|
||||||
|
android:title="@string/action_settings"
|
||||||
|
app:showAsAction="never" />
|
||||||
|
</menu>
|
|
@ -2,4 +2,7 @@
|
||||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||||
|
<dimen name="app_bar_height">180dp</dimen>
|
||||||
|
<dimen name="fab_margin">16dp</dimen>
|
||||||
|
<dimen name="text_margin">16dp</dimen>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -14,4 +14,95 @@
|
||||||
<string name="permission_rationale">"Contacts permissions are needed for providing email
|
<string name="permission_rationale">"Contacts permissions are needed for providing email
|
||||||
completions."
|
completions."
|
||||||
</string>
|
</string>
|
||||||
|
<string name="title_activity_select_wallet">SelectWalletActivity</string>
|
||||||
|
<string name="large_text">
|
||||||
|
"Material is the metaphor.\n\n"
|
||||||
|
|
||||||
|
"A material metaphor is the unifying theory of a rationalized space and a system of motion."
|
||||||
|
"The material is grounded in tactile reality, inspired by the study of paper and ink, yet "
|
||||||
|
"technologically advanced and open to imagination and magic.\n"
|
||||||
|
"Surfaces and edges of the material provide visual cues that are grounded in reality. The "
|
||||||
|
"use of familiar tactile attributes helps users quickly understand affordances. Yet the "
|
||||||
|
"flexibility of the material creates new affordances that supercede those in the physical "
|
||||||
|
"world, without breaking the rules of physics.\n"
|
||||||
|
"The fundamentals of light, surface, and movement are key to conveying how objects move, "
|
||||||
|
"interact, and exist in space and in relation to each other. Realistic lighting shows "
|
||||||
|
"seams, divides space, and indicates moving parts.\n\n"
|
||||||
|
|
||||||
|
"Bold, graphic, intentional.\n\n"
|
||||||
|
|
||||||
|
"The foundational elements of print based design typography, grids, space, scale, color, "
|
||||||
|
"and use of imagery guide visual treatments. These elements do far more than please the "
|
||||||
|
"eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge "
|
||||||
|
"imagery, large scale typography, and intentional white space create a bold and graphic "
|
||||||
|
"interface that immerse the user in the experience.\n"
|
||||||
|
"An emphasis on user actions makes core functionality immediately apparent and provides "
|
||||||
|
"waypoints for the user.\n\n"
|
||||||
|
|
||||||
|
"Motion provides meaning.\n\n"
|
||||||
|
|
||||||
|
"Motion respects and reinforces the user as the prime mover. Primary user actions are "
|
||||||
|
"inflection points that initiate motion, transforming the whole design.\n"
|
||||||
|
"All action takes place in a single environment. Objects are presented to the user without "
|
||||||
|
"breaking the continuity of experience even as they transform and reorganize.\n"
|
||||||
|
"Motion is meaningful and appropriate, serving to focus attention and maintain continuity. "
|
||||||
|
"Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n"
|
||||||
|
|
||||||
|
"3D world.\n\n"
|
||||||
|
|
||||||
|
"The material environment is a 3D space, which means all objects have x, y, and z "
|
||||||
|
"dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the "
|
||||||
|
"positive z-axis extending towards the viewer. Every sheet of material occupies a single "
|
||||||
|
"position along the z-axis and has a standard 1dp thickness.\n"
|
||||||
|
"On the web, the z-axis is used for layering and not for perspective. The 3D world is "
|
||||||
|
"emulated by manipulating the y-axis.\n\n"
|
||||||
|
|
||||||
|
"Light and shadow.\n\n"
|
||||||
|
|
||||||
|
"Within the material environment, virtual lights illuminate the scene. Key lights create "
|
||||||
|
"directional shadows, while ambient light creates soft shadows from all angles.\n"
|
||||||
|
"Shadows in the material environment are cast by these two light sources. In Android "
|
||||||
|
"development, shadows occur when light sources are blocked by sheets of material at "
|
||||||
|
"various positions along the z-axis. On the web, shadows are depicted by manipulating the "
|
||||||
|
"y-axis only. The following example shows the card with a height of 6dp.\n\n"
|
||||||
|
|
||||||
|
"Resting elevation.\n\n"
|
||||||
|
|
||||||
|
"All material objects, regardless of size, have a resting elevation, or default elevation "
|
||||||
|
"that does not change. If an object changes elevation, it should return to its resting "
|
||||||
|
"elevation as soon as possible.\n\n"
|
||||||
|
|
||||||
|
"Component elevations.\n\n"
|
||||||
|
|
||||||
|
"The resting elevation for a component type is consistent across apps (e.g., FAB elevation "
|
||||||
|
"does not vary from 6dp in one app to 16dp in another app).\n"
|
||||||
|
"Components may have different resting elevations across platforms, depending on the depth "
|
||||||
|
"of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n"
|
||||||
|
|
||||||
|
"Responsive elevation and dynamic elevation offsets.\n\n"
|
||||||
|
|
||||||
|
"Some component types have responsive elevation, meaning they change elevation in response "
|
||||||
|
"to user input (e.g., normal, focused, and pressed) or system events. These elevation "
|
||||||
|
"changes are consistently implemented using dynamic elevation offsets.\n"
|
||||||
|
"Dynamic elevation offsets are the goal elevation that a component moves towards, relative "
|
||||||
|
"to the component’s resting state. They ensure that elevation changes are consistent "
|
||||||
|
"across actions and component types. For example, all components that lift on press have "
|
||||||
|
"the same elevation change relative to their resting elevation.\n"
|
||||||
|
"Once the input event is completed or cancelled, the component will return to its resting "
|
||||||
|
"elevation.\n\n"
|
||||||
|
|
||||||
|
"Avoiding elevation interference.\n\n"
|
||||||
|
|
||||||
|
"Components with responsive elevations may encounter other components as they move between "
|
||||||
|
"their resting elevations and dynamic elevation offsets. Because material cannot pass "
|
||||||
|
"through other material, components avoid interfering with one another any number of ways, "
|
||||||
|
"whether on a per component basis or using the entire app layout.\n"
|
||||||
|
"On a component level, components can move or be removed before they cause interference. "
|
||||||
|
"For example, a floating action button (FAB) can disappear or move off screen before a "
|
||||||
|
"user picks up a card, or it can move if a snackbar appears.\n"
|
||||||
|
"On the layout level, design your app layout to minimize opportunities for interference. "
|
||||||
|
"For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
|
||||||
|
"when a user tries to pick up one of cards.\n\n"
|
||||||
|
</string>
|
||||||
|
<string name="action_settings">Settings</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -8,4 +8,8 @@
|
||||||
<item name="colorAccent">@color/colorAccent</item>
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
|
||||||
|
|
||||||
|
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
package monnethic.mobile.test.blockchainApi;
|
||||||
|
|
||||||
|
import org.json.JSONArray;
|
||||||
|
import org.json.JSONObject;
|
||||||
|
import org.junit.Test;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import monnethic.mobile.restApi.Config;
|
||||||
|
import monnethic.mobile.restApi.HttpCallHandler;
|
||||||
|
import monnethic.mobile.wallet.Wallet;
|
||||||
|
|
||||||
|
public class walletTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getUsersWallet(){
|
||||||
|
ArrayList<Wallet> walletList = new ArrayList<>();
|
||||||
|
try {
|
||||||
|
String url = Config.WALLET_GET_USER_WALLETS+"?userHash="+"$2a$10$GzyMhD3n05Z2lwCnoGi2dusjKrNAmHhtn5fw1xLpes5.cEV5T7lve";
|
||||||
|
System.out.println("call : "+url);
|
||||||
|
HttpCallHandler httpCallHandler = new HttpCallHandler();
|
||||||
|
String response = httpCallHandler.getHttp(new URL(url));
|
||||||
|
|
||||||
|
System.out.println("RESPONSE IS : "+response);
|
||||||
|
|
||||||
|
JSONArray jsonArray = new JSONArray(response);
|
||||||
|
|
||||||
|
for(int i=0; i<jsonArray.length(); i++){
|
||||||
|
Wallet wallet = new Wallet();
|
||||||
|
JSONObject jsonObject = jsonArray.getJSONObject(i);
|
||||||
|
|
||||||
|
wallet.setType(jsonObject.getJSONObject("Record").getJSONObject("walletType").getString("string"));
|
||||||
|
wallet.setWallet_hash(jsonObject.getJSONObject("Record").getJSONObject("id").getString("string"));
|
||||||
|
wallet.setUser_hash(jsonObject.getJSONObject("Record").getJSONObject("owner").getString("string"));
|
||||||
|
|
||||||
|
String urlGetWallet = Config.WALLET_GET_WALLET+"?walletHash="+wallet.getWallet_hash();
|
||||||
|
String responseWallet = httpCallHandler.getHttp(new URL(urlGetWallet));
|
||||||
|
JSONObject jsonWallet = new JSONObject(responseWallet);
|
||||||
|
|
||||||
|
wallet.setBalance(jsonWallet.getDouble("balance"));
|
||||||
|
walletList.add(wallet);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Wallet w : walletList){
|
||||||
|
System.out.println("wallet : "+w.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue