Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions lib/features/home/presentation/views/home_screen.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import 'package:debateseason_frontend_v1/core/constants/de_gaps.dart';
import 'package:debateseason_frontend_v1/features/home/presentation/views/home_screen_content.dart';
import 'package:debateseason_frontend_v1/utils/amplitude_util.dart';
import 'package:debateseason_frontend_v1/widgets/de_app_bar.dart';
import 'package:debateseason_frontend_v1/widgets/de_scaffold.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';

class HomeScreen extends StatefulWidget {
const HomeScreen({super.key});
Expand All @@ -30,23 +28,12 @@ class _HomeScreenState extends State<HomeScreen> {

DeAppBar _appbar() {
return DeAppBar(
title: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SvgPicture.asset(
'assets/icons/ic_logo.svg',
width: 24,
height: 24,
),
DeGaps.h4,
SvgPicture.asset(
'assets/icons/ic_debateseason.svg',
width: 24,
height: 24,
),
],
),
isBack: false,
title: Image.asset(
'assets/images/img_debate_logo.png',
width: 84,
height: 24,
),
);
}
}
3 changes: 3 additions & 0 deletions lib/features/issue/data/models/response/chat_room_res.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class ChatRoomRes {
int disagree;
String createdAt;
String opinion;
String time;

ChatRoomRes({
required this.chatRoomId,
Expand All @@ -22,6 +23,7 @@ class ChatRoomRes {
required this.disagree,
required this.createdAt,
required this.opinion,
required this.time,
});

factory ChatRoomRes.fromJson(Map<String, dynamic> json) =>
Expand All @@ -37,6 +39,7 @@ class ChatRoomRes {
disagree: disagree,
createdAt: DateTime.parse(createdAt),
opinion: _getOpinion(opinion),
time: time,
);

OpinionType _getOpinion(String opn) {
Expand Down
2 changes: 2 additions & 0 deletions lib/features/issue/data/models/response/chat_room_res.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions lib/features/issue/domain/entities/chat_room_entity.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class ChatRoomEntity {
int disagree;
DateTime createdAt;
OpinionType opinion;
String time;

ChatRoomEntity({
required this.chatRoomId,
Expand All @@ -17,5 +18,6 @@ class ChatRoomEntity {
required this.disagree,
required this.createdAt,
required this.opinion,
required this.time,
});
}
1 change: 1 addition & 0 deletions lib/features/issue/issue_constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ class IssueConstants {
static const debateTopicDescription = 'AI가 생성한 본 이슈의 주요 토론 주제입니다.';
static const noChatRoom = '채팅방이 개설되지 않았습니다';
static const vs = 'VS';
static const voted = '참여 중';
}
4 changes: 2 additions & 2 deletions lib/features/issue/presentation/widgets/issue_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class IssueCard extends StatelessWidget {

Widget _issueRecent() {
return DeText(
'최근', //'3분 전 대화', todo: 대화 시간 표시
chatroom.time,
style: DeFonts.caption12M.copyWith(color: DeColors.brand),
);
}
Expand Down Expand Up @@ -118,7 +118,7 @@ class IssueCard extends StatelessWidget {
),
alignment: Alignment.center,
child: DeText(
'참여 중',
IssueConstants.voted,
style: DeFonts.caption12SB.copyWith(color: DeColors.grey10),
),
);
Expand Down
7 changes: 3 additions & 4 deletions lib/features/issuemap/presentation/views/issuemap_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ class IssuemapScreen extends GetView<IssuemapViewModel> {
DeAppBar _appBar() {
return DeAppBar(
isBack: false,
title: Image.asset(
'assets/images/img_debate_logo.png',
width: 84,
height: 24,
title: DeText(
'이슈맵',
style: DeFonts.header20B,
),
);
}
Expand Down
15 changes: 9 additions & 6 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,15 @@ class MyApp extends StatelessWidget {
initialBinding: SplashBinding(),
initialRoute: GetRouterName.splash,
getPages: GetRouter.getPages,
theme: ThemeData.light().copyWith(
textTheme: ThemeData.light().textTheme.apply(
fontSizeFactor: 1.0,
),
),
builder: (context, child) => child!,
theme: ThemeData.light(),
builder: (context, child) {
final mq = MediaQuery.of(context);
return MediaQuery(
data: mq.copyWith(textScaler: TextScaler.linear(1.0)),
child: child!,
);

},
);
}
}
Expand Down