Skip to content

Commit

Permalink
Feat/#62
Browse files Browse the repository at this point in the history
  • Loading branch information
@lhaerim
lhaerim committed Dec 24, 2024
1 parent 2038f4f commit 468ad0e
Show file tree
Hide file tree
Showing 18 changed files with 218 additions and 69 deletions.
8 changes: 7 additions & 1 deletion outfoot/android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ android {
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName

multiDexEnabled true

}

buildTypes {
Expand All @@ -64,4 +67,7 @@ flutter {
source '../..'
}

dependencies {}

dependencies {
implementation 'com.android.support:multidex:1.0.3'
}
2 changes: 1 addition & 1 deletion outfoot/android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ subprojects {

tasks.register("clean", Delete) {
delete rootProject.buildDir
}
}
9 changes: 6 additions & 3 deletions outfoot/lib/screens/checkpage_foot.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:outfoot/utils/goal_provider.dart';
import 'package:outfoot/services/data/checkpage_data.dart';

class CheckPageFoot extends StatefulWidget {
final String token; // 토큰 전달
Expand All @@ -12,6 +13,8 @@ class CheckPageFoot extends StatefulWidget {
_CheckPageFootState createState() => _CheckPageFootState();
}

final Data = CheckpageData("24.12.26", "하루에 물 2리터 마시기", "건강한 이너뷰티");

class _CheckPageFootState extends State<CheckPageFoot> {
String? goalTitle;
String? goalIntro;
Expand Down Expand Up @@ -50,7 +53,7 @@ class _CheckPageFootState extends State<CheckPageFoot> {
borderRadius: BorderRadius.circular(6),
),
child: Text(
"2024.12.31", // 예제 날짜
Data.date,
style: TextStyle(
fontSize: 12,
color: Colors.black54,
Expand All @@ -66,7 +69,7 @@ class _CheckPageFootState extends State<CheckPageFoot> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
goalTitle ?? "목표 없음",
Data.title,
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
Expand All @@ -81,7 +84,7 @@ class _CheckPageFootState extends State<CheckPageFoot> {

// 목표 설명 표시
Text(
goalIntro ?? "",
Data.intro,
style: TextStyle(
fontSize: 14,
color: Colors.black54,
Expand Down
17 changes: 6 additions & 11 deletions outfoot/lib/screens/checkpage_image.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import '/widgets/custom_floating_action_button.dart';
import 'package:outfoot/colors/colors.dart';
import 'package:outfoot/api/view_single_api.dart';
import 'package:outfoot/models/view_single_model.dart';
import 'package:outfoot/services/data/checkpage_data.dart';

class DashedCircle extends StatelessWidget {
final double size;
Expand All @@ -29,6 +30,8 @@ class DashedCircle extends StatelessWidget {
}
}

final Data = CheckpageData("24.12.26", "하루에 물 2리터 마시기", "건강한 이너뷰티");

class DashedCirclePainter extends CustomPainter {
final Color color;
final double dashLength;
Expand Down Expand Up @@ -105,7 +108,7 @@ class _CheckPageImageState extends State<CheckPageImage> {
borderRadius: BorderRadius.circular(6),
),
child: Text(
goal?.createdAt ?? '날짜 정보 없음',
Data.date,
style: TextStyle(
fontSize: 11,
color: blackBrownColor,
Expand All @@ -122,7 +125,7 @@ class _CheckPageImageState extends State<CheckPageImage> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
goal?.title ?? '제목 없음', // 불러온 데이터의 제목 표시
Data.title,
style: TextStyle(
fontSize: 18,
color: blackBrownColor,
Expand All @@ -149,7 +152,7 @@ class _CheckPageImageState extends State<CheckPageImage> {
),
SizedBox(height: 10.63),
Text(
goal?.intro ?? '설명 없음', // 불러온 데이터의 설명 표시
Data.intro,
style: TextStyle(
fontSize: 12,
color: greyColor3,
Expand Down Expand Up @@ -233,11 +236,3 @@ class _CheckPageImageState extends State<CheckPageImage> {
);
}
}

void main() {
runApp(MaterialApp(
home: CheckPageImage(
token: '', checkPageId: ''
),
));
}
57 changes: 33 additions & 24 deletions outfoot/lib/screens/checkpage_photodetail_memo.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:outfoot/api/dislike_post_api.dart';
import 'package:outfoot/api/dislike_delete_api.dart';
import 'package:outfoot/screens/navigation_bar/comment_bottom_navigation_bar.dart';
import 'package:outfoot/screens/navigation_bar/auth_top_navigation_bar.dart';
import 'package:outfoot/services/data/memo_data.dart';
import 'package:outfoot/utils/goal_provider.dart';
import 'package:provider/provider.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
Expand Down Expand Up @@ -36,6 +37,14 @@ class DashedLinePainter extends CustomPainter {
}
}

final Data = MemoData("정지원", "안녕하세요 만나서 반가워요", "24.12.26", "하루에 물 2리터 마시기", "건강한 이너뷰티", "오늘도 뿌듯한 하루~~", "마치 하마가 된 거 같고, 뿌듯함ㅋㅋ", "24.12.26 작성됨");
final List<CommentData>dataList = [
CommentData("이해림", "12/26 14:29", "저까지 뿌듯해지는 인증샷입니다!"),
CommentData("정서연", "12/26 14:39", "나도 도전할게게"),
CommentData("Sam Kim", "12/26 16:12", "NICE"),
CommentData("Sam Kim", "12/26 16:13", "Good"),
];

class CheckpagePhotodetailMemo extends StatefulWidget {
final String token;
final String confirmId;
Expand Down Expand Up @@ -91,9 +100,9 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {

// Update GoalProvider
final goalProvider = Provider.of<GoalProvider>(context, listen: false);
goalProvider.updateGoal(data['title'] ?? '기본 목표 제목',
data['intro'] ?? '기본 목표 설명', data['imageUrl'] ?? '');
goalProvider.updateDate(data['date'] ?? '24.01.01');
goalProvider.updateGoal(Data.title ?? '기본 목표 제목',
Data.intro ?? '기본 목표 설명', data['imageUrl'] ?? '');
goalProvider.updateDate( Data.date1 ?? '24.01.01');
} else {
throw Exception('Failed to fetch goal data');
}
Expand Down Expand Up @@ -206,7 +215,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
),
child: Center(
child: Text(
'문',
(Data.name)[0],
style: TextStyle(
fontSize: 13.834,
color: Colors.white,
Expand All @@ -226,7 +235,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
Padding(
padding: EdgeInsets.only(top: 11),
child: Text(
'문서영',
Data.name,
style: TextStyle(
fontSize: 14,
color: greyColor1,
Expand All @@ -241,7 +250,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
Text(
goalProvider.content.isNotEmpty
? goalProvider.content
: "기본 목표 설명",
: Data.myintro,
style: TextStyle(
fontSize: 12,
color: greyColor1,
Expand Down Expand Up @@ -315,7 +324,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
child: Text(
goalProvider.date.isNotEmpty
? goalProvider.date
: '24.03.31',
: Data.date1,
style: TextStyle(
fontSize: 11,
color: blackBrownColor,
Expand All @@ -334,7 +343,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
Text(
goalProvider.title.isNotEmpty
? goalProvider.title
: '하루에 물 2리터 마시기',
: Data.title,
style: TextStyle(
fontSize: 18,
color: yellowColor2,
Expand Down Expand Up @@ -363,7 +372,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
Text(
goalProvider.content.isNotEmpty
? goalProvider.intro
: '건강한 이너뷰티',
: Data.intro,
style: TextStyle(
fontSize: 12,
color: greyColor3,
Expand Down Expand Up @@ -455,7 +464,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
child: Text(
goalProvider.contentTitle.isNotEmpty
? goalProvider.contentTitle
: "기본 목표 제목",
: Data.content1,
style: TextStyle(
fontSize: 14,
color: greyColor1,
Expand All @@ -482,7 +491,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
border: InputBorder.none,
hintText: goalProvider.content.isNotEmpty
? goalProvider.content
: "기본 목표 설명",
: Data.content2,
hintStyle: TextStyle(
fontSize: 12,
color: greyColor1,
Expand All @@ -500,7 +509,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
child: Text(
goalProvider.date.isNotEmpty
? goalProvider.date
: '24.01.01' + '작성됨',
: Data.date1 + '작성됨',
style: TextStyle(
fontSize: 11,
color: mainBrownColor,
Expand Down Expand Up @@ -571,7 +580,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
children: [
Expanded(
child: Text(
'물 먹는 하마',
dataList[0].nickname,
style: TextStyle(
fontSize: 14,
color: greyColor1,
Expand All @@ -584,7 +593,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
),
SizedBox(width: 7),
Text(
'03/31 14:29',
dataList[0].date,
style: TextStyle(
fontSize: 11,
color: greyColor4,
Expand All @@ -598,7 +607,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
),
SizedBox(height: 4),
Text(
'저까지 뿌듯해지는 인증샷이네요 멋져요!',
dataList[0].comment,
style: TextStyle(
fontSize: 12,
color: greyColor1,
Expand Down Expand Up @@ -651,7 +660,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
children: [
Expanded(
child: Text(
'밥 먹는 사람',
dataList[1].nickname,
style: TextStyle(
fontSize: 14,
color: greyColor1,
Expand All @@ -664,7 +673,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
),
SizedBox(width: 7),
Text(
'03/31 14:29',
dataList[1].date,
style: TextStyle(
fontSize: 11,
color: greyColor4,
Expand All @@ -678,7 +687,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
),
SizedBox(height: 4),
Text(
'저도 갑자기 밥이 먹고 싶어지는 것 같습니다~!',
dataList[1].comment,
style: TextStyle(
fontSize: 12,
color: greyColor1,
Expand Down Expand Up @@ -731,7 +740,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
children: [
Expanded(
child: Text(
'강호동',
dataList[2].nickname,
style: TextStyle(
fontSize: 14,
color: greyColor1,
Expand All @@ -744,7 +753,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
),
SizedBox(width: 7),
Text(
'03/31 14:29',
dataList[2].date,
style: TextStyle(
fontSize: 11,
color: greyColor4,
Expand All @@ -758,7 +767,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
),
SizedBox(height: 4),
Text(
'와우 나도 얼른 라면 먹으러 가야겠다!',
dataList[2].comment,
style: TextStyle(
fontSize: 12,
color: greyColor1,
Expand Down Expand Up @@ -811,7 +820,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
children: [
Expanded(
child: Text(
'용산구 카리나',
dataList[3].nickname,
style: TextStyle(
fontSize: 14,
color: greyColor1,
Expand All @@ -824,7 +833,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
),
SizedBox(width: 7),
Text(
'03/31 14:29',
dataList[3].date,
style: TextStyle(
fontSize: 11,
color: greyColor4,
Expand All @@ -838,7 +847,7 @@ class _CheckpagePhotodetailMemoState extends State<CheckpagePhotodetailMemo> {
),
SizedBox(height: 4),
Text(
'물 마시는 거 진짜 중요한 건데 넘 굿굿이네요~ 화이팅 제가 응원할게요!',
dataList[3].comment,
style: TextStyle(
fontSize: 12,
color: greyColor1,
Expand Down
11 changes: 7 additions & 4 deletions outfoot/lib/screens/edit_profile_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:outfoot/colors/colors.dart';
import 'package:outfoot/services/data/editprofile_data.dart';
import 'package:outfoot/widgets/dashed_line_painter.dart';

class EditProfile extends StatelessWidget {
const EditProfile({super.key});
EditProfile({super.key});

TextStyle _textStyle(double fontSize, FontWeight fontWeight, Color color,
double letterSpacing) {
Expand All @@ -27,6 +28,8 @@ class EditProfile extends StatelessWidget {
);
}

final Data = EditprofileData("정지원", "안녕하세요 만나서 반가워요", "[email protected]");

Widget _svgIcon(String assetName,
{double? width, double? height, BoxFit fit = BoxFit.none}) {
return SvgPicture.asset(
Expand Down Expand Up @@ -78,7 +81,7 @@ class EditProfile extends StatelessWidget {
alignment: Alignment.center,
children: [
Text(
'문',
(Data.name)[0],
style: _textStyle(
24.0, FontWeight.bold, Colors.white, 0.0),
),
Expand Down Expand Up @@ -109,7 +112,7 @@ class EditProfile extends StatelessWidget {
top: 78.0,
left: 159.0,
child: Text(
'문서영',
Data.name,
style: _textStyle(
16.0, FontWeight.w500, greyColor1, -0.32),
),
Expand Down Expand Up @@ -147,7 +150,7 @@ class EditProfile extends StatelessWidget {
top: 264.0,
right: 42.0,
child: Text(
'19/20',
' ',
style: _textStyle(11, FontWeight.w400, mainBrownColor, -0.22),
),
),
Expand Down
Loading

0 comments on commit 468ad0e

Please sign in to comment.