From a4a9d3e565d209301812a55f0d7948323e97e41d Mon Sep 17 00:00:00 2001 From: OkaykOrhmn Date: Thu, 26 Sep 2024 08:30:31 +0330 Subject: [PATCH] riz fix --- lib/views/ai/ai.dart | 202 +++++++++++++++++---------------- lib/views/profile/profile.dart | 2 +- pubspec.yaml | 2 +- 3 files changed, 105 insertions(+), 101 deletions(-) diff --git a/lib/views/ai/ai.dart b/lib/views/ai/ai.dart index 861a1f8..44491ba 100644 --- a/lib/views/ai/ai.dart +++ b/lib/views/ai/ai.dart @@ -56,13 +56,13 @@ class _AiState extends State { ); } final bot = state.bot!; - return Column( - mainAxisAlignment: MainAxisAlignment.end, + return Stack( children: [ - Expanded( - child: Stack( - children: [ - SingleChildScrollView( + Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Expanded( + child: SingleChildScrollView( child: Padding( padding: const EdgeInsets.only(bottom: 24), child: Column( @@ -162,103 +162,107 @@ class _AiState extends State { ), ), ), - Positioned( - top: 32, - right: 0, - child: InkWell( - onTap: () => homeScaffKey.currentState!.openDrawer(), - child: Container( - width: 46, - height: 46, - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surface, - borderRadius: const BorderRadius.only( - topLeft: Radius.circular(12), - bottomLeft: Radius.circular(12)), - boxShadow: DesignConfig.defaultShadow), - child: Icon( - DidvanIcons.angle_left_light, - color: Theme.of(context).colorScheme.title, - ), - )), - ) - ], - ), - ), - Padding( - padding: const EdgeInsets.fromLTRB(20, 0, 20, 32), - child: InkWell( - onTap: () => Navigator.of(context).pushNamed(Routes.aiChat, - arguments: AiChatArgs( - bot: bot, - )), - child: Row( - children: [ - Expanded( - child: Container( - decoration: BoxDecoration( - boxShadow: DesignConfig.defaultShadow, - color: Theme.of(context).colorScheme.surface, - border: Border.all( - color: Theme.of(context).colorScheme.border), - borderRadius: DesignConfig.highBorderRadius), - child: Row( - children: [ - const SizedBox( - width: 8, - ), - Expanded( - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 8.0, - ), - child: Form( - child: Row( - children: [ - const MessageBarBtn( - enable: false, - icon: DidvanIcons.mic_regular), - const SizedBox( - width: 8, + ), + Padding( + padding: const EdgeInsets.fromLTRB(20, 0, 20, 32), + child: InkWell( + onTap: () => + Navigator.of(context).pushNamed(Routes.aiChat, + arguments: AiChatArgs( + bot: bot, + )), + child: Row( + children: [ + Expanded( + child: Container( + decoration: BoxDecoration( + boxShadow: DesignConfig.defaultShadow, + color: Theme.of(context).colorScheme.surface, + border: Border.all( + color: + Theme.of(context).colorScheme.border), + borderRadius: DesignConfig.highBorderRadius), + child: Row( + children: [ + const SizedBox( + width: 8, + ), + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 8.0, ), - Expanded( - child: TextFormField( - textInputAction: - TextInputAction.newline, - style: Theme.of(context) - .textTheme - .bodyMedium, - minLines: 1, - enabled: false, - decoration: InputDecoration( - border: InputBorder.none, - hintText: 'بنویسید...', - hintStyle: Theme.of(context) - .textTheme - .bodySmall! - .copyWith( - color: Theme.of(context) - .colorScheme - .disabledText), + child: Form( + child: Row( + children: [ + const MessageBarBtn( + enable: false, + icon: + DidvanIcons.mic_regular), + const SizedBox( + width: 8, ), - ), - ), - ], - )))) - ], + Expanded( + child: TextFormField( + textInputAction: + TextInputAction.newline, + style: Theme.of(context) + .textTheme + .bodyMedium, + minLines: 1, + enabled: false, + decoration: InputDecoration( + border: InputBorder.none, + hintText: 'بنویسید...', + hintStyle: Theme.of(context) + .textTheme + .bodySmall! + .copyWith( + color: Theme.of( + context) + .colorScheme + .disabledText), + ), + ), + ), + ], + )))) + ], + ), + ), ), - ), - ), - const SizedBox( - width: 18, - ), - Icon( - Icons.attach_file_rounded, - color: Theme.of(context).colorScheme.focusedBorder, - ), - ], - )), + const SizedBox( + width: 18, + ), + Icon( + Icons.attach_file_rounded, + color: Theme.of(context).colorScheme.focusedBorder, + ), + ], + )), + ), + ], ), + Positioned( + top: 32, + right: 0, + child: InkWell( + onTap: () => homeScaffKey.currentState!.openDrawer(), + child: Container( + width: 46, + height: 46, + decoration: BoxDecoration( + color: Theme.of(context).colorScheme.surface, + borderRadius: const BorderRadius.only( + topLeft: Radius.circular(12), + bottomLeft: Radius.circular(12)), + boxShadow: DesignConfig.defaultShadow), + child: Icon( + DidvanIcons.angle_left_light, + color: Theme.of(context).colorScheme.title, + ), + )), + ) ], ); }, diff --git a/lib/views/profile/profile.dart b/lib/views/profile/profile.dart index d052917..58a24e5 100644 --- a/lib/views/profile/profile.dart +++ b/lib/views/profile/profile.dart @@ -348,7 +348,7 @@ class _ProfilePageState extends State { ), const SizedBox(height: 16), DidvanText( - 'نسخه نرم‌افزار: 3.3.1', + 'نسخه نرم‌افزار: 3.3.3', style: Theme.of(context).textTheme.bodySmall, ), ], diff --git a/pubspec.yaml b/pubspec.yaml index eae08ff..6ca54d9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.3.1+3310 +version: 3.3.3+3330 environment: sdk: ">=2.19.0 <3.0.0"