Skip to content

feat(deriv_auth)!: [TRHM-855] Add ability to support feature flag toggles by passing their widgets #770

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

Draft
zohreh-deriv wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

feat(deriv_auth)!: [TRHM-855] Add ability to support feature flag toggles by passing their widgets #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb5c847
feat: add ability to support feature flag toggles by passing their wi…
zohreh-deriv Aug 13, 2024
79e7544
chore: add key
zohreh-deriv Aug 13, 2024
dccc749
Merge remote-tracking branch 'upstream/master' into add_settings_page…
zohreh-deriv Aug 13, 2024
f4ca00d
Merge remote-tracking branch 'upstream/master' into add_settings_page…
zohreh-deriv Aug 13, 2024
bf01394
fix: env toggle condition and add some vertical space to the widgets
zohreh-deriv Aug 14, 2024
dad379b
style: ui improvement
zohreh-deriv Aug 14, 2024
164a7d8
feat: add feature flag configs to setting page model
zohreh-deriv Aug 14, 2024
df2cbac
merge master to add_settings_page_config_property
zohreh-deriv Oct 3, 2024
d5d9ff0
refactor: pass a widget to show feature flag inside settings page
zohreh-deriv Oct 3, 2024
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
118 changes: 78 additions & 40 deletions packages/deriv_auth/lib/features/setting_page/presentation/layouts/deriv_setting_layout.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class DerivSettingLayout extends StatefulWidget {
this.stagingApp = 'com.deriv.app.staging',
this.getAppEnv,
this.setAppEnv,
this.features,
Key? key,
}) : super(key: key);

Expand Down Expand Up @@ -53,6 +54,9 @@ class DerivSettingLayout extends StatefulWidget {
/// Sets environment variable
final Future<void> Function({required bool value})? setAppEnv;

/// Feature flag widget that should be listed in the setting page.
final Widget? features;

@override
_SettingsPageState createState() => _SettingsPageState();
}
Expand All @@ -74,7 +78,37 @@ class _SettingsPageState extends State<DerivSettingLayout> {
}

