From 3475ba49eb69cff46772ad510fbb0d61a07134dd Mon Sep 17 00:00:00 2001 From: bunju20 <85238126+bunju20@users.noreply.github.com> Date: Tue, 20 Feb 2024 19:36:33 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=AC=B8=EB=8B=A8=EA=B5=90=EC=A0=95=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=83=9D=EC=84=B1=20=EB=B0=8F=20?= =?UTF-8?q?DB=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/views/paragraph/create_script_screen.dart | 29 +++++++++++++++---- .../paragraph/learning_session_screen.dart | 9 +++--- lib/views/word/word_screen.dart | 3 +- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/lib/views/paragraph/create_script_screen.dart b/lib/views/paragraph/create_script_screen.dart index dd0926e..00f90c9 100644 --- a/lib/views/paragraph/create_script_screen.dart +++ b/lib/views/paragraph/create_script_screen.dart @@ -40,11 +40,30 @@ class CreateScriptPage extends StatelessWidget { children: [ Expanded( flex: 1, - child: Padding( - padding: const EdgeInsets.all(10.0), - child: Text( - text, - style: const TextStyle(fontSize: 16), + child: SingleChildScrollView( + child: Container( + child: Padding( + padding: const EdgeInsets.all(0.0), + child: Container( + margin: const EdgeInsets.all(10.0), + padding: const EdgeInsets.all(20.0), + //가장자리 둥글게 + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(15.0), + + color: Colors.white, + + ), + + child: Text( + text, + style: const TextStyle(fontSize: 16, + fontFamily: 'Pretendard', + fontWeight: FontWeight.bold + ), + ), + ), + ), ), ), ), diff --git a/lib/views/paragraph/learning_session_screen.dart b/lib/views/paragraph/learning_session_screen.dart index 72e5d96..d1e74fd 100644 --- a/lib/views/paragraph/learning_session_screen.dart +++ b/lib/views/paragraph/learning_session_screen.dart @@ -1,4 +1,5 @@ import 'package:earlips/viewModels/Paragraph/learning_session_screen_viewmodel.dart'; +import 'package:earlips/views/word/widget/blue_back_appbar.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:earlips/views/paragraph/create_script_screen.dart'; @@ -23,9 +24,9 @@ class _LearningSessionScreenState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar( - title: Text('대본으로 학습하기'), - centerTitle: true, + appBar: PreferredSize( + preferredSize: const Size.fromHeight(kToolbarHeight), + child: BlueBackAppbar(title: "문단교정"), ), body: Obx(() { if (viewModel.isLoading.value) { @@ -54,7 +55,7 @@ class _LearningSessionScreenState extends State { title: Text( paragraph.title, style: const TextStyle( - fontSize: 24.0, + fontSize: 20.0, fontWeight: FontWeight.bold, ), ), diff --git a/lib/views/word/word_screen.dart b/lib/views/word/word_screen.dart index a7c18fa..ba565fd 100644 --- a/lib/views/word/word_screen.dart +++ b/lib/views/word/word_screen.dart @@ -7,6 +7,7 @@ import 'package:earlips/views/word/widget/word_youtube_widget.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:earlips/views/paragraph/create_script_screen.dart'; +import 'package:earlips/views/paragraph/learning_session_screen.dart'; class WordScreen extends StatelessWidget { final String title; @@ -85,7 +86,7 @@ class WordScreen extends StatelessWidget { wordDataList: controller.wordList, ); } else { - return const CreateScriptPage(); + return LearningSessionScreen(); } }, ),