Skip to content

Commit

Permalink
Merge pull request #102 from Fam-Story/refactor/98-refactor-기본-ui-기능-수정
Browse files Browse the repository at this point in the history 
Refactor/98 refactor 기본 UI 기능 수정 (#98)
  • Loading branch information
@JINOJ37
JINOJ37 authored Dec 11, 2023
2 parents 5e7fcc4 + 25c10e5 commit bcf6d2b
Show file tree
Hide file tree
Showing 6 changed files with 477 additions and 330 deletions.
70 changes: 43 additions & 27 deletions lib/pages/alarm_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,11 @@ class _AlarmPageState extends State<AlarmPage> with TickerProviderStateMixin {
late Future<FamilyMemberModel> _familyMember;
int familyMemberId = 0;


@override
void initState() {
super.initState();
}



@override
Widget build(BuildContext context) {
familyMemberId = context.watch<IdProvider>().familyMemberId;
Expand Down Expand Up @@ -110,61 +107,79 @@ class _AlarmPageState extends State<AlarmPage> with TickerProviderStateMixin {
children: <Widget>[
Container(
child: FutureBuilder<List<FamilyInteractionModel>>(
future: FamilyInteractionApiService.getFamilyInteraction(familyMemberId), // Replace with your actual data-fetching method
future: FamilyInteractionApiService.getFamilyInteraction(
familyMemberId), // Replace with your actual data-fetching method
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
if (snapshot.connectionState ==
ConnectionState.waiting) {
// While data is being fetched, show a loading indicator
return CircularProgressIndicator();
} else if (snapshot.hasError) {
// If there's an error, display an error message
return Text('Error: ${snapshot.error}');
} else if (!snapshot.hasData || snapshot.data!.isEmpty) {
} else if (!snapshot.hasData ||
snapshot.data!.isEmpty) {
// If no data is available, display a message indicating no interactions
return Container(
height: 450,
child: Center(child: Text('No reactions yet.')));
child:
Center(child: Text('No reactions yet.')));
} else {
// Data has been successfully fetched, display the interactions
List<FamilyInteractionModel> interactions = snapshot.data!;
List<FamilyInteractionModel> interactions =
snapshot.data!;

return ListView.builder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemCount: interactions.length,
itemBuilder: (BuildContext context, int index) {
final item = interactions[interactions.length - 1 - index];
final item = interactions[
interactions.length - 1 - index];
bool isChecked = item.isChecked == 0;
return Container(
height: 60,
color: isChecked ? Colors.white : Colors.grey[200],
color: isChecked
? Colors.white
: Colors.grey[200],
child: Row(
children: [
SizedBox(width: 10),
CircleAvatar(
radius: 20,
child: ClipOval(
child: Center(
child: Image.asset(
getRoleImage(item.srcMemberRole),
fit: BoxFit.fill,
width: 40, // 원하는 너비로 조절
height: 40, // 원하는 높이로 조절
Opacity(
opacity: isChecked ? 1.0 : 0.3,
child: CircleAvatar(
radius: 20,
child: ClipOval(
child: Center(
child: Image.asset(
getRoleImage(
item.srcMemberRole),
fit: BoxFit.fill,
width: 40, // 원하는 너비로 조절
height: 40, // 원하는 높이로 조절
),
),
),
),
),
SizedBox(width: 10),
CircleAvatar(
radius: 12,
child: ClipOval(
child: getImageForInteractionType(item.interactionType),
Opacity(
opacity: isChecked ? 1.0 : 0.3,
child: CircleAvatar(
radius: 12,
child: ClipOval(
child: getImageForInteractionType(
item.interactionType),
),
),
),
SizedBox(width: 10),
SizedBox(width: 10),
Text(
"${item.srcMemberNickname} ${getInteractionTypeText(item.interactionType)}",
style: TextStyle(
color: item.isChecked == 0 ? Colors.black : Colors.grey[400],
color: item.isChecked == 0
? Colors.black
: Colors.grey[400],
fontWeight: FontWeight.bold,
fontSize: 16,
),
Expand All @@ -178,7 +193,6 @@ class _AlarmPageState extends State<AlarmPage> with TickerProviderStateMixin {
},
),
)

],
),
),
Expand All @@ -195,7 +209,8 @@ class _AlarmPageState extends State<AlarmPage> with TickerProviderStateMixin {
ElevatedButton(
onPressed: () async {
try {
FamilyInteractionApiService.deleteFamilyInteraction(familyMemberId);
FamilyInteractionApiService.deleteFamilyInteraction(
familyMemberId);
Navigator.pop(context);
} catch (e) {
print(e.toString());
Expand Down Expand Up @@ -225,6 +240,7 @@ class _AlarmPageState extends State<AlarmPage> with TickerProviderStateMixin {
),
);
}

String getInteractionTypeText(int interactionType) {
switch (interactionType) {
case 4:
Expand Down
13 changes: 0 additions & 13 deletions lib/pages/chat_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,6 @@ class _ChatPageState extends State<ChatPage> {
),
],
),
Row(
children: [
IconButton(
onPressed: () {},
icon: const Icon(Icons.more_horiz),
color: AppColor.swatchColor,
iconSize: 35,
),
const SizedBox(
width: 20,
),
],
)
],
),
Expanded(
Expand Down
3 changes: 3 additions & 0 deletions lib/pages/home_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ class _HomePageState extends State<HomePage> {
void initState() {
super.initState();
_initData().then((_) {});
setState(() {
context.read<IdProvider>().nickname;
});
}

Future<void> _initData() async {
Expand Down
Loading

0 comments on commit bcf6d2b

Please sign in to comment.