From 450a7c285b1d1aa5044679275dbd4dfa430c45be Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Fri, 30 Nov 2018 19:49:40 -0600 Subject: [PATCH] Increase the camera preview area to improve the QR read performance and make some UI improvements. --- .../fragments/SendTransactionFragment.java | 61 ++----------------- app/src/main/res/layout/send_transaction.xml | 14 ++++- 2 files changed, 16 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java index 1d764bc..555ae9f 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java +++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java @@ -28,8 +28,6 @@ import android.text.Editable; import android.util.Log; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; -import android.view.Window; import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.ImageView; @@ -139,9 +137,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat private FloatingActionButton fabSend; private AlertDialog.Builder builder; - /* - Dialog for loading - */ + /* Dialog for loading */ private CrystalDialog crystalDialog; public static SendTransactionFragment newInstance(long cryptoNetAccountId) { @@ -168,7 +164,6 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat //AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.dialog_theme_full); - //builder.setTitle("Send"); LayoutInflater inflater = getActivity().getLayoutInflater(); View view = inflater.inflate(R.layout.send_transaction, null); @@ -176,11 +171,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat this.cryptoNetAccountId = getArguments().getLong("CRYPTO_NET_ACCOUNT_ID",-1); - final Activity activity = getActivity(); - - /* - * Add style to the spinner android - * */ + /* Add style to the spinner android */ spFrom.setBackground(getContext().getDrawable(R.drawable.square_color)); if (this.cryptoNetAccountId != -1) { @@ -191,36 +182,10 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat List cryptoNetAccounts = cryptoNetAccountListViewModel.getCryptoNetAccountList(); CryptoNetAccountAdapter fromSpinnerAdapter = new CryptoNetAccountAdapter(this.getContext(), android.R.layout.simple_spinner_item, cryptoNetAccounts); - /* - * If only one account block the control - * */ - //if(cryptoNetAccounts.size()==1){ - // spFrom.setEnabled(false); - //} - spFrom.setAdapter(fromSpinnerAdapter); spFrom.setSelection(0); setAccountUI(); - /* - * Custom material spinner implementation - * */ - //spFrom.setItems(cryptoNetAccounts); - //spFrom.setSelectedIndex(0); - //spFrom.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener() { - // @Override - // public void onItemSelected(MaterialSpinner view, int position, long id, CryptoNetAccount item) { - // sendTransactionValidator.validate(); - // } - //}); - //spFrom.setOnNothingSelectedListener(new MaterialSpinner.OnNothingSelectedListener() { - - // @Override public void onNothingSelected(MaterialSpinner spinner) { - - // } - //}); - - // etFrom.setText(this.grapheneAccount.getName()); } loadUserImage(); @@ -337,12 +302,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat public void onResume() { super.onResume(); mScannerView.setResultHandler(this); - mScannerView.startCamera(); - // Force dialog fragment to use the full width of the screen - Window dialogWindow = getDialog().getWindow(); - assert dialogWindow != null; - dialogWindow.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); loadUserImage(); } @@ -511,10 +471,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat if (fromAccountSelected.getCryptoNet() == CryptoNet.BITSHARES) { - /* - * this is only for graphene accounts. - * - **/ + /* This is only for graphene accounts. */ GrapheneAccount grapheneAccountSelected = new GrapheneAccount(fromAccountSelected); grapheneAccountSelected.loadInfo(db.grapheneAccountInfoDao().getByAccountId(fromAccountSelected.getId())); @@ -583,16 +540,12 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat }); } - /* - * If exists mode scurity show it and valide events in case of success or fail - * */ + /* If exists mode security show it and validate events in case of success or fail */ CrystalSecurityMonitor.getInstance(this.getActivity()).callPasswordRequest(this.getActivity(), new OnResponse() { @Override public void onSuccess() { - /* - * Show loading dialog - * */ + /* Show loading dialog */ crystalDialog = new CrystalDialog((Activity) getContext()); crystalDialog.setText("Sending"); crystalDialog.progress(); @@ -623,10 +576,6 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat // Camera Permissions private static final int REQUEST_CAMERA_PERMISSION = 1; - private static String[] PERMISSIONS_CAMERA = { - Manifest.permission.CAMERA - }; - @Override public void onValidationSucceeded(final ValidationField field) { diff --git a/app/src/main/res/layout/send_transaction.xml b/app/src/main/res/layout/send_transaction.xml index 3e7b2f8..f261562 100644 --- a/app/src/main/res/layout/send_transaction.xml +++ b/app/src/main/res/layout/send_transaction.xml @@ -18,6 +18,13 @@ android:orientation="vertical" app:layout_constraintGuide_percent="0.5"/> + + + app:layout_constraintEnd_toStartOf="@id/cameraVerticalGuideline"/> @@ -247,7 +254,8 @@ android:layout_marginEnd="0dp" android:background="@drawable/send_transaction_send_view" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@id/ivCamera" /> + app:layout_constraintTop_toTopOf="@id/viewCamera" + app:layout_constraintBottom_toBottomOf="@id/viewCamera"/>