Skip to content

Commit 4bb226b

Browse files
committed
fix: use correct familiarity flag
1 parent 70981e8 commit 4bb226b

3 files changed

Lines changed: 24 additions & 44 deletions

File tree

lib/pages/settings_views/global_settings_view/global_settings_view.dart

Lines changed: 19 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
import 'dart:io';
1212

1313
import 'package:flutter/material.dart';
14-
import 'package:flutter_riverpod/flutter_riverpod.dart';
1514

1615
import '../../../app_config.dart';
17-
import '../../../providers/providers.dart';
1816
import '../../../route_generator.dart';
1917
import '../../../themes/stack_colors.dart';
2018
import '../../../utilities/assets.dart';
19+
import '../../../utilities/constants.dart';
2120
import '../../../utilities/text_styles.dart';
2221
import '../../../widgets/background.dart';
2322
import '../../../widgets/custom_buttons/app_bar_icon_button.dart';
@@ -247,36 +246,24 @@ class GlobalSettingsView extends StatelessWidget {
247246
);
248247
},
249248
),
250-
if (AppConfig.hasFeature(
251-
AppFeature.shopinBit,
252-
))
253-
Consumer(
254-
builder: (_, ref, __) {
255-
final familiarity = ref.watch(
256-
prefsChangeNotifierProvider.select(
257-
(v) => v.familiarity,
258-
),
259-
);
260-
if (familiarity < 6) {
261-
return const SizedBox.shrink();
262-
}
263-
return Column(
264-
children: [
265-
const SizedBox(height: 8),
266-
SettingsListButton(
267-
iconAssetName: Assets.svg.key,
268-
iconSize: 16,
269-
title: "ShopinBit",
270-
onPressed: () {
271-
Navigator.of(context).pushNamed(
272-
ShopInBitSettingsView
273-
.routeName,
274-
);
275-
},
276-
),
277-
],
278-
);
279-
},
249+
if (Constants.enableExchange &&
250+
AppConfig.hasFeature(
251+
AppFeature.shopinBit,
252+
))
253+
Column(
254+
children: [
255+
const SizedBox(height: 8),
256+
SettingsListButton(
257+
iconAssetName: Assets.svg.key,
258+
iconSize: 16,
259+
title: "ShopinBit",
260+
onPressed: () {
261+
Navigator.of(context).pushNamed(
262+
ShopInBitSettingsView.routeName,
263+
);
264+
},
265+
),
266+
],
280267
),
281268
const SizedBox(height: 8),
282269
SettingsListButton(

lib/pages_desktop_specific/settings/desktop_settings_view.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
1313

1414
import '../../app_config.dart';
1515
import '../../pages/shopinbit/shopinbit_settings_view.dart';
16-
import '../../providers/providers.dart';
1716
import '../../route_generator.dart';
1817
import '../../themes/stack_colors.dart';
18+
import '../../utilities/constants.dart';
1919
import '../../utilities/text_styles.dart';
2020
import '../../widgets/desktop/desktop_app_bar.dart';
2121
import '../../widgets/desktop/desktop_scaffold.dart';
@@ -43,10 +43,6 @@ class DesktopSettingsView extends ConsumerStatefulWidget {
4343
class _DesktopSettingsViewState extends ConsumerState<DesktopSettingsView> {
4444
@override
4545
Widget build(BuildContext context) {
46-
final familiarity = ref.watch(
47-
prefsChangeNotifierProvider.select((v) => v.familiarity),
48-
);
49-
5046
final List<Widget> contentViews = [
5147
const Navigator(
5248
key: Key("settingsBackupRestoreDesktopKey"),
@@ -94,7 +90,7 @@ class _DesktopSettingsViewState extends ConsumerState<DesktopSettingsView> {
9490
onGenerateRoute: RouteGenerator.generateRoute,
9591
initialRoute: AdvancedSettings.routeName,
9692
), //advanced
97-
if (AppConfig.hasFeature(.shopinBit) && familiarity >= 6)
93+
if (Constants.enableExchange && AppConfig.hasFeature(.shopinBit))
9894
const Navigator(
9995
key: Key("settingsShopInBitDesktopKey"),
10096
onGenerateRoute: RouteGenerator.generateRoute,

lib/pages_desktop_specific/settings/settings_menu.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
1313
import 'package:flutter_svg/svg.dart';
1414

1515
import '../../app_config.dart';
16-
import '../../providers/providers.dart';
1716
import '../../themes/stack_colors.dart';
1817
import '../../utilities/assets.dart';
18+
import '../../utilities/constants.dart';
1919
import 'settings_menu_item.dart';
2020

2121
final selectedSettingsMenuItemStateProvider = StateProvider<int>((_) => 0);
@@ -32,10 +32,6 @@ class _SettingsMenuState extends ConsumerState<SettingsMenu> {
3232
Widget build(BuildContext context) {
3333
debugPrint("BUILD: $runtimeType");
3434

35-
final familiarity = ref.watch(
36-
prefsChangeNotifierProvider.select((v) => v.familiarity),
37-
);
38-
3935
final List<String> labels = [
4036
"Backup and restore",
4137
"Security",
@@ -46,7 +42,8 @@ class _SettingsMenuState extends ConsumerState<SettingsMenu> {
4642
"Syncing preferences",
4743
if (AppConfig.hasFeature(AppFeature.themeSelection)) "Appearance",
4844
"Advanced",
49-
if (AppConfig.hasFeature(.shopinBit) && familiarity >= 6) "ShopinBit",
45+
if (Constants.enableExchange && AppConfig.hasFeature(.shopinBit))
46+
"ShopinBit",
5047
];
5148

5249
return Column(

0 commit comments

Comments
 (0)