Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔀 :: 반응형 레이아웃 만들기 #187 #236

Merged
merged 16 commits into from
Apr 26, 2024
Merged

🔀 :: 반응형 레이아웃 만들기 #187 #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4225442
feat :: 안내문구 Column Fittbox wrapping
Yoochanhong Apr 25, 2024
44176ca
feat :: 바텀시트 텍스트 fittedBox wrapping
Yoochanhong Apr 25, 2024
fe4d006
feat :: 동작 상태 아이콘 제거, 레이아웃 구조 변경
Yoochanhong Apr 25, 2024
28c0a4a
feat :: 뷰 위젯 별 분리
Yoochanhong Apr 25, 2024
57bf0a5
feat :: 바텀시트 반응형 디자인 적용
Yoochanhong Apr 25, 2024
5ab08c6
feat :: 가로길이 최대한 차지하도록 디자인 수정
Yoochanhong Apr 25, 2024
e69802e
feat :: 텍스트 크기 고정
Yoochanhong Apr 25, 2024
db679d9
feat :: 페이지 이름 가운데로 옮기기
Yoochanhong Apr 25, 2024
a852236
feat :: 빈 컨테이너 채우기
Yoochanhong Apr 25, 2024
9e4ab1f
feat :: osj 텍스트 버튼 기본패딩 제거
Yoochanhong Apr 25, 2024
60820c0
feat :: 바텀시트 크기 제한 해제
Yoochanhong Apr 25, 2024
64cc356
feat :: 세탁실 chips 패딩 추가
Yoochanhong Apr 25, 2024
3a93eaf
remove :: status 버튼 삭제
Yoochanhong Apr 26, 2024
431fca8
feat :: machine card 디자인 수정
Yoochanhong Apr 26, 2024
511a457
feat :: 텍스트 깨짐 방지 FittedBox 추가
Yoochanhong Apr 26, 2024
b89d192
feat :: 설정 페이지 leading 제약조건 해제
Yoochanhong Apr 26, 2024
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
76 changes: 41 additions & 35 deletions lib/presentation/apply_page/ui/view/apply_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart' as s;
import 'package:lotura/main.dart';
import 'package:lotura/presentation/apply_page/bloc/apply_bloc.dart';
import 'package:lotura/presentation/apply_page/bloc/apply_model.dart';
Expand All @@ -19,7 +19,7 @@ class ApplyPage extends StatelessWidget {
ApplyPage({super.key});

final TextStyle bigStyle = TextStyle(
fontSize: 40.0.sp,
fontSize: 30.0.sp,
color: LoturaColors.black,
fontWeight: FontWeight.bold,
);
Expand All @@ -36,24 +36,26 @@ class ApplyPage extends StatelessWidget {
appBar: AppBar(
backgroundColor: LoturaColors.gray100,
elevation: 0.0,
leadingWidth: 200.0.w,
leading: Row(
children: [
SizedBox(width: 24.0.w),
Image.asset(
"assets/applogo.jpeg",
width: 24.0.w,
height: 24.0.h,
),
SizedBox(width: 8.0.w),
Text(
"OSJ",
style: TextStyle(
fontSize: 20.0.sp,
color: LoturaColors.primary700,
fontWeight: FontWeight.bold),
),
],
leadingWidth: MediaQuery.of(context).size.width,
title: Padding(
padding: EdgeInsets.only(left: 10.0.r),
child: Row(
children: [
Image.asset(
"assets/applogo.jpeg",
width: 24.0.w,
height: 24.0.h,
),
SizedBox(width: 8.0.w),
Text(
"OSJ",
style: TextStyle(
fontSize: 20.0.sp,
color: LoturaColors.primary700,
fontWeight: FontWeight.bold),
),
],
),
),
actions: [
IconButton(
Expand Down Expand Up @@ -105,16 +107,17 @@ class ApplyPage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("알림 설정한", style: bigStyle),
Text("세탁기와 건조기", style: bigStyle),
SizedBox(height: 24.0.h),
Text("알림을 설정하여 세탁기와 건조기를", style: smallStyle),
SizedBox(height: 5.0.h),
Text("누구보다 빠르게 사용해보세요.", style: smallStyle),
],
FittedBox(
fit: BoxFit.scaleDown,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("알림 설정한\n세탁기와 건조기", style: bigStyle),
SizedBox(height: 24.0.h),
Text("알림을 설정하여 세탁기와 건조기를\n누구보다 빠르게 사용해보세요.",
style: smallStyle),
],
),
),
SizedBox(height: 20.0.h),
Expanded(
Expand Down Expand Up @@ -173,13 +176,16 @@ class ApplyPage extends StatelessWidget {
.applyList[index * 2 + 1]
.deviceType,
state: CurrentState.working)
: SizedBox(
width: 185.0.w,
height: 256.0.h,
),
: const MachineCard(
//리팩토링 꼭 하기
deviceId: -1,
isEnableNotification: false,
isWoman: true,
deviceType: DeviceType.dry,
state: CurrentState.working)
],
),
SizedBox(height: 10.0.h),
SizedBox(height: 10.0.r),
],
);
},
Expand Down
Loading