@override
Widget build(BuildContext context) => WillPopScope(
Widget build(BuildContext context) => widget.features != null
? WillPopScope(
onWillPop: () async {
final String endpoint = _endpointController.text.isNotEmpty
? _endpointController.text
: defaultEndpoint;
final String appId = _appIdController.text.isNotEmpty
? _appIdController.text
: defaultAppId;
await Future.wait(<Future<void>>[
await widget.saveValues(endpoint: endpoint, appId: appId),
await widget.updateFlavorConfigs(
endpoint: endpoint, appId: appId),
]);
return true;
},
child: Scaffold(
key: const ValueKey<String>('app_settings_page'),
appBar: AppBar(
elevation: ThemeProvider.zeroMargin,
title: Text(widget.appLabel),
leading: const BackButton(
key: ValueKey<String>('app_settings_page_back_button'),
),
),
body: widget.features,
),
)
: _buildBasicAppSettings();

Widget _buildBasicAppSettings() => WillPopScope(
onWillPop: () async {
final String endpoint = _endpointController.text.isNotEmpty
? _endpointController.text
Expand All @@ -92,6 +126,7 @@ class _SettingsPageState extends State<DerivSettingLayout> {
return true;
},
child: Scaffold(
key: const ValueKey<String>('app_settings_page'),
appBar: AppBar(
elevation: ThemeProvider.zeroMargin,
title: Text(widget.appLabel),
Expand All @@ -102,9 +137,9 @@ class _SettingsPageState extends State<DerivSettingLayout> {
children: <Widget>[
_title,
const SizedBox(height: ThemeProvider.margin16),
_endpoint,
_endpointTextInput,
const SizedBox(height: ThemeProvider.margin16),
_appId,
_appIdTextInput,
const SizedBox(width: ThemeProvider.margin08),
_buildEnvironmentSwitcher,
],
Expand All @@ -113,41 +148,44 @@ class _SettingsPageState extends State<DerivSettingLayout> {
),
);

Widget get _buildEnvironmentSwitcher => FutureBuilder<PackageInfo>(
future: packageInfo,
builder: (BuildContext context, AsyncSnapshot<PackageInfo> snapshot) {
if (snapshot.hasData &&
(snapshot.data?.packageName == widget.devApp ||
snapshot.data?.packageName == widget.stagingApp)) {
return Padding(
padding:
const EdgeInsets.symmetric(horizontal: ThemeProvider.margin16),
child: Row(
children: <Widget>[
const Text('Production environment'),
const SizedBox(width: ThemeProvider.margin08),
FutureBuilder<bool>(
future: widget.getAppEnv,
builder:
(BuildContext context, AsyncSnapshot<bool?> snapshot) {
if (snapshot.hasData && widget.setAppEnv != null) {
return Switch(
value: snapshot.data ?? false,
onChanged: (bool val) {
setState(() {
widget.setAppEnv!(value: val);
});
},
);
}
return const SizedBox.shrink();
})
],
),
);
}
return const SizedBox.shrink();
});
Widget get _buildEnvironmentSwitcher => widget.setAppEnv != null &&
widget.getAppEnv != null
? FutureBuilder<PackageInfo>(
future: packageInfo,
builder: (BuildContext context, AsyncSnapshot<PackageInfo> snapshot) {
if (snapshot.hasData &&
(snapshot.data?.packageName == widget.devApp ||
snapshot.data?.packageName == widget.stagingApp)) {
return Padding(
padding: const EdgeInsets.symmetric(
horizontal: ThemeProvider.margin16),
child: Row(
children: <Widget>[
const Text('Production environment'),
const SizedBox(width: ThemeProvider.margin08),
FutureBuilder<bool>(
future: widget.getAppEnv,
builder: (BuildContext context,
AsyncSnapshot<bool?> snapshot) {
if (snapshot.hasData) {
return Switch(
value: snapshot.data ?? false,
onChanged: (bool val) {
setState(() {
widget.setAppEnv!(value: val);
});
},
);
}
return const SizedBox.shrink();
})
],
),
);
}
return const SizedBox.shrink();
})
: const SizedBox.shrink();

Widget get _title => Padding(
padding: const EdgeInsets.only(
Expand All @@ -163,7 +201,7 @@ class _SettingsPageState extends State<DerivSettingLayout> {
),
);

Widget get _endpoint => _buildTextInputField(
Widget get _endpointTextInput => _buildTextInputField(
label: context.derivAuthLocalization.labelEndpoint,
semantic: context.derivAuthLocalization.semanticEndpoint,
controller: _endpointController,
Expand All @@ -172,7 +210,7 @@ class _SettingsPageState extends State<DerivSettingLayout> {
: context.derivAuthLocalization.warnInvalidEndpoint,
);

Widget get _appId => _buildTextInputField(
Widget get _appIdTextInput => _buildTextInputField(
label: context.derivAuthLocalization.labelApplicationID,
semantic: context.derivAuthLocalization.semanticApplicationID,
controller: _appIdController,
Expand Down
12 changes: 12 additions & 0 deletions packages/deriv_auth/lib/features/single_entry/core/models/setting_page_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ class SettingPageModel {
required this.saveValues,
required this.updateFlavorConfigs,
this.settingsPageNavigation,
this.getAppEnv,
this.setAppEnv,
this.features,
});

/// Setting page App label
Expand All @@ -30,4 +33,13 @@ class SettingPageModel {

/// Settings page navigation
final Function(BuildContext context)? settingsPageNavigation;

/// Gets environment variable
final Future<bool>? getAppEnv;

/// Sets environment variable
final Future<void> Function({required bool value})? setAppEnv;

/// Feature flag widget that should be listed in the setting page.
final Widget? features;
}
3 changes: 3 additions & 0 deletions packages/deriv_auth/lib/features/single_entry/features/settings/pages/settings_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ class _SettingsPageState extends State<SettingsPage> {
saveValues: AuthData().data.settingPageModel.saveValues,
appId: AuthData().data.settingPageModel.appId.call(),
endpoint: AuthData().data.settingPageModel.endpoint.call(),
features: AuthData().data.settingPageModel.features,
setAppEnv: AuthData().data.settingPageModel.setAppEnv,
getAppEnv: AuthData().data.settingPageModel.getAppEnv,
);
}