Skip to content

Dev #451

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

Merged
slz6k merged 4 commits into from
May 18, 2026
Merged

Dev #451

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
223ab04
feat(wedu): 참여 중인 같이방 영역 접기/펼치기 기능 추가
May 18, 2026
d639950
feat(wedu): 참여 중인 같이방 없을 때 빈 상태 UI 추가
May 18, 2026
6de3157
feat(wedu): 같이방 탭 빈 상태 UI 및 버튼 노출 조건 개선
May 18, 2026
5bde8a0
Merge pull request #450 from Peeroreum/fix/#428
slz6k May 18, 2026
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
278 changes: 152 additions & 126 deletions lib/screens/wedu/wedu_home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:peeroreum_client/designs/PeeroreumToast.dart';
import 'package:get/get.dart';
import 'package:peeroreum_client/api/ApiClient.dart';
import 'package:peeroreum_client/designs/PeeroreumColor.dart';
import 'package:peeroreum_client/designs/PeeroreumTypo.dart';
import 'package:peeroreum_client/screens/alert/alert_view.dart';
import 'package:peeroreum_client/screens/wedu/wedu_create_screen.dart';
import 'package:peeroreum_client/screens/wedu/wedu_in.dart';
Expand Down Expand Up @@ -77,7 +78,7 @@ class _HomeWeduState extends State<HomeWedu> {
!_isLoading) {
loadMoreData();
}
if (_scrollController.offset ==
if (_scrollController.offset <=
_scrollController.position.minScrollExtent) {
setState(() {
_isUp = true;
Expand Down Expand Up @@ -293,75 +294,162 @@ class _HomeWeduState extends State<HomeWedu> {
}

Widget bodyWidget() {
return Scaffold(
backgroundColor: PeeroreumColor.white,
appBar: roomBody(),
body: NestedScrollView(
physics: const AlwaysScrollableScrollPhysics(),
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[
if (inRoomData.isNotEmpty)
SliverAppBar(
expandedHeight: 200,
pinned: false,
floating: true,
backgroundColor: PeeroreumColor.white,
elevation: 0,
flexibleSpace: LayoutBuilder(
builder:
(BuildContext context, BoxConstraints constraints) {
return FlexibleSpaceBar(
collapseMode: CollapseMode.parallax,
background: Column(
children: [
SizedBox(
height: 180,
child: inRoomBody(),
),
const SizedBox(
height: 20,
),
],
),
);
},
),
),
];
return Column(
children: [
GestureDetector(
behavior: HitTestBehavior.translucent,
onVerticalDragEnd: (details) {
final dy = details.velocity.pixelsPerSecond.dy;
if (dy < -200 && _isUp) {
setState(() => _isUp = false);
} else if (dy > 200 && !_isUp) {
setState(() => _isUp = true);
}
},
body: data.isEmpty
? Column(
crossAxisAlignment: CrossAxisAlignment.center,
child: Column(
children: [
Padding(
padding:
const EdgeInsets.symmetric(vertical: 16, horizontal: 20),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
sliver(),
Image.asset(
'assets/images/no_wedu_oreum.png',
width: 150,
Row(
children: [
T3_18px(
text: '참여 중인 같이방',
color: PeeroreumColor.gray[800],
),
const SizedBox(width: 4),
Text(
'${inRoomData.length}',
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 18,
fontWeight: FontWeight.w600,
color: PeeroreumColor.gray[600],
),
),
],
),
const Text(
'찾으시는 같이방이 없어요 🥲',
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 20,
fontWeight: FontWeight.w600,
color: PeeroreumColor.black,
GestureDetector(
onTap: () => Get.to(() => const InWedu()),
child: Text(
'전체보기',
style: TextStyle(
fontFamily: 'Pretendard',
fontWeight: FontWeight.w600,
fontSize: 14,
color: PeeroreumColor.gray[500],
),
),
),
],
)
: Column(
children: [
sliver(),
Container(
height: _isUp ? 0 : 1,
color: PeeroreumColor.gray[200],
),
Expanded(child: listViewBody()),
const SizedBox(
height: 8,
),
),
AnimatedContainer(
duration: const Duration(milliseconds: 150),
curve: Curves.easeInOut,
height: _isUp ? 200 : 0,
child: ClipRect(
child: OverflowBox(
maxHeight: 200,
alignment: Alignment.topCenter,
child: inRoomData.isEmpty
? SizedBox(
height: 200,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const T4_16px(
text: '참여 중인 같이방이 없어요',
color: PeeroreumColor.black),
const SizedBox(height: 20),
GestureDetector(
onTap: () => Get.to(() => CreateWedu()),
child: Container(
padding: const EdgeInsets.symmetric(
vertical: 8, horizontal: 16),
decoration: BoxDecoration(
color: PeeroreumColor.primaryPuple[400],
borderRadius: BorderRadius.circular(8),
),
child: const T4_16px(
text: '같이방 만들러 가기',
color: PeeroreumColor.white),
),
),
],
),
)
: Column(
children: [
SizedBox(height: 180, child: inRoomBody()),
const SizedBox(height: 20),
],
),
),
),
),
],
),
),
GestureDetector(
behavior: HitTestBehavior.translucent,
onVerticalDragEnd: (details) {
final dy = details.velocity.pixelsPerSecond.dy;
if (dy < -200 && _isUp) {
setState(() => _isUp = false);
} else if (dy > 200 && !_isUp) {
setState(() => _isUp = true);
}
},
child: sliver(),
),
Container(height: _isUp ? 0 : 1, color: PeeroreumColor.gray[200]),
if (data.isEmpty)
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Image.asset(
'assets/images/no_wedu_oreum.png',
width: 150,
),
const Text(
'찾으시는 같이방이 없어요 🥲',
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 20,
fontWeight: FontWeight.w600,
color: PeeroreumColor.black,
),
),
if (inRoomData.isNotEmpty) ...[
const SizedBox(height: 20),
GestureDetector(
onTap: () => Get.to(() => CreateWedu()),
child: Container(
padding: const EdgeInsets.symmetric(
vertical: 8, horizontal: 16),
decoration: BoxDecoration(
color: PeeroreumColor.primaryPuple[400],
borderRadius: BorderRadius.circular(8),
),
child: const T4_16px(
text: '같이방 만들러 가기',
color: PeeroreumColor.white),
),
],
)),
),
],
],
),
)
else ...[
Expanded(child: listViewBody()),
const SizedBox(height: 8),
],
],
);
}

