Monnethic/app-mobile
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

update layjout & textSize

Browse source
This commit is contained in:
GME 2019-06-13 15:32:22 +02:00
parent 7f9640a2ea
commit 5eb4242e6e
9 changed files with 273 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/monnethic/mobile/transaction/TransactionAdapter.java
View file

@ -39,7 +39,6 @@ public class TransactionAdapter extends ArrayAdapter<Transaction> {
ViewGroup.LayoutParams params = convertView.getLayoutParams();
params.height = 250;
convertView.setLayoutParams(params);
String myFormat = "dd-MM-yyyy HH:mm:ss";

6
app/src/main/java/monnethic/mobile/user/UserAccountActivity.java
View file

@ -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) {

1
app/src/main/java/monnethic/mobile/wallet/WalletAdapter.java
View file

@ -27,7 +27,6 @@ public class WalletAdapter extends ArrayAdapter<Wallet> {
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());

1
app/src/main/res/layout/activity_homepage.xml
View file

@ -13,6 +13,7 @@
android:layout_gravity="center"
android:layout_marginTop="75dp"
android:text="Welcome on Monnethic !"
android:textSize="16sp"
android:textStyle="bold"/>
<Button

109
app/src/main/res/layout/activity_qr_code.xml
View file

@ -1,76 +1,79 @@
<?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"
android:layout_height="wrap_content"
android:layout_gravity="center"
tools:context="monnethic.mobile.qrcode.QrCodeActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/qrCodeViewer"
android:layout_width="320dp"
android:layout_height="307dp"
android:layout_marginBottom="204dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:layout_height="300dp"
android:layout_marginBottom="50dp"
android:layout_gravity="center"/>
<Button
android:id="@+id/buttonClose"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="56dp"
android:layout_marginEnd="148dp"
android:text="CLOSE"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
android:layout_marginBottom="20dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textViewAdresse"
android:layout_width="60dp"
android:layout_height="32dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="20dp"
android:text="Address:"
app:layout_constraintBottom_toTopOf="@+id/textViewAmount"
app:layout_constraintEnd_toStartOf="@+id/textViewAdresseDisplay"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="Address: "
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/textViewAdresseDisplay"
android:layout_width="268dp"
android:layout_height="32dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="20dp"
android:textSize="9sp"
app:layout_constraintBottom_toTopOf="@+id/textViewAmountDisplay"
app:layout_constraintEnd_toEndOf="parent" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textViewAmount"
android:layout_width="60dp"
android:layout_height="25dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="140dp"
android:text="Amount:"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/textViewAmountDisplay"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="Amount: "
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/textViewAmountDisplay"
android:layout_width="172dp"
android:layout_height="25dp"
android:layout_marginEnd="112dp"
android:layout_marginBottom="140dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<Button
android:id="@+id/buttonClose"
android:layout_width="200dp"
android:layout_height="45dp"
android:text="CLOSE" />
</LinearLayout>
</LinearLayout>
</android.support.constraint.ConstraintLayout>

138
app/src/main/res/layout/activity_user_account.xml
View file

@ -1,96 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/buttonSettings"
android:layout_width="100dp"
android:layout_height="45dp"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_gravity="right"
android:layout_marginEnd="5dp"
android:text="Settings" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="90dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="40dp"
android:orientation="vertical">
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="70dp"
android:layout_gravity="center"
android:text="WALLET"
android:textSize="15sp"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/walletHash"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="5dp"
android:textIsSelectable="true"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:orientation="vertical">
<TextView
android:id="@+id/textBalance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="BALANCE"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/balanceView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:inputType="none"
android:textAlignment="center"
android:textSize="18sp"
android:textStyle="bold"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<Button
android:id="@+id/buttonPayement"
android:layout_width="200dp"
android:layout_height="45dp"
android:layout_above="@+id/buttonReceive"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20dp"
android:layout_marginTop="15dp"
android:text="Payement" />
<Button
android:id="@+id/buttonReceive"
android:layout_width="200dp"
android:layout_height="45dp"
android:layout_above="@+id/buttonRefreshBalance"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:text="Receive" />
<Button
android:id="@+id/buttonRefreshBalance"
android:layout_width="200dp"
android:layout_height="45dp"
android:layout_above="@+id/goToHistory"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:text="Refresh" />
<TextView
android:id="@+id/balanceView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textBalance"
android:layout_centerHorizontal="true"
android:layout_marginTop="15dp"
android:inputType="none"
android:textAlignment="center"
android:textSize="16sp" />
<TextView
android:id="@+id/textBalance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/userHash"
android:layout_centerHorizontal="true"
android:layout_marginTop="50dp"
android:text="BALANCE"
android:textAlignment="center"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:id="@+id/userHash"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/textView4"
android:layout_alignParentStart="true"
android:layout_marginLeft="30dp"
android:layout_marginTop="15dp"
android:layout_marginRight="30dp"
android:textIsSelectable="true"
android:textSize="12sp" />
<Button
android:id="@+id/goToHistory"
android:layout_width="200dp"
android:layout_height="45dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="75dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="5dp"
android:text="History" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

51
app/src/main/res/layout/transaction_view_template.xml
View file

@ -29,52 +29,63 @@
android:id="@+id/textView5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_weight="0.01"
android:text="TxID:"
android:textSize="10sp" />
android:layout_marginStart="3dp"
android:layout_marginRight="5dp"
android:text="TxID: "
android:textSize="15sp"
android:textStyle="bold" />
<TextView
android:id="@+id/displayTxId"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_weight="1"
android:textSize="10sp" />
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginTop="2dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_marginStart="10dp"
android:layout_weight="0.01"
android:text="Date:"
android:textSize="12sp" />
android:textSize="15sp"
android:textStyle="bold" />
<TextView
android:id="@+id/displayTxDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:textSize="11sp" />
android:layout_weight="1"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="0.01"
android:text="Type:"
android:textSize="12sp" />
android:textSize="15sp"
android:textStyle="bold" />
<TextView
android:id="@+id/displayTxType"
@ -83,15 +94,25 @@
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_weight="1"
android:textSize="12sp" />
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="5dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textView8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="0.01"
android:text="Amount:"
android:textSize="12sp" />
android:textSize="15sp"
android:textStyle="bold" />
<TextView
android:id="@+id/displayTxAmount"
@ -100,7 +121,7 @@
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_weight="1"
android:textSize="12sp" />
android:textSize="16sp" />
</LinearLayout>

21
app/src/main/res/layout/wallet_search_template.xml
View file

@ -28,7 +28,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:text="User :"
android:textSize="12sp" />
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/userNameSearch"
@ -36,21 +37,23 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="u_n"
android:textSize="12sp" />
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:text="Wallet :"
android:textSize="12sp" />
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/walletHashSearch"
@ -59,13 +62,14 @@
android:layout_marginStart="10dp"
android:singleLine="false"
android:text="w_h"
android:textSize="12sp" />
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:orientation="horizontal">
@ -75,7 +79,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:text="Wallet type :"
android:textSize="12sp" />
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/walletIdSearch"
@ -84,7 +89,7 @@
android:singleLine="false"
android:layout_marginStart="10dp"
android:text="w_id"
android:textSize="12sp" />
android:textSize="16sp" />
</LinearLayout>

71
app/src/main/res/layout/wallet_view_template.xml
View file

@ -15,70 +15,69 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/wallet_hash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Wallet Hash"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="11sp" />
android:textSize="18sp"
android:textStyle="bold"/>
</LinearLayout>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_marginTop="5dp"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/wallet_type"
android:layout_alignParentStart="true"
android:layout_marginStart="28dp"
android:layout_marginTop="0dp"
android:layout_marginStart="25dp"
android:text="Wallet :"
android:textSize="13sp" />
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/wallet_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/textView2"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="96dp"
android:layout_marginTop="0dp"
android:layout_marginStart="5dp"
android:text="Wallet Type"
android:textSize="13sp" />
</RelativeLayout>
android:textSize="18sp" />
</LinearLayout>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_marginTop="5dp"
android:layout_height="wrap_content">
<TextView
android:id="@+id/wallet_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="96dp"
android:layout_marginTop="0dp"
android:text="Wallet Balance"
android:textSize="13sp" />
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/wallet_balance"
android:layout_alignParentStart="true"
android:layout_marginStart="28dp"
android:layout_marginTop="0dp"
android:layout_marginStart="25dp"
android:text="Balance :"
android:textSize="13sp" />
</RelativeLayout>
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/wallet_balance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="Wallet Balance"
android:textSize="18sp" />
</LinearLayout>
</LinearLayout>