From b71b3badd82061e4613d63ea8e238ccc420bbdc3 Mon Sep 17 00:00:00 2001 From: m2049r Date: Tue, 9 Oct 2018 19:33:29 +0200 Subject: [PATCH] remove settings & fix prio to default (#433) --- .../send/SendAddressWizardFragment.java | 3 + .../xmrwallet/fragment/send/SendFragment.java | 19 ++-- .../send/SendSettingsWizardFragment.java | 101 ------------------ app/src/main/res/layout/fragment_send.xml | 2 +- .../res/layout/fragment_send_settings.xml | 51 --------- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 21 files changed, 11 insertions(+), 181 deletions(-) delete mode 100644 app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java delete mode 100644 app/src/main/res/layout/fragment_send_settings.xml diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java index b4f76de..939f8be 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java @@ -39,6 +39,7 @@ import com.m2049r.xmrwallet.R; import com.m2049r.xmrwallet.data.BarcodeData; import com.m2049r.xmrwallet.data.TxData; import com.m2049r.xmrwallet.data.TxDataBtc; +import com.m2049r.xmrwallet.model.PendingTransaction; import com.m2049r.xmrwallet.model.Wallet; import com.m2049r.xmrwallet.util.BitcoinAddressValidator; import com.m2049r.xmrwallet.util.Helper; @@ -350,6 +351,8 @@ public class SendAddressWizardFragment extends SendWizardFragment { txData.setPaymentId(etPaymentId.getEditText().getText().toString()); } txData.setUserNotes(new UserNotes(etNotes.getEditText().getText().toString())); + txData.setPriority(PendingTransaction.Priority.Priority_Default); + txData.setMixin(SendFragment.MIXIN); } return true; } diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java index bdf13dd..d0930a5 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java @@ -58,11 +58,12 @@ import timber.log.Timber; public class SendFragment extends Fragment implements SendAddressWizardFragment.Listener, SendAmountWizardFragment.Listener, - SendSettingsWizardFragment.Listener, SendConfirmWizardFragment.Listener, SendSuccessWizardFragment.Listener, OnBackPressedListener, OnUriScannedListener { + final static public int MIXIN = 10; + private Listener activityCallback; public interface Listener { @@ -301,10 +302,9 @@ public class SendFragment extends Fragment public class SpendPagerAdapter extends FragmentStatePagerAdapter { private static final int POS_ADDRESS = 0; private static final int POS_AMOUNT = 1; - private static final int POS_SETTINGS = 2; - private static final int POS_CONFIRM = 3; - private static final int POS_SUCCESS = 4; - private int numPages = 4; + private static final int POS_CONFIRM = 2; + private static final int POS_SUCCESS = 3; + private int numPages = 3; SparseArray> myFragments = new SparseArray<>(); @@ -355,8 +355,6 @@ public class SendFragment extends Fragment return SendAddressWizardFragment.newInstance(SendFragment.this); case POS_AMOUNT: return SendAmountWizardFragment.newInstance(SendFragment.this); - case POS_SETTINGS: - return SendSettingsWizardFragment.newInstance(SendFragment.this); case POS_CONFIRM: return SendConfirmWizardFragment.newInstance(SendFragment.this); case POS_SUCCESS: @@ -370,8 +368,6 @@ public class SendFragment extends Fragment return SendAddressWizardFragment.newInstance(SendFragment.this); case POS_AMOUNT: return SendBtcAmountWizardFragment.newInstance(SendFragment.this); - case POS_SETTINGS: - return SendSettingsWizardFragment.newInstance(SendFragment.this); case POS_CONFIRM: return SendBtcConfirmWizardFragment.newInstance(SendFragment.this); case POS_SUCCESS: @@ -393,8 +389,6 @@ public class SendFragment extends Fragment return getString(R.string.send_address_title); case POS_AMOUNT: return getString(R.string.send_amount_title); - case POS_SETTINGS: - return getString(R.string.send_settings_title); case POS_CONFIRM: return getString(R.string.send_confirm_title); case POS_SUCCESS: @@ -407,7 +401,8 @@ public class SendFragment extends Fragment @Override public int getItemPosition(Object object) { Timber.d("getItemPosition %s", String.valueOf(object)); - if ((object instanceof SendAddressWizardFragment) || (object instanceof SendSettingsWizardFragment)) { + if (object instanceof SendAddressWizardFragment) { + // keep these pages return POSITION_UNCHANGED; } else { return POSITION_NONE; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java deleted file mode 100644 index 648d145..0000000 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2017 m2049r - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.m2049r.xmrwallet.fragment.send; - -import android.os.Bundle; -import android.text.InputType; -import android.view.KeyEvent; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.inputmethod.EditorInfo; -import android.widget.EditText; -import android.widget.Spinner; -import android.widget.TextView; - -import com.m2049r.xmrwallet.R; -import com.m2049r.xmrwallet.data.TxData; -import com.m2049r.xmrwallet.model.PendingTransaction; -import com.m2049r.xmrwallet.util.Helper; -import com.m2049r.xmrwallet.util.UserNotes; - -import timber.log.Timber; - -public class SendSettingsWizardFragment extends SendWizardFragment { - final static public int MIXIN = 10; - - public static SendSettingsWizardFragment newInstance(Listener listener) { - SendSettingsWizardFragment instance = new SendSettingsWizardFragment(); - instance.setSendListener(listener); - return instance; - } - - Listener sendListener; - - public SendSettingsWizardFragment setSendListener(Listener listener) { - this.sendListener = listener; - return this; - } - - interface Listener { - TxData getTxData(); - } - - final static PendingTransaction.Priority Priorities[] = - {PendingTransaction.Priority.Priority_Default, - PendingTransaction.Priority.Priority_Low, - PendingTransaction.Priority.Priority_Medium, - PendingTransaction.Priority.Priority_High}; // must match the layout XML - - private Spinner sPriority; - private EditText etDummy; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - - Timber.d("onCreateView() %s", (String.valueOf(savedInstanceState))); - - View view = inflater.inflate( - R.layout.fragment_send_settings, container, false); - - sPriority = (Spinner) view.findViewById(R.id.sPriority); - - etDummy = (EditText) view.findViewById(R.id.etDummy); - etDummy.setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS); - - return view; - } - - @Override - public boolean onValidateFields() { - if (sendListener != null) { - TxData txData = sendListener.getTxData(); - txData.setPriority(Priorities[sPriority.getSelectedItemPosition()]); - txData.setMixin(MIXIN); - } - return true; - } - - @Override - public void onResumeFragment() { - super.onResumeFragment(); - Timber.d("onResumeFragment()"); - Helper.hideKeyboard(getActivity()); - etDummy.requestFocus(); - } -} diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml index 810adc7..63748f6 100644 --- a/app/src/main/res/layout/fragment_send.xml +++ b/app/src/main/res/layout/fragment_send.xml @@ -53,7 +53,7 @@ app:activeDot="0" app:dotSize="12dp" app:inactiveColor="@color/dotGray" - app:numberDots="4" /> + app:numberDots="3" />