Skip to content

Commit 989d52b

Browse files
m2049rm2049r
authored
Option to remember and reuse selected fiat (#967)
1 parent a3c0ca7 commit 989d52b

File tree

7 files changed

+83
-10
lines changed

7 files changed

+83
-10
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
compileSdk 35
99
minSdkVersion 21
1010
targetSdkVersion 35
11-
versionCode 4104
12-
versionName "4.1.4 'Exolix'"
11+
versionCode 4105
12+
versionName "4.1.5 'Exolix'"
1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
externalNativeBuild {
1515
cmake {

‎app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
5252
import com.m2049r.xmrwallet.util.Helper;
5353
import com.m2049r.xmrwallet.util.ServiceHelper;
54+
import com.m2049r.xmrwallet.util.StickyFiatHelper;
5455
import com.m2049r.xmrwallet.util.ThemeHelper;
5556
import com.m2049r.xmrwallet.widget.Toolbar;
5657

@@ -131,6 +132,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
131132
ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(requireContext(), R.layout.item_spinner_balance, currencies);
132133
spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
133134
sCurrency.setAdapter(spinnerAdapter);
135+
StickyFiatHelper.setPreferredCurrencyPosition(sCurrency);
134136

135137
bSend = view.findViewById(R.id.bSend);
136138
bReceive = view.findViewById(R.id.bReceive);
@@ -182,6 +184,7 @@ public void onDismissedBySwipeRight(RecyclerView recyclerView, int[] reverseSort
182184
sCurrency.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
183185
@Override
184186
public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
187+
StickyFiatHelper.setPreferredFiatSymbol(requireContext(), (String) sCurrency.getSelectedItem());
185188
refreshBalance();
186189
}
187190

@@ -315,13 +318,7 @@ public void exchange(final ExchangeRate exchangeRate) {
315318
balanceCurrency = Helper.BASE_CRYPTO;
316319
balanceRate = 1.0;
317320
} else {
318-
int spinnerPosition = ((ArrayAdapter) sCurrency.getAdapter()).getPosition(exchangeRate.getQuoteCurrency());
319-
if (spinnerPosition < 0) { // requested currency not in list
320-
Timber.e("Requested currency not in list %s", exchangeRate.getQuoteCurrency());
321-
sCurrency.setSelection(0, true);
322-
} else {
323-
sCurrency.setSelection(spinnerPosition, true);
324-
}
321+
StickyFiatHelper.setCurrencyPosition(sCurrency, exchangeRate.getQuoteCurrency());
325322
balanceCurrency = exchangeRate.getQuoteCurrency();
326323
balanceRate = exchangeRate.getRate();
327324
}

‎app/src/main/java/com/m2049r/xmrwallet/util/StickyFiatHelper.java‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/*
2+
* Copyright (c) 2024 m2049r
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.m2049r.xmrwallet.util;
18+
19+
import android.content.Context;
20+
import android.widget.ArrayAdapter;
21+
import android.widget.Spinner;
22+
23+
import androidx.preference.PreferenceManager;
24+
25+
import com.m2049r.xmrwallet.R;
26+
27+
public class StickyFiatHelper {
28+
29+
public static String getPreferredFiatSymbol(Context ctx) {
30+
if (PreferenceManager.getDefaultSharedPreferences(ctx)
31+
.getBoolean(ctx.getString(R.string.preferred_stickyfiat), false)) {
32+
return PreferenceManager.getDefaultSharedPreferences(ctx)
33+
.getString(ctx.getString(R.string.preferred_stickyfiat_pref), Helper.BASE_CRYPTO);
34+
}
35+
return null;
36+
}
37+
38+
public static void setPreferredFiatSymbol(Context ctx, String symbol) {
39+
if (PreferenceManager.getDefaultSharedPreferences(ctx)
40+
.getBoolean(ctx.getString(R.string.preferred_stickyfiat), false)) {
41+
PreferenceManager.getDefaultSharedPreferences(ctx).edit()
42+
.putString(ctx.getString(R.string.preferred_stickyfiat_pref), symbol).apply();
43+
}
44+
}
45+
46+
47+
public static void setPreferredCurrencyPosition(Spinner spinner) {
48+
String stickyFiat = StickyFiatHelper.getPreferredFiatSymbol(spinner.getContext());
49+
if (stickyFiat != null) {
50+
StickyFiatHelper.setCurrencyPosition(spinner, stickyFiat);
51+
}
52+
}
53+
54+
public static void setCurrencyPosition(Spinner spinner, String symbol) {
55+
int spinnerPosition = ((ArrayAdapter) spinner.getAdapter()).getPosition(symbol);
56+
if (spinnerPosition < 0) { // requested currency not in list
57+
spinner.setSelection(0, true);
58+
} else {
59+
spinner.setSelection(spinnerPosition, true);
60+
}
61+
}
62+
}

‎app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeEditText.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
4242
import com.m2049r.xmrwallet.util.Helper;
4343
import com.m2049r.xmrwallet.util.ServiceHelper;
44+
import com.m2049r.xmrwallet.util.StickyFiatHelper;
4445
import com.m2049r.xmrwallet.util.ThemeHelper;
4546

4647
import java.util.ArrayList;
@@ -181,7 +182,8 @@ protected void setCurrencyAdapter(Spinner spinner, List<String> currencies) {
181182
}
182183

183184
void setInitialSpinnerSelections(Spinner baseSpinner, Spinner quoteSpinner) {
184-
baseSpinner.setSelection(0, true);
185+
//baseSpinner.setSelection(0, true);
186+
StickyFiatHelper.setPreferredCurrencyPosition(baseSpinner);
185187
quoteSpinner.setSelection(0, true);
186188
}
187189

‎app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
4545
import com.m2049r.xmrwallet.util.Helper;
4646
import com.m2049r.xmrwallet.util.ServiceHelper;
47+
import com.m2049r.xmrwallet.util.StickyFiatHelper;
4748
import com.m2049r.xmrwallet.util.ThemeHelper;
4849

4950
import java.util.ArrayList;
@@ -174,6 +175,7 @@ protected void onFinishInflate() {
174175
pbExchange = findViewById(R.id.pbExchange);
175176

176177
setCurrencyAdapter(sCurrencyA);
178+
StickyFiatHelper.setPreferredCurrencyPosition(sCurrencyA);
177179
setCurrencyAdapter(sCurrencyB);
178180

179181
// make progress circle gray

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@
461461
<string name="preferred_nightmode" translatable="false">preferred_nightmode</string>
462462
<string name="preferred_locale" translatable="false">preferred_locale</string>
463463
<string name="preferred_lock" translatable="false">preferred_lock</string>
464+
<string name="preferred_stickyfiat" translatable="false">preferred_stickyfiat</string>
464465
<string name="about_info" translatable="false">about_info</string>
465466
<string name="privacy_info" translatable="false">privacy_info</string>
466467
<string name="credits_info" translatable="false">credits_info</string>
@@ -510,4 +511,8 @@
510511
<string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
511512
<string name="fab_restore_sidekick">Restore from Sidekick</string>
512513
<string name="sidekick_connected">Sidekick Connected</string>
514+
515+
<string name="setting_stickyfiat">Sticky Fiat</string>
516+
<string name="setting_stickyfiat_summary">Remember last used fiat currency</string>
517+
<string name="preferred_stickyfiat_pref" translatable="false">preferred_stickyfiat_pref</string>
513518
</resources>

‎app/src/main/res/xml/root_preferences.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
android:defaultValue="false"
2525
android:key="@string/preferred_lock"
2626
android:title="@string/setting_lock" />
27+
<SwitchPreference
28+
android:defaultValue="false"
29+
android:key="@string/preferred_stickyfiat"
30+
android:summary="@string/setting_stickyfiat_summary"
31+
android:title="@string/setting_stickyfiat" />
2732
</PreferenceCategory>
2833
<PreferenceCategory app:title="@string/title_info">
2934
<Preference

0 commit comments

Comments
 (0)