Expand All @@ -377,76 +465,14 @@ class _HomeWeduState extends State<HomeWedu> {
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'같이방',
style: TextStyle(
color: PeeroreumColor.gray[800],
fontSize: 18,
fontWeight: FontWeight.w600,
fontFamily: 'Pretendard',
),
),
],
children: [T3_18px(text: '같이방', color: PeeroreumColor.gray[800])],
),
),
dropDownBody(),
],
);
}

PreferredSizeWidget roomBody() {
return AppBar(
backgroundColor: PeeroreumColor.white,
shadowColor: Colors.transparent,
surfaceTintColor: Colors.transparent,
elevation: 0,
titleSpacing: 0,
automaticallyImplyLeading: false,
title: Padding(
padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 20),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
const Text(
"참여 중인 같이방",
style: TextStyle(
color: PeeroreumColor.black,
fontFamily: 'Pretendard',
fontSize: 18,
fontWeight: FontWeight.w600),
),
const SizedBox(
width: 4,
),
Text(
'${inRoomData.length}',
style: TextStyle(
fontFamily: 'Pretendard',
fontSize: 18,
fontWeight: FontWeight.w600,
color: PeeroreumColor.gray[600]),
),
],
),
GestureDetector(
onTap: () {
Get.to(() => const InWedu());
},
child: Text('전체보기',
style: TextStyle(
fontFamily: 'Pretendard',
fontWeight: FontWeight.w600,
fontSize: 14,
color: PeeroreumColor.gray[500])))
],
),
),
);
}

Widget inRoomBody() {
return FutureBuilder<void>(
future: fetchInWeduData(),
Expand Down
Loading