Skip to content

Commit

Permalink
Merge pull request #121 from sparcs-kaist/feat@final
Browse files Browse the repository at this point in the history
Feat@final
  • Loading branch information
sboh1214 authored Aug 1, 2023
2 parents fcb355f + 07a2ec1 commit e7aa9c6
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion assets/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"grade": "성적",
"load": "널널",
"speech": "강의",
"like": "좋아요",
"like": "추천",
"report": "신고하기"
},
"user": {
Expand Down
2 changes: 1 addition & 1 deletion lib/constants/privacy.dart
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const String privacyText11 = """

const String privacyTitle12 = '12. 개인정보 처리방침 변경';
const String privacyText12 = """
이 개인정보 처리방침은 2022년 2월 15일에 마지막으로 수정되었으며, 2022년 2월 15일부터 적용됩니다.
이 개인정보 처리방침은 2023년 8월 2일에 마지막으로 수정되었으며, 2023년 8월 2일부터 적용됩니다.
""";

const List<String> privacyTitles = <String>[
Expand Down
2 changes: 1 addition & 1 deletion lib/providers/course_search_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class CourseSearchModel extends ChangeNotifier {
} else {
_courseSearchquery = Text.rich(
TextSpan(
style: bodyRegular.copyWith(color: OTLColor.grayA, height: 1.24),
style: evenBodyRegular.copyWith(color: OTLColor.grayA),
children: [
TextSpan(
text: _courseSearchText.isEmpty ? '' : '"$_courseSearchText"',
Expand Down
2 changes: 1 addition & 1 deletion lib/providers/lecture_search_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class LectureSearchModel extends ChangeNotifier {
.map((i) => i.label)))).values.expand((i) => i).toList();
_lectureSearchquery = Text.rich(
TextSpan(
style: bodyRegular.copyWith(color: OTLColor.grayA, height: 1.24),
style: evenBodyRegular.copyWith(color: OTLColor.grayA),
children: [
TextSpan(
text: _lectureSearchText.isEmpty ? '' : '"$_lectureSearchText"',
Expand Down
10 changes: 6 additions & 4 deletions lib/widgets/review_block.dart
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class _ReviewBlockState extends State<ReviewBlock> {
],
),
),
const SizedBox(height: 2.0),
ExpandableText(
content.trim(),
maxLines: widget.maxLines,
Expand Down Expand Up @@ -137,10 +138,11 @@ class _ReviewBlockState extends State<ReviewBlock> {
children: [
IconTextButton(
color: OTLColor.pinksMain,
iconSize: 12.0,
icon: _liked ? Icons.favorite : Icons.favorite_border,
spaceBetween: 2.0,
text: _liked ? "review.likes".tr() : "review.likes".tr(),
iconSize: 16.0,
icon:
_liked ? Icons.thumb_up_alt : Icons.thumb_up_alt_outlined,
spaceBetween: 4.0,
text: "review.like".tr(),
textStyle: labelRegular,
padding: EdgeInsets.fromLTRB(3, 8, 10, 8),
onTap: _liked ? _uploadCancel : _uploadLike,
Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/review_write_block.dart
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ class _ReviewWriteBlockState extends State<ReviewWriteBlock> {
padding: const EdgeInsets.only(left: 4.0),
child: ClipOval(
child: BackgroundButton(
color: (_scores[type] == score) ? OTLColor.pinksSub : OTLColor.grayD,
color: (_scores[type] == score) ? OTLColor.gray75 : OTLColor.grayD,
onTap: () {
setState(() {
_scores[type] = (_scores[type] == score) ? 0 : score;
Expand All @@ -263,7 +263,7 @@ class _ReviewWriteBlockState extends State<ReviewWriteBlock> {
["?", "F", "D", "C", "B", "A"][score],
style: labelBold.copyWith(
color:
_scores[type] == score ? OTLColor.gray0 : OTLColor.grayF,
_scores[type] == score ? OTLColor.grayF : OTLColor.grayF,
),
),
),
Expand Down

0 comments on commit e7aa9c6

Please sign in to comment.