From db01a24756f200ece7b1eb24e95145a962dbb9ba Mon Sep 17 00:00:00 2001 From: xh <36baea72@gmail.com> Date: Tue, 23 Jul 2024 19:58:15 +0800 Subject: [PATCH] 1 --- lib/page/face_to_face/face_to_face_view.dart | 138 +++++++++++-------- lib/page/home/home_logic.dart | 1 - lib/page/home/home_view.dart | 9 +- lib/page/scene_list/scene_list_view.dart | 6 +- lib/page/settings/settings_controller.dart | 8 +- lib/page/splash/splash_view.dart | 6 +- lib/page/web_page/web_page_view.dart | 6 +- 7 files changed, 90 insertions(+), 84 deletions(-) diff --git a/lib/page/face_to_face/face_to_face_view.dart b/lib/page/face_to_face/face_to_face_view.dart index fb8bc94..648b09b 100644 --- a/lib/page/face_to_face/face_to_face_view.dart +++ b/lib/page/face_to_face/face_to_face_view.dart @@ -9,10 +9,8 @@ import 'package:trans_lark/widget/base_appbar.dart'; import 'package:wave/config.dart'; import 'package:wave/wave.dart'; -class FaceToFaceView extends StatelessWidget { - FaceToFaceView({super.key}); - - final controller = Get.find(); +class FaceToFaceView extends GetView { + const FaceToFaceView({super.key}); @override Widget build(BuildContext context) { @@ -21,7 +19,7 @@ class FaceToFaceView extends StatelessWidget { extendBody: true, backgroundColor: Colors.black, appBar: BaseAppBar( - backgroundColor: Colors.transparent , + backgroundColor: Colors.transparent, backColor: Colors.white, onBackTap: controller.onBackTap, actionWidget: Padding( @@ -66,43 +64,54 @@ class FaceToFaceView extends StatelessWidget { Obx(() { return Visibility( visible: !controller.selectedUnder.value, - child: SpeechToTextManager().isListening.value ? RotatedBox( - quarterTurns: 2, - child: WaveWidget( - config: CustomConfig( - colors: [ - const Color(0xff45A7FE).withOpacity(0.2), - const Color(0xff45A7FE), - ], - durations: [4000, 8000], - heightPercentages: [-0.08, -0.08], - ), - size: const Size(double.infinity, double.infinity), - backgroundColor: Colors.transparent, - waveAmplitude: 4, - // wavePhase: 0, - // waveFrequency: 0, - ), - ) : Container( - width: double.infinity, - height: double.infinity, - color: const Color(0xff45A7FE), - ), + child: SpeechToTextManager().isListening.value + ? RotatedBox( + quarterTurns: 2, + child: WaveWidget( + config: CustomConfig( + colors: [ + const Color(0xff45A7FE).withOpacity(0.2), + const Color(0xff45A7FE), + ], + durations: [4000, 8000], + heightPercentages: [-0.08, -0.08], + ), + size: const Size(double.infinity, double.infinity), + backgroundColor: Colors.transparent, + waveAmplitude: 4, + // wavePhase: 0, + // waveFrequency: 0, + ), + ) + : Container( + width: double.infinity, + height: double.infinity, + color: const Color(0xff45A7FE), + ), ); }), Obx(() { return Container( width: double.infinity, height: double.infinity, - padding: EdgeInsets.fromLTRB(30, SpeechToTextManager().isListening.value - ? MediaQuery.of(context).padding.top + kToolbarHeight - : 0, 30, 40), + padding: EdgeInsets.fromLTRB( + 30, + SpeechToTextManager().isListening.value + ? MediaQuery.of(context).padding.top + kToolbarHeight + : 0, + 30, + 40), child: AnimatedRotation( turns: controller.angle.value, duration: const Duration(milliseconds: 500), child: Column( - mainAxisAlignment: SpeechToTextManager().isListening.value ? MainAxisAlignment.start : MainAxisAlignment.center, - crossAxisAlignment: SpeechToTextManager().isListening.value ? CrossAxisAlignment.start : CrossAxisAlignment.center, + mainAxisAlignment: SpeechToTextManager().isListening.value + ? MainAxisAlignment.start + : MainAxisAlignment.center, + crossAxisAlignment: + SpeechToTextManager().isListening.value + ? CrossAxisAlignment.start + : CrossAxisAlignment.center, children: [ if (!controller.selectedUnder.value) ...[ SvgPicture.asset( @@ -114,7 +123,9 @@ class FaceToFaceView extends StatelessWidget { ], Flexible( child: Visibility( - visible: SpeechToTextManager().isListening.value && ObjUtil.isNotEmptyStr(controller.aboveText.value), + visible: SpeechToTextManager().isListening.value && + ObjUtil.isNotEmptyStr( + controller.aboveText.value), replacement: const Text( 'Please start talking', style: TextStyle( @@ -161,37 +172,45 @@ class FaceToFaceView extends StatelessWidget { Obx(() { return Visibility( visible: controller.selectedUnder.value, - child: SpeechToTextManager().isListening.value ? WaveWidget( - config: CustomConfig( - colors: [ - const Color(0xff87ECB3).withOpacity(0.2), - const Color(0xff87ECB3), - ], - durations: [4000, 8000], - heightPercentages: [-0.08, -0.08], - ), - size: const Size(double.infinity, double.infinity), - backgroundColor: Colors.transparent, - waveAmplitude: 4, - // wavePhase: 0, - // waveFrequency: 0, - ) : Container( - width: double.infinity, - height: double.infinity, - color: const Color(0xff87ECB3), - ), + child: SpeechToTextManager().isListening.value + ? WaveWidget( + config: CustomConfig( + colors: [ + const Color(0xff87ECB3).withOpacity(0.2), + const Color(0xff87ECB3), + ], + durations: [4000, 8000], + heightPercentages: [-0.08, -0.08], + ), + size: const Size(double.infinity, double.infinity), + backgroundColor: Colors.transparent, + waveAmplitude: 4, + // wavePhase: 0, + // waveFrequency: 0, + ) + : Container( + width: double.infinity, + height: double.infinity, + color: const Color(0xff87ECB3), + ), ); }), Obx(() { return Container( width: double.infinity, height: double.infinity, - padding: EdgeInsets.fromLTRB(30, SpeechToTextManager().isListening.value - ? 80 - : 0, 30, MediaQuery.of(context).padding.bottom), + padding: EdgeInsets.fromLTRB( + 30, + SpeechToTextManager().isListening.value ? 80 : 0, + 30, + MediaQuery.of(context).padding.bottom), child: Column( - mainAxisAlignment: SpeechToTextManager().isListening.value ? MainAxisAlignment.start : MainAxisAlignment.center, - crossAxisAlignment: SpeechToTextManager().isListening.value ? CrossAxisAlignment.start : CrossAxisAlignment.center, + mainAxisAlignment: SpeechToTextManager().isListening.value + ? MainAxisAlignment.start + : MainAxisAlignment.center, + crossAxisAlignment: SpeechToTextManager().isListening.value + ? CrossAxisAlignment.start + : CrossAxisAlignment.center, children: [ if (controller.selectedUnder.value) ...[ SvgPicture.asset( @@ -203,7 +222,8 @@ class FaceToFaceView extends StatelessWidget { ], Flexible( child: Visibility( - visible: SpeechToTextManager().isListening.value && ObjUtil.isNotEmptyStr(controller.underText.value), + visible: SpeechToTextManager().isListening.value && + ObjUtil.isNotEmptyStr(controller.underText.value), replacement: const Text( 'Please start talking', style: TextStyle( @@ -235,4 +255,4 @@ class FaceToFaceView extends StatelessWidget { ), ); } -} \ No newline at end of file +} diff --git a/lib/page/home/home_logic.dart b/lib/page/home/home_logic.dart index 9a69b97..6605dc2 100755 --- a/lib/page/home/home_logic.dart +++ b/lib/page/home/home_logic.dart @@ -95,7 +95,6 @@ class HomeLogic extends GetxController { SceneEntity entity = sceneTypeList[x]; if (entity.sceneList != null && entity.sceneList!.isNotEmpty) { var y = NumUtil.getRandomNumber(0, entity.sceneList!.length); - fromStr.value = _getSentence(true, entity.sceneList![y]); toStr.value = _getSentence(false, entity.sceneList![y]); } diff --git a/lib/page/home/home_view.dart b/lib/page/home/home_view.dart index d92d956..9e345be 100755 --- a/lib/page/home/home_view.dart +++ b/lib/page/home/home_view.dart @@ -15,14 +15,10 @@ class HomePage extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( body: Container( - width: double.infinity, - height: double.infinity, padding: const EdgeInsets.symmetric(horizontal: 20), decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage( - Assets.imagesHomeBackground, - ), + image: AssetImage(Assets.imagesHomeBackground), fit: BoxFit.fill, ), ), @@ -429,8 +425,7 @@ class HomePage extends StatelessWidget { padding: const EdgeInsets.all(5), decoration: BoxDecoration( color: const Color(0xff8BCFFE), - borderRadius: - BorderRadius.circular(18), + borderRadius: BorderRadius.circular(18), ), child: SvgPicture.asset( Assets.svgHomeVoice, diff --git a/lib/page/scene_list/scene_list_view.dart b/lib/page/scene_list/scene_list_view.dart index 2208a8f..ee263ee 100644 --- a/lib/page/scene_list/scene_list_view.dart +++ b/lib/page/scene_list/scene_list_view.dart @@ -8,10 +8,8 @@ import 'package:trans_lark/widget/base_appbar.dart'; import 'package:trans_lark/widget/base_scrollbar.dart'; import 'package:trans_lark/widget/language_scene_bar.dart'; -class SceneListView extends StatelessWidget { - SceneListView({super.key}); - - final controller = Get.find(); +class SceneListView extends GetView { + const SceneListView({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/page/settings/settings_controller.dart b/lib/page/settings/settings_controller.dart index 970d3a7..e7c0290 100644 --- a/lib/page/settings/settings_controller.dart +++ b/lib/page/settings/settings_controller.dart @@ -10,19 +10,17 @@ class SettingsController extends GetxController { @override void onReady() { super.onReady(); - _getVersion(); + _getAppVersion(); } /// 获取版本号 - void _getVersion() async { + void _getAppVersion() async { final packageInfo = await PackageInfo.fromPlatform(); versionName.value = 'version number ${packageInfo.version}'; } void itemOnTap(int index) { - if (index == -1) { - - } else if (index == 0) { + if (index == 0) { Get.toNamed(GetRouter.privacy, arguments: { 'title': options[index], 'url': 'https://translark.bitbucket.io/privacy.html', diff --git a/lib/page/splash/splash_view.dart b/lib/page/splash/splash_view.dart index 70eb14f..2e9038c 100644 --- a/lib/page/splash/splash_view.dart +++ b/lib/page/splash/splash_view.dart @@ -2,10 +2,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:trans_lark/page/splash/splash_controller.dart'; -class SplashView extends StatelessWidget { - SplashView({super.key}); - - final controller = Get.find(); +class SplashView extends GetView { + const SplashView({super.key}); @override Widget build(BuildContext context) { diff --git a/lib/page/web_page/web_page_view.dart b/lib/page/web_page/web_page_view.dart index c3876b7..6fb3b31 100644 --- a/lib/page/web_page/web_page_view.dart +++ b/lib/page/web_page/web_page_view.dart @@ -5,10 +5,8 @@ import 'package:trans_lark/widget/base_appbar.dart'; import 'package:trans_lark/widget/view_state_widget.dart'; import 'package:webview_flutter/webview_flutter.dart'; -class WebPageView extends StatelessWidget { - WebPageView({super.key}); - - final controller = Get.find(); +class WebPageView extends GetView { + const WebPageView({super.key}); @override Widget build(BuildContext context) {