diff --git a/lib/about.dart b/lib/about.dart index e2900b8..1643766 100644 --- a/lib/about.dart +++ b/lib/about.dart @@ -179,17 +179,19 @@ class About extends StatelessWidget { ), ]; - Column _buildLogoTextColumn( + Widget _buildLogoTextColumn( BuildContext ctx, TextTheme textTheme, ) => - Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, - mainAxisSize: MainAxisSize.max, - children: Intro.buildWelcomeTextList( - AppLocalizations.of(ctx), - Theme.of(ctx), - autoSize: false, + SingleChildScrollView( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisSize: MainAxisSize.max, + children: Intro.buildWelcomeTextList( + AppLocalizations.of(ctx), + Theme.of(ctx), + autoSize: false, + ), ), ); diff --git a/lib/intro.dart b/lib/intro.dart index 37209fb..aee1224 100644 --- a/lib/intro.dart +++ b/lib/intro.dart @@ -1,4 +1,5 @@ import 'package:auto_size_text/auto_size_text.dart'; +import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:intro_views_flutter/Models/page_view_model.dart'; @@ -51,29 +52,25 @@ class Intro extends StatelessWidget { static List buildWelcomeTextList( AppLocalizations localizations, ThemeData theme, { - bool showInitialSetup = false, bool autoSize = true, }) => - (showInitialSetup - ? [AutoSizeText(localizations.introWelcomeInitialSetup)] - : []) - ..addAll([ - AutoSizeText( - localizations.introWelcomeDescription, - minFontSize: autoSize ? 12 : 25, + [ + AutoSizeText( + localizations.introWelcomeDescription, + minFontSize: autoSize ? 12 : 25, + textAlign: TextAlign.center, + ), + InkWell( + child: AutoSizeText( + localizations.introWelcomeSupportBy, + style: theme.textTheme.caption, + maxFontSize: 20, + minFontSize: autoSize ? 12 : 20, textAlign: TextAlign.center, ), - InkWell( - child: AutoSizeText( - localizations.introWelcomeSupportBy, - style: theme.textTheme.caption, - maxFontSize: 20, - minFontSize: autoSize ? 12 : 20, - textAlign: TextAlign.center, - ), - onTap: () => About.openUrl('https://vk.com/profcomniu_online'), - ), - ]); + onTap: () => About.openUrl('https://vk.com/profcomniu_online'), + ), + ]; PageViewModel _buildWelcome() => PageViewModel( pageColor: Colors.black, @@ -81,12 +78,21 @@ class Intro extends StatelessWidget { Icons.school, color: Colors.black, ), - body: Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: buildWelcomeTextList( - localizations, - theme, - showInitialSetup: true, + body: SingleChildScrollView( + child: AutoSizeText.rich( + TextSpan( + text: localizations.introWelcomeDescription + '\n', + children: [ + TextSpan( + text: localizations.introWelcomeSupportBy, + style: theme.textTheme.caption, + recognizer: TapGestureRecognizer() + ..onTap = + () => About.openUrl('https://vk.com/profcomniu_online'), + ), + ], + ), + textAlign: TextAlign.center, ), ), title: _buildTitleText(localizations.introWelcomeTitle), diff --git a/pubspec.yaml b/pubspec.yaml index c9f2412..4dd48f2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: ranepa_timetable description: Custom RANEPA android client on Flutter. -version: 1.5+9 +version: 1.5.1+10 environment: sdk: ">=2.1.0 <3.0.0"