agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UI adjustments

Browse source
This commit is contained in:
dtvv 2018-09-24 15:07:21 -05:00
parent 2c5661c587
commit 2e6c61f88a
12 changed files with 226 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java
View file

@ -56,6 +56,14 @@ public class BackupSeedActivity extends AppCompatActivity {
accountSeedViewModel.loadSeed(seedId);
} else {
/*
*
* The first time you create the account, the "seed" is showed propertly in this window,
* but when you want to check it again the "seed" does not exist anymore and
* for this cause the program gets into this point and finish the window
*
* */
finish();
}
}

43
app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java
View file

@ -7,7 +7,6 @@ import android.support.v7.app.AppCompatActivity;
import android.text.Editable;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import butterknife.BindView;
@ -15,20 +14,10 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnTextChanged;
import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.enums.CryptoNet;
import cy.agorise.crystalwallet.enums.SeedType;
import cy.agorise.crystalwallet.manager.BitsharesAccountManager;
import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.GrapheneAccount;
import cy.agorise.crystalwallet.models.GrapheneAccountInfo;
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequestListener;
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests;
import cy.agorise.crystalwallet.requestmanagers.ImportBackupRequest;
import cy.agorise.crystalwallet.requestmanagers.ValidateImportBitsharesAccountRequest;
import cy.agorise.crystalwallet.viewmodels.AccountSeedViewModel;
import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountViewModel;
import cy.agorise.crystalwallet.viewmodels.GrapheneAccountInfoViewModel;
import cy.agorise.crystalwallet.viewmodels.validators.ImportSeedValidator;
import cy.agorise.crystalwallet.viewmodels.validators.UIValidatorListener;
import cy.agorise.crystalwallet.viewmodels.validators.validationfields.ValidationField;
@ -40,23 +29,23 @@ public class ImportSeedActivity extends AppCompatActivity implements UIValidator
@BindView(R.id.etPin)
EditText etPin;
@BindView(R.id.tvPinError)
TextView tvPinError;
//@BindView(R.id.tvPinError)
//TextView tvPinError;
@BindView(R.id.etPinConfirmation)
EditText etPinConfirmation;
@BindView(R.id.tvPinConfirmationError)
TextView tvPinConfirmationError;
//@BindView(R.id.tvPinConfirmationError)
//TextView tvPinConfirmationError;
@BindView(R.id.etSeedWords)
EditText etSeedWords;
@BindView(R.id.tvSeedWordsError)
TextView tvSeedWordsError;
//@BindView(R.id.tvSeedWordsError)
//TextView tvSeedWordsError;
@BindView (R.id.etAccountName)
EditText etAccountName;
@BindView(R.id.tvAccountNameError)
TextView tvAccountNameError;
//@BindView(R.id.tvAccountNameError)
//TextView tvAccountNameError;
@BindView(R.id.btnImport)
Button btnImport;
@ -183,13 +172,13 @@ public class ImportSeedActivity extends AppCompatActivity implements UIValidator
public void run() {
if (field.getView() == etPin) {
tvPinError.setText("");
//tvPinError.setText("");
} else if (field.getView() == etPinConfirmation){
tvPinConfirmationError.setText("");
//tvPinConfirmationError.setText("");
} else if (field.getView() == etAccountName){
tvAccountNameError.setText("");
//tvAccountNameError.setText("");
} else if (field.getView() == etSeedWords){
tvSeedWordsError.setText("");
//tvSeedWordsError.setText("");
}
if (activity.importSeedValidator.isValid()){
@ -205,13 +194,13 @@ public class ImportSeedActivity extends AppCompatActivity implements UIValidator
@Override
public void onValidationFailed(ValidationField field) {
if (field.getView() == etPin) {
tvPinError.setText(field.getMessage());
//tvPinError.setText(field.getMessage());
} else if (field.getView() == etPinConfirmation){
tvPinConfirmationError.setText(field.getMessage());
//tvPinConfirmationError.setText(field.getMessage());
} else if (field.getView() == etAccountName){
tvAccountNameError.setText(field.getMessage());
//tvAccountNameError.setText(field.getMessage());
} else if (field.getView() == etSeedWords){
tvSeedWordsError.setText(field.getMessage());
//tvSeedWordsError.setText(field.getMessage());
}
}
}

16
app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java
View file

@ -1,14 +1,20 @@
package cy.agorise.crystalwallet.fragments;
import android.Manifest;
import android.arch.lifecycle.LiveData;
import android.arch.lifecycle.Observer;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -39,6 +45,11 @@ import cy.agorise.crystalwallet.requestmanagers.FileServiceRequests;
*/
public class BackupsSettingsFragment extends Fragment{
private static final int PERMISSION_REQUEST_CODE = 1;
public BackupsSettingsFragment() {
// Required empty public constructor
}
@ -92,12 +103,13 @@ public class BackupsSettingsFragment extends Fragment{
public void btnBrainOnClick(){
Intent intent = new Intent(getContext(), BackupSeedActivity.class);
intent.putExtra("SEED_ID","");
startActivity(intent);
}
@OnClick(R.id.btnBinFile)
public void makeBackupFile(){
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
LiveData<GeneralSetting> generalSettingLD = CrystalDatabase.getAppDatabase(getContext()).generalSettingDao().getByName(GeneralSetting.SETTING_PASSWORD);
@ -105,13 +117,13 @@ public class BackupsSettingsFragment extends Fragment{
generalSettingLD.observe(this, new Observer<GeneralSetting>() {
@Override
public void onChanged(@Nullable GeneralSetting generalSetting) {
String password = "";
if (generalSetting != null) {
password = generalSetting.getValue();
}
final CreateBackupRequest backupFileRequest = new CreateBackupRequest(getContext(), password);
backupFileRequest.setListener(new FileServiceRequestListener() {
@Override
public void onCarryOut() {

17
app/src/main/java/cy/agorise/crystalwallet/fragments/BalanceFragment.java
View file

@ -6,10 +6,12 @@ import android.arch.lifecycle.ViewModelProviders;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import java.util.List;
@ -27,6 +29,13 @@ public class BalanceFragment extends Fragment {
@BindView(R.id.vCryptoNetBalanceListView)
CryptoNetBalanceListView vCryptoNetBalanceListView;
@BindView(R.id.tvNobalances)
public TextView tvNobalances;
public BalanceFragment() {
// Required empty public constructor
}
@ -60,6 +69,14 @@ public class BalanceFragment extends Fragment {
@Override
public void onChanged(List<CryptoNetBalance> cryptoNetBalances) {
vCryptoNetBalanceListView.setData(cryptoNetBalances, fragment);
final int size = cryptoNetBalances.size();
if(size==1){
tvNobalances.setVisibility(View.VISIBLE);
}
else{
tvNobalances.setVisibility(View.INVISIBLE);
}
}
});

12
app/src/main/java/cy/agorise/crystalwallet/fragments/ContactsFragment.java
View file

@ -14,6 +14,7 @@ import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import butterknife.BindView;
import butterknife.ButterKnife;
@ -27,6 +28,9 @@ public class ContactsFragment extends Fragment {
@BindView(R.id.rvContacts)
RecyclerView rvContacts;
@BindView(R.id.tvNobalances)
public TextView tvNobalances;
ContactListAdapter adapter;
FloatingActionButton fabAddContact;
@ -86,6 +90,14 @@ public class ContactsFragment extends Fragment {
@Override
public void onChanged(@Nullable PagedList<Contact> contacts) {
adapter.submitList(contacts);
final int size = contacts.size();
if(size==0){
tvNobalances.setVisibility(View.VISIBLE);
}
else{
tvNobalances.setVisibility(View.INVISIBLE);
}
}
});

12
app/src/main/java/cy/agorise/crystalwallet/fragments/TransactionsFragment.java
View file

@ -17,6 +17,7 @@ import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.EditText;
import android.widget.Spinner;
import android.widget.TextView;
import java.util.ArrayList;
import java.util.List;
@ -42,6 +43,9 @@ public class TransactionsFragment extends Fragment {
@BindView(R.id.etTransactionSearch)
EditText etTransactionSearch;
@BindView(R.id.tvNobalances)
public TextView tvNobalances;
RecyclerView balanceRecyclerView;
FloatingActionButton fabSend;
FloatingActionButton fabReceive;
@ -125,6 +129,14 @@ public class TransactionsFragment extends Fragment {
public void onChanged(@Nullable PagedList<CryptoCoinTransactionExtended> cryptoCoinTransactions) {
Log.i("Transactions","Transactions have change! Count:"+cryptoCoinTransactions.size());
transactionListView.setData(cryptoCoinTransactions, fragment);
final int size = cryptoCoinTransactions.size();
if(size==0){
tvNobalances.setVisibility(View.VISIBLE);
}
else{
tvNobalances.setVisibility(View.INVISIBLE);
}
}
});
}

17
app/src/main/res/layout/fragment_balance.xml
View file

@ -4,14 +4,15 @@
android:layout_height="match_parent"
tools:context="cy.agorise.crystalwallet.fragments.BalanceFragment">
<!--<android.support.design.widget.TabLayout
android:id="@+id/tabLayout"
android:layout_gravity="start"
android:layout_width="match_parent"
android:layout_height="45dp"
android:background="#d9d9d9"
android:animateLayoutChanges="true" />-->
<TextView
android:id="@+id/tvNobalances"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/You_dont_have_balances"
android:textColor="@color/gray"
android:layout_marginTop="190dp"
android:layout_marginLeft="90dp"
android:textSize="15dp" />
<cy.agorise.crystalwallet.views.CryptoNetBalanceListView
android:layout_width="match_parent"

10
app/src/main/res/layout/fragment_contacts.xml
View file

@ -4,6 +4,16 @@
android:layout_height="match_parent"
tools:context="cy.agorise.crystalwallet.fragments.ContactsFragment">
<TextView
android:id="@+id/tvNobalances"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/You_dont_have_contacts"
android:textColor="@color/gray"
android:layout_marginTop="190dp"
android:layout_marginLeft="90dp"
android:textSize="15dp" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rvContacts"
android:layout_width="match_parent"

8
app/src/main/res/layout/fragment_merchants.xml
View file

@ -7,8 +7,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Comming soon"
android:layout_centerInParent="true"
android:textSize="20dp" />
android:text="Comming soon ..."
android:textColor="@color/gray"
android:layout_centerHorizontal="true"
android:layout_marginTop="190dp"
android:textSize="15dp" />
</RelativeLayout>

10
app/src/main/res/layout/fragment_transactions.xml
View file

@ -4,6 +4,16 @@
android:layout_height="match_parent"
tools:context="cy.agorise.crystalwallet.fragments.TransactionsFragment">
<TextView
android:id="@+id/tvNobalances"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/You_dont_have_transactions"
android:textColor="@color/gray"
android:layout_marginTop="190dp"
android:layout_marginLeft="90dp"
android:textSize="15dp" />
<cy.agorise.crystalwallet.views.TransactionListView
android:layout_width="match_parent"
android:layout_height="wrap_content"

179
app/src/main/res/layout/import_seed.xml
View file

@ -1,160 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
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:orientation="vertical"
tools:context=".activities.ImportSeedActivity">
tools:context=".activities.CreateSeedActivity">
<EditText
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true">
<android.support.design.widget.TextInputLayout
android:id="@+id/tilPin"
android:layout_width="290dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true">
<cy.agorise.crystalwallet.views.natives.CustomTextInputEditText
android:id="@+id/etPin"
android:layout_below="@+id/statusBar"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="20dp"
android:background="@drawable/edittext_bg"
android:inputType="number"
android:maxLines="1"
android:hint="@string/txt_6_digits_pin"
android:textColor="@color/black" />
<TextView
android:id="@+id/tvPinError"
android:layout_below="@+id/etPin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="10dp"
android:textColor="@color/red"
android:textStyle="bold" />
android:hint="@string/txt_6_digits_pin"
android:inputType="number"
android:maxLength="32"
android:singleLine="true" />
<EditText
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/tilPinConfirmation"
android:layout_width="290dp"
android:layout_height="wrap_content"
android:layout_below="@+id/tilPin"
android:layout_marginTop="8dp"
android:layout_centerHorizontal="true">
<cy.agorise.crystalwallet.views.natives.CustomTextInputEditText
android:id="@+id/etPinConfirmation"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_below="@+id/tvPinError"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:background="@drawable/edittext_bg"
android:inputType="number"
android:maxLines="1"
android:hint="@string/txt_6_digits_pin_confirm"
android:singleLine="true"
android:textColor="@color/black" />
<TextView
android:id="@+id/tvPinConfirmationError"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="10dp"
android:textColor="@color/red"
android:layout_below="@+id/etPinConfirmation"
android:textStyle="bold" />
android:hint="@string/txt_6_digits_pin_confirm"
android:inputType="number"
android:maxLength="32"
android:singleLine="true" />
<EditText
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/etSeedWordsLayout"
android:layout_width="290dp"
android:layout_height="wrap_content"
android:layout_below="@+id/tilPinConfirmation"
android:layout_marginTop="8dp"
android:layout_centerHorizontal="true">
<cy.agorise.crystalwallet.views.natives.CustomTextInputEditText
android:id="@+id/etSeedWords"
android:layout_below="@+id/tvPinConfirmationError"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:background="@drawable/edittext_bg"
android:gravity="top"
android:hint="@string/Seed"
android:inputType="textMultiLine"
android:textColor="@color/black" />
android:inputType="textMultiLine" />
<TextView
android:id="@+id/tvSeedWordsError"
android:layout_below="@+id/etSeedWords"
android:layout_width="match_parent"
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/tilAccountName"
android:layout_width="290dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="10dp"
android:textColor="@color/red"
android:textStyle="bold" />
android:layout_below="@+id/etSeedWordsLayout"
android:layout_marginTop="8dp"
android:layout_centerHorizontal="true">
<EditText
<cy.agorise.crystalwallet.views.natives.CustomTextInputEditText
android:id="@+id/etAccountName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tvSeedWordsError"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:background="@drawable/edittext_bg"
android:gravity="top"
android:digits="abcdefghijklmnopqrstuvwxyz1234567890 -"
android:hint="@string/txt_account_name"
android:inputType="textMultiLine"
android:textColor="@color/black" />
android:maxLength="255"
android:singleLine="true" />
<TextView
android:id="@+id/tvAccountNameError"
android:layout_width="match_parent"
android:layout_below="@+id/etAccountName"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="10dp"
android:textColor="@color/red"
android:textStyle="bold" />
</android.support.design.widget.TextInputLayout>
<TextView
android:id="@+id/txtLeyend"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tvAccountNameError"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="10dp"
android:text="@string/txt_brain_key_info"
android:textSize="15dp"
android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
android:id="@+id/linearlayoutButtons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/txtLeyend"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal">
android:layout_below="@+id/tilAccountName"
android:layout_marginTop="20dp">
<Button
android:id="@+id/btnCancel"
android:layout_width="140dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp"
android:layout_marginRight="5dp"
android:background="@color/redColor"
android:text="@string/cancel"
android:textColor="@color/white" />
android:textColor="@color/white"
android:textStyle="bold" />
<Button
android:id="@+id/btnImport"
android:layout_width="wrap_content"
android:layout_width="140dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp"
android:layout_marginLeft="5dp"
android:background="@color/colorPrimary"
android:padding="10dp"
android:text="@string/create_wallet"
android:textColor="@color/white" />
android:textColor="@color/white"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>
<cy.agorise.crystalwallet.util.BottomStatusBar
android:id="@+id/bottomStatusBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:id="@+id/statusBar"/>
android:layout_alignParentBottom="true"/>
</RelativeLayout>

4
app/src/main/res/values/strings.xml
View file

@ -14,6 +14,10 @@
<string name="error_wif">Error creating WIF key</string>
<string name="error_brainkey_wif_export">WIF imported account doesn\'t support brainkey backup</string>
<string name="You_dont_have_balances">You dont have balances</string>
<string name="You_dont_have_transactions">You dont have transactions</string>
<string name="You_dont_have_contacts">You dont have contacts</string>
<string name="account_create_register_or_import">ACCOUNT CREATE/REGISTER OR IMPORT</string>
<string name="txt_account_name">Account Name</string>
<string name="time_stamp">Time stamp</string>