Skip to content

Commit

Permalink
Merge branch 'siiion@mod-ui' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@siiion
siiion committed Jan 25, 2025
2 parents be971aa + 57d5126 commit 0a66edf
Show file tree
Hide file tree
Showing 17 changed files with 825 additions and 989 deletions.
2 changes: 1 addition & 1 deletion economic_fe/lib/main.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class RippleApp extends StatelessWidget {
Widget build(BuildContext context) {
return GetMaterialApp(
title: 'Ripple',
initialRoute: '/profile_setting',
initialRoute: '/',
getPages: UserRouter.getPages(), // 라우트 설정
);
}
Expand Down
43 changes: 23 additions & 20 deletions economic_fe/lib/view/screens/community/community_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class CommunityPage extends StatelessWidget {
child: GestureDetector(
onTap: () => controller.toTalkDetailPage(),
child: Container(
width: 328,
width: MediaQuery.of(context).size.width - 32,
height: 122,
decoration: ShapeDecoration(
image: DecorationImage(
Expand Down Expand Up @@ -587,21 +587,24 @@ class TalkListItem extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
// 경제톡톡 이미지
GestureDetector(
onTap: onTap,
child: Container(
width: 97,
height: 118,
decoration: ShapeDecoration(
image: const DecorationImage(
image: AssetImage('assets/talk_image_sample.png'),
fit: BoxFit.cover,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(7),
Padding(
padding: const EdgeInsets.only(right: 12),
child: GestureDetector(
onTap: onTap,
child: Container(
width: 97,
height: 118,
decoration: ShapeDecoration(
image: const DecorationImage(
image: AssetImage('assets/talk_image_sample.png'),
fit: BoxFit.cover,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(7),
),
),
),
),
Expand All @@ -610,9 +613,9 @@ class TalkListItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(
width: 219,
child: Row(
SizedBox(
width: MediaQuery.of(context).size.width - (32 + 97 + 12),
child: const Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
Expand Down Expand Up @@ -644,10 +647,10 @@ class TalkListItem extends StatelessWidget {
),
GestureDetector(
onTap: onTap,
child: const SizedBox(
width: 219,
child: SizedBox(
width: MediaQuery.of(context).size.width - (32 + 97 + 12),
height: 60,
child: Flexible(
child: const Flexible(
child: Text(
'현재 경제 상황에서 가장 중요한 투자 전략은 무엇이라고 생각하나요? 현재 경제 상황에서 가장 중요한 투자 전략...',
style: TextStyle(
Expand Down
12 changes: 0 additions & 12 deletions economic_fe/lib/view/screens/community/talk_detail_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:economic_fe/data/models/community/comment.dart';
import 'package:economic_fe/view/theme/palette.dart';
import 'package:economic_fe/view/widgets/chatbot_fab.dart';
import 'package:economic_fe/view/widgets/community/comment_widget.dart';
import 'package:economic_fe/view/widgets/custom_app_bar.dart';
import 'package:economic_fe/view_model/community/talk_detail_controller.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
Expand Down Expand Up @@ -40,16 +38,6 @@ class TalkDetailPage extends StatelessWidget {
),
),
centerTitle: true,
actions: [
// 더보기 버튼
Padding(
padding: const EdgeInsets.only(right: 16),
child: GestureDetector(
onTap: () {},
child: const Icon(Icons.more_horiz),
),
),
],
),
body: Stack(
children: [
Expand Down
65 changes: 27 additions & 38 deletions economic_fe/lib/view/screens/dictionary_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import 'package:economic_fe/view/theme/palette.dart';
import 'package:economic_fe/view/widgets/custom_app_bar.dart';
import 'package:economic_fe/view/widgets/custom_bottom_bar.dart';
import 'package:economic_fe/view_model/login/agreement_controller.dart';
import 'package:economic_fe/view_model/dictionary_controller.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get/get_core/src/get_main.dart';

class DictionaryPage extends StatefulWidget {
const DictionaryPage({super.key});
Expand Down Expand Up @@ -77,10 +75,8 @@ class _DictionaryPageState extends State<DictionaryPage> {
},
];
int _selectedIndex = -1;
// bool _selectedWord = false;
@override
void initState() {
// TODO: implement initState
super.initState();
controller = Get.put(DictionaryController()..getStats());
}
Expand All @@ -95,7 +91,6 @@ class _DictionaryPageState extends State<DictionaryPage> {
backgroundColor: Palette.background,
appBar: CustomAppBar(
title: "용어사전",
rightIcon: true,
onTapTitle: () {
showCategoryModal(context);
},
Expand Down Expand Up @@ -155,7 +150,6 @@ class _DictionaryPageState extends State<DictionaryPage> {
child: Container(
height: 30,
width: 45,
padding: const EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration(
color: _selectedIndex == index
? const Color(0xFF1EB692) // 선택된 항목은 초록색
Expand All @@ -167,19 +161,21 @@ class _DictionaryPageState extends State<DictionaryPage> {
: const Color(0xFF1EB692), // 나머지 항목은 회색 테두리
),
),
child: Text(
consonants[index], // 자음 리스트에서 해당 항목을 표시
style: _selectedIndex == index
? const TextStyle(
color: Colors.white,
fontSize: 16,
fontWeight: FontWeight.w500,
)
: const TextStyle(
color: Color(0xFF767676),
fontSize: 16,
fontWeight: FontWeight.w500,
),
child: Center(
child: Text(
consonants[index], // 자음 리스트에서 해당 항목을 표시
style: _selectedIndex == index
? const TextStyle(
color: Colors.white,
fontSize: 16,
fontWeight: FontWeight.w500,
)
: const TextStyle(
color: Color(0xFF767676),
fontSize: 16,
fontWeight: FontWeight.w500,
),
),
),
),
),
Expand All @@ -202,20 +198,11 @@ class _DictionaryPageState extends State<DictionaryPage> {
padding: const EdgeInsets.all(16),
decoration: const BoxDecoration(
color: Colors.white,
// borderRadius: BorderRadius.circular(10),
// border: Border.all(color: const Color(0xFFCFCFCF)),
// boxShadow: [
// BoxShadow(
// color: Colors.grey.withOpacity(0.1),
// blurRadius: 5,
// offset: const Offset(0, 2),
// ),
// ],
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
SizedBox(
width: 300,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expand All @@ -242,11 +229,8 @@ class _DictionaryPageState extends State<DictionaryPage> {
],
),
),
// const SizedBox(
// width: 5,
// ),
Padding(
padding: const EdgeInsets.only(top: 0),
padding: const EdgeInsets.only(left: 10),
child: GestureDetector(
onTap: () {
setState(() {
Expand All @@ -257,11 +241,16 @@ class _DictionaryPageState extends State<DictionaryPage> {
print("Dd");
});
},
child: Image.asset(
items[index]['selectedWord'] ?? false
? "assets/bookmark_selected.png"
: "assets/bookmark.png",
height: 20,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 11, vertical: 8),
child: Image.asset(
items[index]['selectedWord'] ?? false
? "assets/bookmark_selected.png"
: "assets/bookmark.png",
width: 13,
height: 18.2,
),
),
),
)
Expand Down
Loading

0 comments on commit 0a66edf

Please sign in to comment.