github/xmrwallet
1
Fork 0
mirror of https://github.com/m2049r/xmrwallet synced 2025-05-02 10:44:28 +02:00
Code Releases Activity

remove mixin settings ()

Browse Source
This commit is contained in:
m2049r 2018-06-17 13:22:29 +02:00 committed by GitHub
parent 817816cd34
commit 008f06959c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 23 deletions
app/src/main
java/com/m2049r/xmrwallet/fragment/send
SendSettingsWizardFragment.java
res
layout
fragment_send_settings.xml
values
strings.xml

7
app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java

@ -36,6 +36,7 @@ import com.m2049r.xmrwallet.util.UserNotes;
import timber.log.Timber; import timber.log.Timber;
public class SendSettingsWizardFragment extends SendWizardFragment { public class SendSettingsWizardFragment extends SendWizardFragment {
final static public int MIXIN = 6;
public static SendSettingsWizardFragment newInstance(Listener listener) { public static SendSettingsWizardFragment newInstance(Listener listener) {
SendSettingsWizardFragment instance = new SendSettingsWizardFragment(); SendSettingsWizardFragment instance = new SendSettingsWizardFragment();
@ -54,15 +55,12 @@ public class SendSettingsWizardFragment extends SendWizardFragment {
TxData getTxData(); TxData getTxData();
} }
// Mixin = Ringsize - 1
final static int Mixins[] = {6, 9, 12, 25}; // must match the layout XML / "@array/mixin"
final static PendingTransaction.Priority Priorities[] = final static PendingTransaction.Priority Priorities[] =
{PendingTransaction.Priority.Priority_Default, {PendingTransaction.Priority.Priority_Default,
PendingTransaction.Priority.Priority_Low, PendingTransaction.Priority.Priority_Low,
PendingTransaction.Priority.Priority_Medium, PendingTransaction.Priority.Priority_Medium,
PendingTransaction.Priority.Priority_High}; // must match the layout XML PendingTransaction.Priority.Priority_High}; // must match the layout XML
private Spinner sMixin;
private Spinner sPriority; private Spinner sPriority;
private EditText etNotes; private EditText etNotes;
private EditText etDummy; private EditText etDummy;
@ -77,7 +75,6 @@ public class SendSettingsWizardFragment extends SendWizardFragment {
View view = inflater.inflate( View view = inflater.inflate(
R.layout.fragment_send_settings, container, false); R.layout.fragment_send_settings, container, false);
sMixin = (Spinner) view.findViewById(R.id.sMixin);
sPriority = (Spinner) view.findViewById(R.id.sPriority); sPriority = (Spinner) view.findViewById(R.id.sPriority);
etNotes = (EditText) view.findViewById(R.id.etNotes); etNotes = (EditText) view.findViewById(R.id.etNotes);
@ -104,7 +101,7 @@ public class SendSettingsWizardFragment extends SendWizardFragment {
if (sendListener != null) { if (sendListener != null) {
TxData txData = sendListener.getTxData(); TxData txData = sendListener.getTxData();
txData.setPriority(Priorities[sPriority.getSelectedItemPosition()]); txData.setPriority(Priorities[sPriority.getSelectedItemPosition()]);
txData.setMixin(Mixins[sMixin.getSelectedItemPosition()]); txData.setMixin(MIXIN);
txData.setUserNotes(new UserNotes(etNotes.getText().toString())); txData.setUserNotes(new UserNotes(etNotes.getText().toString()));
} }
return true; return true;

12
app/src/main/res/layout/fragment_send_settings.xml

@ -27,20 +27,10 @@
android:text="@string/label_send_settings_advanced" android:text="@string/label_send_settings_advanced"
android:textAlignment="textEnd" /> android:textAlignment="textEnd" />
<Spinner
android:id="@+id/sMixin"
style="@style/MoneroSpinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:entries="@array/mixin"
android:textAlignment="center" />
<Spinner <Spinner
android:id="@+id/sPriority" android:id="@+id/sPriority"
style="@style/MoneroSpinner" style="@style/MoneroSpinner"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:entries="@array/priority" android:entries="@array/priority"

7
app/src/main/res/values/strings.xml

@ -311,13 +311,6 @@
<string name="archive_alert_yes">Yes, do that!</string> <string name="archive_alert_yes">Yes, do that!</string>
<string name="archive_alert_no">No thanks!</string> <string name="archive_alert_no">No thanks!</string>
<string-array name="mixin" translatable="false">
<item>Ringsize 7</item>
<item>Ringsize 10</item>
<item>Ringsize 13</item>
<item>Ringsize 26</item>
</string-array>
<string-array name="priority"> <string-array name="priority">
<item>Priority Default</item> <item>Priority Default</item>
<item>Priority Low</item> <item>Priority Low</item>