Skip to content

Commit

Permalink
PLAYGROUND: Fix Platform Adaptive ink selection order and spelling in…
Browse files Browse the repository at this point in the history
… info.
  • Loading branch information
rydmike committed Jul 21, 2023
1 parent b0f337a commit 9a0b597
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy_playground.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Controversial but pub.dev penalizes you if dart format is not used.
# - Run all tests with coverage.
# - Upload code coverage output to Codecov for analysis.
# - Build 5 different WEB example apps using FlexColorScheme.
# - Build Playground only
# All examples use these steps:
# - Flutter clean.
# - Flutter build web app, in release mode and with html renderer.
Expand All @@ -26,14 +26,14 @@ on:
- "**.md"
jobs:
flutter_tests:
name: "Analyze and test package, then build and deploy 5 web apps"
name: "Analyze and test package, then build and deploy Playground only"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Flutter and Dart SDK
uses: subosito/flutter-action@v2
with:
channel: "beta"
channel: "stable"
- name: "Show Dart SDK version"
run: dart --version
- name: "Show Flutter SDK version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,29 +78,12 @@ class AdaptiveThemeSettings extends StatelessWidget {
}
: null,
),
AdaptiveThemePopupMenu(
title: const Text('Use platform adaptive ink splash'),
subtitle: const Text(
'An adaptive theme response used to select a different ink '
'splash effect on selected platforms.\n',
),
index: controller.adaptiveSplash?.index ?? -1,
onChanged: controller.useFlexColorScheme && controller.useSubThemes
? (int index) {
if (index < 0 || index >= AdaptiveTheme.values.length) {
controller.setAdaptiveSplash(null);
} else {
controller.setAdaptiveSplash(AdaptiveTheme.values[index]);
}
}
: null,
),
SplashTypePopupMenu(
title: const Text('Adaptive ink splash effect'),
subtitle: const Text(
'Defines the type of tap ink splash effect used on Material '
'UI components when running on below selected platforms. When not '
'on running on these platforms or the if the platform adaptive ink '
'running on these platforms or if the platform adaptive ink '
'feature is OFF, the ink splash effect above is used.\n',
),
index: controller.splashTypeAdaptive?.index ?? -1,
Expand All @@ -118,6 +101,23 @@ class AdaptiveThemeSettings extends StatelessWidget {
}
: null,
),
AdaptiveThemePopupMenu(
title: const Text('Use platform adaptive ink splash'),
subtitle: const Text(
'An adaptive theme response used to select a different ink '
'splash effect on selected platforms.\n',
),
index: controller.adaptiveSplash?.index ?? -1,
onChanged: controller.useFlexColorScheme && controller.useSubThemes
? (int index) {
if (index < 0 || index >= AdaptiveTheme.values.length) {
controller.setAdaptiveSplash(null);
} else {
controller.setAdaptiveSplash(AdaptiveTheme.values[index]);
}
}
: null,
),
const Divider(),
if (isLight) ...<Widget>[
AdaptiveThemePopupMenu(
Expand Down Expand Up @@ -237,9 +237,9 @@ class AdaptiveThemeSettings extends StatelessWidget {
BackToActualPlatform(controller: controller),
const Divider(),
const ListTile(
title: Text('You can find additional platform adaptive '
'settings under Shape Radius, AppBar, NavigationBar '
'and Dialogs'))
subtitle: Text('You can find additional platform adaptive '
'settings under Shape & Radius, AppBar, NavigationBar '
'and Dialogs.'))
],
);
}
Expand Down
2 changes: 1 addition & 1 deletion example/lib/shared/const/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class App {
static const String versionMajor = '7';
static const String versionMinor = '2';
static const String versionPatch = '0';
static const String versionBuild = '01';
static const String versionBuild = '02';
static const String version = '$versionMajor.$versionMinor.$versionPatch '
'\nBuild-$versionBuild';
static const String packageVersion =
Expand Down

0 comments on commit 9a0b597

Please sign in to comment.