From 468ad0e7e6258439ee719ec2b18013ed6c12c2cf Mon Sep 17 00:00:00 2001 From: lhaerim Date: Wed, 25 Dec 2024 03:36:14 +0900 Subject: [PATCH] Feat/#62 --- outfoot/android/app/build.gradle | 8 ++- outfoot/android/build.gradle | 2 +- outfoot/lib/screens/checkpage_foot.dart | 9 ++- outfoot/lib/screens/checkpage_image.dart | 17 ++---- .../screens/checkpage_photodetail_memo.dart | 57 +++++++++++-------- outfoot/lib/screens/edit_profile_page.dart | 11 ++-- outfoot/lib/screens/friend_list_screen.dart | 16 +++++- outfoot/lib/screens/home_page.dart | 26 +++++---- outfoot/lib/screens/profile_my_page.dart | 18 ++++-- outfoot/lib/screens/upload.dart | 23 ++++++-- outfoot/lib/services/data/checkpage_data.dart | 11 ++++ .../lib/services/data/editprofile_data.dart | 11 ++++ .../lib/services/data/friendlist_data.dart | 9 +++ outfoot/lib/services/data/homepage_data.dart | 9 +++ outfoot/lib/services/data/memo_data.dart | 32 +++++++++++ outfoot/lib/services/data/mypage_data.dart | 13 +++++ outfoot/lib/services/data/upload_data.dart | 11 ++++ outfoot/pubspec.yaml | 4 +- 18 files changed, 218 insertions(+), 69 deletions(-) create mode 100644 outfoot/lib/services/data/checkpage_data.dart create mode 100644 outfoot/lib/services/data/editprofile_data.dart create mode 100644 outfoot/lib/services/data/friendlist_data.dart create mode 100644 outfoot/lib/services/data/homepage_data.dart create mode 100644 outfoot/lib/services/data/memo_data.dart create mode 100644 outfoot/lib/services/data/mypage_data.dart create mode 100644 outfoot/lib/services/data/upload_data.dart diff --git a/outfoot/android/app/build.gradle b/outfoot/android/app/build.gradle index 9555aa7..f0c21ff 100644 --- a/outfoot/android/app/build.gradle +++ b/outfoot/android/app/build.gradle @@ -49,6 +49,9 @@ android { targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName + + multiDexEnabled true + } buildTypes { @@ -64,4 +67,7 @@ flutter { source '../..' } -dependencies {} + +dependencies { + implementation 'com.android.support:multidex:1.0.3' +} diff --git a/outfoot/android/build.gradle b/outfoot/android/build.gradle index e83fb5d..2dcf86f 100644 --- a/outfoot/android/build.gradle +++ b/outfoot/android/build.gradle @@ -27,4 +27,4 @@ subprojects { tasks.register("clean", Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/outfoot/lib/screens/checkpage_foot.dart b/outfoot/lib/screens/checkpage_foot.dart index c693fb6..93e34de 100644 --- a/outfoot/lib/screens/checkpage_foot.dart +++ b/outfoot/lib/screens/checkpage_foot.dart @@ -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; // 토큰 전달 @@ -12,6 +13,8 @@ class CheckPageFoot extends StatefulWidget { _CheckPageFootState createState() => _CheckPageFootState(); } +final Data = CheckpageData("24.12.26", "하루에 물 2리터 마시기", "건강한 이너뷰티"); + class _CheckPageFootState extends State { String? goalTitle; String? goalIntro; @@ -50,7 +53,7 @@ class _CheckPageFootState extends State { borderRadius: BorderRadius.circular(6), ), child: Text( - "2024.12.31", // 예제 날짜 + Data.date, style: TextStyle( fontSize: 12, color: Colors.black54, @@ -66,7 +69,7 @@ class _CheckPageFootState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - goalTitle ?? "목표 없음", + Data.title, style: TextStyle( fontSize: 20, fontWeight: FontWeight.bold, @@ -81,7 +84,7 @@ class _CheckPageFootState extends State { // 목표 설명 표시 Text( - goalIntro ?? "", + Data.intro, style: TextStyle( fontSize: 14, color: Colors.black54, diff --git a/outfoot/lib/screens/checkpage_image.dart b/outfoot/lib/screens/checkpage_image.dart index a792fb5..e839dd2 100644 --- a/outfoot/lib/screens/checkpage_image.dart +++ b/outfoot/lib/screens/checkpage_image.dart @@ -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; @@ -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; @@ -105,7 +108,7 @@ class _CheckPageImageState extends State { borderRadius: BorderRadius.circular(6), ), child: Text( - goal?.createdAt ?? '날짜 정보 없음', + Data.date, style: TextStyle( fontSize: 11, color: blackBrownColor, @@ -122,7 +125,7 @@ class _CheckPageImageState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - goal?.title ?? '제목 없음', // 불러온 데이터의 제목 표시 + Data.title, style: TextStyle( fontSize: 18, color: blackBrownColor, @@ -149,7 +152,7 @@ class _CheckPageImageState extends State { ), SizedBox(height: 10.63), Text( - goal?.intro ?? '설명 없음', // 불러온 데이터의 설명 표시 + Data.intro, style: TextStyle( fontSize: 12, color: greyColor3, @@ -233,11 +236,3 @@ class _CheckPageImageState extends State { ); } } - -void main() { - runApp(MaterialApp( - home: CheckPageImage( - token: '', checkPageId: '' - ), - )); -} diff --git a/outfoot/lib/screens/checkpage_photodetail_memo.dart b/outfoot/lib/screens/checkpage_photodetail_memo.dart index ab354e1..d6e0aeb 100644 --- a/outfoot/lib/screens/checkpage_photodetail_memo.dart +++ b/outfoot/lib/screens/checkpage_photodetail_memo.dart @@ -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'; @@ -36,6 +37,14 @@ class DashedLinePainter extends CustomPainter { } } +final Data = MemoData("정지원", "안녕하세요 만나서 반가워요", "24.12.26", "하루에 물 2리터 마시기", "건강한 이너뷰티", "오늘도 뿌듯한 하루~~", "마치 하마가 된 거 같고, 뿌듯함ㅋㅋ", "24.12.26 작성됨"); +final ListdataList = [ + 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; @@ -91,9 +100,9 @@ class _CheckpagePhotodetailMemoState extends State { // Update GoalProvider final goalProvider = Provider.of(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'); } @@ -206,7 +215,7 @@ class _CheckpagePhotodetailMemoState extends State { ), child: Center( child: Text( - '문', + (Data.name)[0], style: TextStyle( fontSize: 13.834, color: Colors.white, @@ -226,7 +235,7 @@ class _CheckpagePhotodetailMemoState extends State { Padding( padding: EdgeInsets.only(top: 11), child: Text( - '문서영', + Data.name, style: TextStyle( fontSize: 14, color: greyColor1, @@ -241,7 +250,7 @@ class _CheckpagePhotodetailMemoState extends State { Text( goalProvider.content.isNotEmpty ? goalProvider.content - : "기본 목표 설명", + : Data.myintro, style: TextStyle( fontSize: 12, color: greyColor1, @@ -315,7 +324,7 @@ class _CheckpagePhotodetailMemoState extends State { child: Text( goalProvider.date.isNotEmpty ? goalProvider.date - : '24.03.31', + : Data.date1, style: TextStyle( fontSize: 11, color: blackBrownColor, @@ -334,7 +343,7 @@ class _CheckpagePhotodetailMemoState extends State { Text( goalProvider.title.isNotEmpty ? goalProvider.title - : '하루에 물 2리터 마시기', + : Data.title, style: TextStyle( fontSize: 18, color: yellowColor2, @@ -363,7 +372,7 @@ class _CheckpagePhotodetailMemoState extends State { Text( goalProvider.content.isNotEmpty ? goalProvider.intro - : '건강한 이너뷰티', + : Data.intro, style: TextStyle( fontSize: 12, color: greyColor3, @@ -455,7 +464,7 @@ class _CheckpagePhotodetailMemoState extends State { child: Text( goalProvider.contentTitle.isNotEmpty ? goalProvider.contentTitle - : "기본 목표 제목", + : Data.content1, style: TextStyle( fontSize: 14, color: greyColor1, @@ -482,7 +491,7 @@ class _CheckpagePhotodetailMemoState extends State { border: InputBorder.none, hintText: goalProvider.content.isNotEmpty ? goalProvider.content - : "기본 목표 설명", + : Data.content2, hintStyle: TextStyle( fontSize: 12, color: greyColor1, @@ -500,7 +509,7 @@ class _CheckpagePhotodetailMemoState extends State { child: Text( goalProvider.date.isNotEmpty ? goalProvider.date - : '24.01.01' + '작성됨', + : Data.date1 + '작성됨', style: TextStyle( fontSize: 11, color: mainBrownColor, @@ -571,7 +580,7 @@ class _CheckpagePhotodetailMemoState extends State { children: [ Expanded( child: Text( - '물 먹는 하마', + dataList[0].nickname, style: TextStyle( fontSize: 14, color: greyColor1, @@ -584,7 +593,7 @@ class _CheckpagePhotodetailMemoState extends State { ), SizedBox(width: 7), Text( - '03/31 14:29', + dataList[0].date, style: TextStyle( fontSize: 11, color: greyColor4, @@ -598,7 +607,7 @@ class _CheckpagePhotodetailMemoState extends State { ), SizedBox(height: 4), Text( - '저까지 뿌듯해지는 인증샷이네요 멋져요!', + dataList[0].comment, style: TextStyle( fontSize: 12, color: greyColor1, @@ -651,7 +660,7 @@ class _CheckpagePhotodetailMemoState extends State { children: [ Expanded( child: Text( - '밥 먹는 사람', + dataList[1].nickname, style: TextStyle( fontSize: 14, color: greyColor1, @@ -664,7 +673,7 @@ class _CheckpagePhotodetailMemoState extends State { ), SizedBox(width: 7), Text( - '03/31 14:29', + dataList[1].date, style: TextStyle( fontSize: 11, color: greyColor4, @@ -678,7 +687,7 @@ class _CheckpagePhotodetailMemoState extends State { ), SizedBox(height: 4), Text( - '저도 갑자기 밥이 먹고 싶어지는 것 같습니다~!', + dataList[1].comment, style: TextStyle( fontSize: 12, color: greyColor1, @@ -731,7 +740,7 @@ class _CheckpagePhotodetailMemoState extends State { children: [ Expanded( child: Text( - '강호동', + dataList[2].nickname, style: TextStyle( fontSize: 14, color: greyColor1, @@ -744,7 +753,7 @@ class _CheckpagePhotodetailMemoState extends State { ), SizedBox(width: 7), Text( - '03/31 14:29', + dataList[2].date, style: TextStyle( fontSize: 11, color: greyColor4, @@ -758,7 +767,7 @@ class _CheckpagePhotodetailMemoState extends State { ), SizedBox(height: 4), Text( - '와우 나도 얼른 라면 먹으러 가야겠다!', + dataList[2].comment, style: TextStyle( fontSize: 12, color: greyColor1, @@ -811,7 +820,7 @@ class _CheckpagePhotodetailMemoState extends State { children: [ Expanded( child: Text( - '용산구 카리나', + dataList[3].nickname, style: TextStyle( fontSize: 14, color: greyColor1, @@ -824,7 +833,7 @@ class _CheckpagePhotodetailMemoState extends State { ), SizedBox(width: 7), Text( - '03/31 14:29', + dataList[3].date, style: TextStyle( fontSize: 11, color: greyColor4, @@ -838,7 +847,7 @@ class _CheckpagePhotodetailMemoState extends State { ), SizedBox(height: 4), Text( - '물 마시는 거 진짜 중요한 건데 넘 굿굿이네요~ 화이팅 제가 응원할게요!', + dataList[3].comment, style: TextStyle( fontSize: 12, color: greyColor1, diff --git a/outfoot/lib/screens/edit_profile_page.dart b/outfoot/lib/screens/edit_profile_page.dart index 41a4152..20363d1 100644 --- a/outfoot/lib/screens/edit_profile_page.dart +++ b/outfoot/lib/screens/edit_profile_page.dart @@ -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) { @@ -27,6 +28,8 @@ class EditProfile extends StatelessWidget { ); } + final Data = EditprofileData("정지원", "안녕하세요 만나서 반가워요", "outfootfe@sookmyung.ac.kr"); + Widget _svgIcon(String assetName, {double? width, double? height, BoxFit fit = BoxFit.none}) { return SvgPicture.asset( @@ -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), ), @@ -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), ), @@ -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), ), ), diff --git a/outfoot/lib/screens/friend_list_screen.dart b/outfoot/lib/screens/friend_list_screen.dart index 3c8d705..7f464cb 100644 --- a/outfoot/lib/screens/friend_list_screen.dart +++ b/outfoot/lib/screens/friend_list_screen.dart @@ -4,6 +4,7 @@ import 'package:outfoot/colors/colors.dart'; import 'package:dio/dio.dart'; import 'package:outfoot/api/friend_list_check_api.dart'; import 'package:outfoot/models/friend_list_check_model.dart'; +import 'package:outfoot/services/data/friendlist_data.dart'; class FriendList extends StatefulWidget { const FriendList({super.key}); @@ -12,6 +13,12 @@ class FriendList extends StatefulWidget { _FriendListState createState() => _FriendListState(); } +final List dataList = [ + FriendlistData("이해림", "플러터 같이 공유해요"), + FriendlistData("정서연", "귤 드세요"), + FriendlistData("Sam Kim", "hello everyone"), +]; + class _FriendListState extends State { final FriendService _friendService = FriendService(); List _friendList = []; @@ -130,7 +137,8 @@ class _FriendListState extends State { children: [ SizedBox(height: 20.0), Text( - '총 ${_friendList.length}명', + // '총 ${_friendList.length}명', + '', style: _textStyle( 14.0, FontWeight.w400, greyColor3, 0.8, -0.28), ), @@ -160,7 +168,8 @@ class _FriendListState extends State { child: Center( child: Text( friend.nickname.isNotEmpty - ? friend.nickname[0] + // ? friend.nickname[0] + ? (dataList[0].name)[0] : '친구', style: _textStyle(20.0, FontWeight.w600, greyColor1, 0.8, -0.4), @@ -193,7 +202,8 @@ class _FriendListState extends State { SizedBox(height: 5.0), Text( friend.intro.isNotEmpty - ? friend.intro + // ? friend.intro + ? dataList[0].intro : '소개글이 없습니다', style: _textStyle(12.0, FontWeight.w400, greyColor2, 1.1, -0.22), diff --git a/outfoot/lib/screens/home_page.dart b/outfoot/lib/screens/home_page.dart index 2cd4ba0..924e934 100644 --- a/outfoot/lib/screens/home_page.dart +++ b/outfoot/lib/screens/home_page.dart @@ -1,8 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:outfoot/services/data/homepage_data.dart'; import '/widgets/custom_floating_action_button.dart'; import '/widgets/target_view.dart'; import 'package:outfoot/colors/colors.dart'; +import 'package:outfoot/services/data/homepage_data.dart'; class DashedLinePainter extends CustomPainter { @override @@ -28,6 +30,13 @@ class DashedLinePainter extends CustomPainter { } } +final List dataList = [ + HomepageData("2024-01-01", "OUTFOOT FE 모각코"), + HomepageData("2024-01-01", "OUTFOOT BE 모각코"), + HomepageData("2024-01-01", "OUTFOOT 배포"), +]; + + class HomePage extends StatefulWidget { @override _HomePageState createState() => _HomePageState(); @@ -138,8 +147,8 @@ class _HomePageState extends State { borderRadius: BorderRadius.circular(10), ), child: ProgressCard( - startDate: '2024-01-01', - title: 'OUTFOOT 백엔드 모각코', + startDate: dataList[0].date, + title: dataList[0].title, progressPercentage: 78, assetPath: 'assets/lock_icon.svg', ), @@ -157,8 +166,8 @@ class _HomePageState extends State { borderRadius: BorderRadius.circular(10), ), child: ProgressCard( - startDate: '2024-01-01', - title: 'OUTFOOT 백엔드 모각코', + startDate: dataList[1].date, + title: dataList[1].title, progressPercentage: 78, assetPath: '', ), @@ -176,8 +185,8 @@ class _HomePageState extends State { borderRadius: BorderRadius.circular(10), ), child: ProgressCard( - startDate: '2024-01-01', - title: 'OUTFOOT 백엔드 모각코', + startDate: dataList[2].title, + title: dataList[2].title, progressPercentage: 78, assetPath: '', ), @@ -200,8 +209,3 @@ class _HomePageState extends State { } } -void main() { - runApp(MaterialApp( - home: HomePage(), - )); -} diff --git a/outfoot/lib/screens/profile_my_page.dart b/outfoot/lib/screens/profile_my_page.dart index ff773ab..0aacbcd 100644 --- a/outfoot/lib/screens/profile_my_page.dart +++ b/outfoot/lib/screens/profile_my_page.dart @@ -2,11 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:outfoot/api/profile_my_page_api.dart'; import 'package:outfoot/colors/colors.dart'; +import 'package:outfoot/services/data/mypage_data.dart'; import '../widgets/target_view.dart'; import 'package:outfoot/widgets/dashed_path_painter.dart'; import 'package:outfoot/screens/navigation_bar/bottom_navigation_bar.dart'; import 'package:outfoot/models/profile_my_model.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; +import 'package:outfoot/services/data/mypage_data.dart'; class ProfileMyPage extends StatefulWidget { const ProfileMyPage({super.key}); @@ -64,6 +66,8 @@ class _ProfileState extends State { ); } + final Data = SettingData("정지원", "안녕하세요 만나서 반가워요", "시작일: 2024-12-26 ", "OUTFOOT FE 모각코"); + Widget _svgIcon(String assetName, {double? width, double? height, BoxFit fit = BoxFit.none}) { return SvgPicture.asset( @@ -75,15 +79,15 @@ class _ProfileState extends State { } String getDisplayName(String? name) { - if (name == null || name.isEmpty) { - return "사"; // 기본값 지정 + if (Data.name == null || Data.name.isEmpty) { + return " "; // 기본값 지정 } - return name[0]; // 이름의 첫 번째 글자 반환 + return Data.name[0]; // 이름의 첫 번째 글자 반환 } String truncateIntro(String? intro) { if (intro == null) return "소개글을 작성해주세요"; - return intro.length > 20 ? intro.substring(0, 20) + '…' : intro; + return intro.length > 20 ? Data.myintro.substring(0, 20) + '…' : Data.myintro; } @override @@ -170,7 +174,8 @@ class _ProfileState extends State { height: screenWidth * 0.2, alignment: Alignment.center, child: Text( - getDisplayName(_profile?.name), + // getDisplayName(_profile?.name), + Data.name, style: _textStyle( screenWidth * 0.07, FontWeight.w600, @@ -199,7 +204,8 @@ class _ProfileState extends State { Row( children: [ Text( - _profile?.name ?? '사용자', + // _profile?.name ?? '사용자', + Data.name, style: _textStyle( screenWidth * 0.05, FontWeight.w700, diff --git a/outfoot/lib/screens/upload.dart b/outfoot/lib/screens/upload.dart index c405322..b55535a 100644 --- a/outfoot/lib/screens/upload.dart +++ b/outfoot/lib/screens/upload.dart @@ -8,6 +8,7 @@ import 'package:outfoot/screens/navigation_bar/bottom_navigation_bar.dart'; import 'package:outfoot/utils/goal_provider.dart' as utils_goal_provider; import 'package:provider/provider.dart'; import 'package:outfoot/screens/navigation_bar/material_top_navigation_bar.dart'; +import 'package:outfoot/services/data/upload_data.dart'; class DashedBorder extends StatelessWidget { final Widget child; @@ -87,6 +88,8 @@ class Upload extends StatefulWidget { _UploadState createState() => _UploadState(); } +final Data = UploadData("24.12.26", "하루에 물 2리터 마시기", "건강한 이너뷰티"); + class _UploadState extends State { final AuthAdditionApi _api = AuthAdditionApi(); final TextEditingController _titleController = TextEditingController(); @@ -185,7 +188,8 @@ class _UploadState extends State { borderRadius: BorderRadius.circular(6), ), child: Text( - goalProvider.date, + // goalProvider.date, + Data.date, style: TextStyle( fontSize: 11, color: blackBrownColor, @@ -204,7 +208,8 @@ class _UploadState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ Text( - goalProvider.title, + // goalProvider.title, + Data.title, style: TextStyle( fontSize: 18, color: blackBrownColor, @@ -233,7 +238,8 @@ class _UploadState extends State { Padding( padding: EdgeInsets.only(left: 20), child: Text( - goalProvider.intro, + // goalProvider.intro, + Data.intro, style: TextStyle( fontSize: 12, color: greyColor3, @@ -411,7 +417,8 @@ class _UploadState extends State { child: Align( alignment: Alignment.centerRight, child: Text( - '${_contentController.text.length}/50', + // '${_contentController.text.length}/50', + " ", style: TextStyle( fontSize: 11, color: mainBrownColor, @@ -465,3 +472,11 @@ class _UploadState extends State { ); } } + +void main() { + + runApp(MaterialApp( + home: Upload( + ), + )); +} diff --git a/outfoot/lib/services/data/checkpage_data.dart b/outfoot/lib/services/data/checkpage_data.dart new file mode 100644 index 0000000..7949858 --- /dev/null +++ b/outfoot/lib/services/data/checkpage_data.dart @@ -0,0 +1,11 @@ +class CheckpageData{ + final String date; + final String title; + final String intro; + + CheckpageData( + this.date, + this.title, + this.intro + ); +} \ No newline at end of file diff --git a/outfoot/lib/services/data/editprofile_data.dart b/outfoot/lib/services/data/editprofile_data.dart new file mode 100644 index 0000000..6968aa5 --- /dev/null +++ b/outfoot/lib/services/data/editprofile_data.dart @@ -0,0 +1,11 @@ +class EditprofileData{ + final String name; + final String myintro; + final String email; + + EditprofileData( + this.name, + this.myintro, + this.email + ); +} \ No newline at end of file diff --git a/outfoot/lib/services/data/friendlist_data.dart b/outfoot/lib/services/data/friendlist_data.dart new file mode 100644 index 0000000..1af92b5 --- /dev/null +++ b/outfoot/lib/services/data/friendlist_data.dart @@ -0,0 +1,9 @@ +class FriendlistData{ + final String name; + final String intro; + + FriendlistData( + this.name, + this.intro + ); +} diff --git a/outfoot/lib/services/data/homepage_data.dart b/outfoot/lib/services/data/homepage_data.dart new file mode 100644 index 0000000..3e77247 --- /dev/null +++ b/outfoot/lib/services/data/homepage_data.dart @@ -0,0 +1,9 @@ +class HomepageData{ + final String date; + final String title; + + HomepageData( + this.date, + this.title + ); +} diff --git a/outfoot/lib/services/data/memo_data.dart b/outfoot/lib/services/data/memo_data.dart new file mode 100644 index 0000000..05b5fb0 --- /dev/null +++ b/outfoot/lib/services/data/memo_data.dart @@ -0,0 +1,32 @@ +class MemoData{ + final String name; + final String myintro; + final String date1; + final String title; + final String intro; + final String content1; + final String content2; + final String date2; + MemoData( + this.name, + this.myintro, + this.date1, + this.title, + this.intro, + this.content1, + this.content2, + this.date2 + ); +} + +class CommentData{ + final String nickname; + final String date; + final String comment; + + CommentData( + this.nickname, + this.date, + this.comment + ); +} \ No newline at end of file diff --git a/outfoot/lib/services/data/mypage_data.dart b/outfoot/lib/services/data/mypage_data.dart new file mode 100644 index 0000000..657adad --- /dev/null +++ b/outfoot/lib/services/data/mypage_data.dart @@ -0,0 +1,13 @@ +class SettingData { + final String name; + final String myintro; + final String date; + final String title; + + SettingData ( + this.name, + this.myintro, + this.date, + this.title + ); +} \ No newline at end of file diff --git a/outfoot/lib/services/data/upload_data.dart b/outfoot/lib/services/data/upload_data.dart new file mode 100644 index 0000000..b0c9738 --- /dev/null +++ b/outfoot/lib/services/data/upload_data.dart @@ -0,0 +1,11 @@ +class UploadData { + final String date; + final String title; + final String intro; + + UploadData ( + this.date, + this.title, + this.intro + ); +} \ No newline at end of file diff --git a/outfoot/pubspec.yaml b/outfoot/pubspec.yaml index 5660791..7173f55 100644 --- a/outfoot/pubspec.yaml +++ b/outfoot/pubspec.yaml @@ -1,5 +1,6 @@ name: outfoot description: "A new Flutter project." + # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev @@ -21,6 +22,7 @@ version: 1.0.0+1 environment: sdk: '>=3.2.3 <4.0.0' + # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions # consider running `flutter pub upgrade --major-versions`. Alternatively, @@ -147,4 +149,4 @@ flutter: # weight: 700 # # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages + # see https://flutter.dev/custom-fonts/#from-packages \ No newline at end of file