fix: #32 timeline layout 에러 해결

indicator style및 padding 추가
TEAMMatchDev · Oct 17, 2023 · 566ceed · 566ceed
1 parent 35c717b
commit 566ceed
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 51 deletions.
diff --git a/lib/modules/buring_match/view/burning_match_view.dart b/lib/modules/buring_match/view/burning_match_view.dart
@@ -81,13 +81,13 @@ class BurningMatchScreen extends GetView<BurningMatchController> {
 
                   //매치 기록 제목
                   Padding(
-                    padding: EdgeInsets.symmetric(vertical: 30.h),
+                    padding: EdgeInsets.symmetric(vertical: 17.h).copyWith(bottom: 0.h),
                     child: Text(
                       "매치 기록",
                       style: AppTextStyles.T1Bold15,
                     ),
                   ),
-                  ListView.separated(
+                  ListView.builder(
                       physics: const NeverScrollableScrollPhysics(),
                       shrinkWrap: true,
                       itemCount: controller.flameHistories.length,
@@ -98,11 +98,6 @@ class BurningMatchScreen extends GetView<BurningMatchController> {
                             date: history.historyDate,
                             imgList: history.donationHistoryImages ?? []);
                       },
-                      separatorBuilder: (context, index) {
-                        return SizedBox(
-                          height: 12.h,
-                        );
-                      },
                       ),
                   // 매치기록
                 ],
@@ -131,7 +126,7 @@ class BurningMatchScreen extends GetView<BurningMatchController> {
           width: 70.w,
           child: Text(
             "${value} ${valueMsg ?? ""}",
-            style: AppTextStyles.L1Medium14.copyWith(color: AppColors.grey7),
+            style: AppTextStyles.S1SemiBold14.copyWith(color: AppColors.grey7),
             textAlign: TextAlign.end,
           ),
         ),

diff --git a/lib/modules/buring_match/widget/match_record_widget.dart b/lib/modules/buring_match/widget/match_record_widget.dart
@@ -11,6 +11,7 @@ class MatchRecord extends StatelessWidget {
   final String date;
   final List<String> imgList;
   final bool isChange;
+
   const MatchRecord(
       {super.key,
       required this.title,
@@ -25,54 +26,63 @@ class MatchRecord extends StatelessWidget {
       lineXY: 0.0,
       isFirst: true,
       indicatorStyle: IndicatorStyle(
-        indicator: Container(
-          margin: EdgeInsets.symmetric(vertical: 5.h),
-          height: isChange ? 8.h : 20.w,
-          width: isChange ? 8.h : 20.w,
-          decoration: BoxDecoration(
-              shape: BoxShape.circle,
-              color: isChange ? AppColors.grey5 : AppColors.primary500),
-        ),
+        padding: EdgeInsets.symmetric(vertical: 20.h),
+        color: isChange ? AppColors.grey5 : AppColors.primary500,
+        height: isChange ? 8.h : 20.w,
+        width: isChange ? 8.h : 20.w,
+        // indicator: Container(
+        //   margin: EdgeInsets.symmetric(vertical: 5.h),
+        //   height: isChange ? 8.h : 20.w,
+        //   width: isChange ? 8.h : 20.w,
+        //   decoration: BoxDecoration(
+        //       shape: BoxShape.circle,
+        //       color: isChange ? AppColors.grey5 : AppColors.primary500),
+        // ),
       ),
       beforeLineStyle: LineStyle(color: AppColors.grey1, thickness: 2.w),
       // endChild: Padding(
       // padding: EdgeInsets.only(left: 8.w, bottom: 30.h),
       endChild: IntrinsicHeight(
-        child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text(
-                title,
-                style: AppTextStyles.T1Bold13,
-              ),
-              SizedBox(
-                height: 6.h,
-              ),
-              Text(
-                date,
-                style: AppTextStyles.T1Bold12.copyWith(
-                    fontWeight: FontWeight.w500, color: AppColors.grey6),
-              ),
-              SizedBox(
-                height: 10.h,
-              ),
-              Wrap(
-                  direction: Axis.horizontal,
-                  spacing: 10.w,
-                  children: imgList
-                      .map((e) => Container(
-                          height: 60.h,
-                          width: 60.w,
-                          decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(10.r),
-                            image: const DecorationImage(
-                              fit: BoxFit.cover,
-                              image: NetworkImage(tmpBackgroundImg),
-                            ),
-                          )))
-                      .toList())
-            ]),
+        child: Padding(
+          padding: EdgeInsets.only(left: 16.w),
+          child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              // mainAxisAlignment: MainAxisAlignment.end,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                SizedBox(height: 30.h,),
+                Text(
+                  title,
+                  style: AppTextStyles.T1Bold13,
+                ),
+                SizedBox(
+                  height: 6.h,
+                ),
+                Text(
+                  date,
+                  style: AppTextStyles.T1Bold12.copyWith(
+                      fontWeight: FontWeight.w500, color: AppColors.grey6),
+                ),
+                SizedBox(
+                  height: 10.h,
+                ),
+                Wrap(
+                    direction: Axis.horizontal,
+                    spacing: 10.w,
+                    children: imgList
+                        .map((e) => Container(
+                            height: 60.h,
+                            width: 60.w,
+                            decoration: BoxDecoration(
+                              borderRadius: BorderRadius.circular(10.r),
+                              image: const DecorationImage(
+                                fit: BoxFit.cover,
+                                image: NetworkImage(tmpBackgroundImg),
+                              ),
+                            )))
+                        .toList())
+              ]),
+        ),
       ),
       // ),
     );