Skip to content

recompiled plug ins #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 30, 2022
Merged

recompiled plug ins #21

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bd4ce2c
Merge pull request #5 from cypherstack/staging
ryleedavis Aug 30, 2022
7b74c41
searched single base currency selection bugfix
julian-CStack Aug 30, 2022
e9b9847
Merge pull request #13 from cypherstack/ui-testing
julian-CStack Aug 30, 2022
5464db4
Merge pull request #15 from cypherstack/rylee-tmp
ryleedavis Aug 30, 2022
ff19207
Merge pull request #18 from cypherstack/main
ryleedavis Aug 30, 2022
9b55f03
Merge pull request #19 from cypherstack/staging
ryleedavis Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions lib/pages/settings_views/global_settings_view/currency_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
final _searchFocusNode = FocusNode();

void onTap(int index) {
if (index == 0 || current.isEmpty) {
if (currenciesWithoutSelected[index] == current || current.isEmpty) {
// ignore if already selected currency
return;
}
Expand Down Expand Up @@ -212,7 +212,7 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
"currencySelect_${currenciesWithoutSelected[index]}"),
child: RoundedContainer(
padding: const EdgeInsets.all(0),
color: index == 0
color: currenciesWithoutSelected[index] == current
? CFColors.selected
: CFColors.white,
child: RawMaterialButton(
Expand All @@ -238,7 +238,9 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
value: true,
groupValue: index == 0,
groupValue: currenciesWithoutSelected[
index] ==
current,
onChanged: (_) {
onTap(index);
},
Expand All @@ -253,7 +255,9 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
children: [
Text(
currenciesWithoutSelected[index],
key: (index == 0)
key: (currenciesWithoutSelected[
index] ==
current)
? const Key(
"selectedCurrencySettingsCurrencyText")
: null,
Expand All @@ -269,7 +273,9 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
currenciesWithoutSelected[
index]] ??
"",
key: (index == 0)
key: (currenciesWithoutSelected[
index] ==
current)
? const Key(
"selectedCurrencySettingsCurrencyTextDescription")
: null,
Expand Down