Skip to content

Commit

Permalink
M3-333 Refactor : group 을 community 로 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
koomin1227 committed Sep 5, 2024
1 parent 44247fc commit de91474
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import 'package:get/get.dart';

import '../models/ranking.dart';

class GroupController extends GetxController {
final RxString groupName = "".obs;
final RxString groupImageUrl = "".obs;
class CommunityController extends GetxController {
final RxString name = "".obs;
final RxString imageUrl = "".obs;

final RxInt memberCount = 0.obs;
final RxInt groupColor = 0.obs;
final RxInt weeklyRanking = 0.obs;
final RxInt communityColor = 0.obs;
final RxInt communityRanking = 0.obs;
final RxInt currentPixelCount = 0.obs;
final RxInt accumulatePixelCount = 0.obs;
final RxInt maxPixelCount = 0.obs;
Expand All @@ -24,12 +24,12 @@ class GroupController extends GetxController {
].obs;

init(int groupId) {
groupName.value = "세종대학교";
groupImageUrl.value =
name.value = "세종대학교";
imageUrl.value =
"https://ground-flip-prod-storage-resized.s3.ap-northeast-2.amazonaws.com/resized-static/42166cf0-b557-42a1-a1fb-d04472ea0ac1%23%23%23622.jpg";
memberCount.value = 3;
groupColor.value = 0xFF0DF69E;
weeklyRanking.value = 534;
communityColor.value = 0xFF0DF69E;
communityRanking.value = 534;
currentPixelCount.value = 124;
accumulatePixelCount.value = 11394;
maxPixelCount.value = 945;
Expand Down
4 changes: 2 additions & 2 deletions lib/controllers/navigation_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';

import '../screens/group_screen.dart';
import '../screens/community_screen.dart';
import '../screens/map_screen.dart';
import '../screens/my_page_screen.dart';
import '../screens/ranking_screen.dart';
Expand All @@ -17,7 +17,7 @@ class NavigationController extends GetxController {
static List<Widget> tabPages = <Widget>[
const MapScreen(),
const RankingScreen(),
const GroupScreen(
const CommunityScreen(
groupId: 1,
isTap: true,
),
Expand Down
37 changes: 19 additions & 18 deletions lib/screens/group_screen.dart → lib/screens/community_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,23 @@ import 'package:flutter_svg/svg.dart';
import 'package:get/get.dart';

import '../constants/app_colors.dart';
import '../controllers/group_controller.dart';
import '../widgets/group/group_action_button.dart';
import '../widgets/group/group_image.dart';
import '../widgets/group/group_info.dart';
import '../widgets/group/group_record.dart';
import '../widgets/group/member/member_list.dart';
import '../controllers/community_controller.dart';
import '../widgets/community/community_action_button.dart';
import '../widgets/community/community_image.dart';
import '../widgets/community/community_info.dart';
import '../widgets/community/community_record.dart';
import '../widgets/community/member/member_list.dart';

class GroupScreen extends StatelessWidget {
class CommunityScreen extends StatelessWidget {
final int groupId;
final bool isTap;

const GroupScreen({super.key, required this.groupId, required this.isTap});
const CommunityScreen(
{super.key, required this.groupId, required this.isTap});

@override
Widget build(BuildContext context) {
final GroupController groupController = Get.put(GroupController());
final CommunityController groupController = Get.put(CommunityController());
groupController.init(groupId);
return CustomScrollView(
slivers: [
Expand Down Expand Up @@ -53,7 +54,7 @@ class GroupScreen extends StatelessWidget {
return FlexibleSpaceBar(
title: top <= 120
? Text(
groupController.groupName.value,
groupController.name.value,
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
Expand All @@ -64,7 +65,7 @@ class GroupScreen extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 10.0),
child: Text(
groupController.groupName.value,
groupController.name.value,
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
Expand All @@ -73,8 +74,8 @@ class GroupScreen extends StatelessWidget {
),
),
),
background: GroupImage(
imageUrl: groupController.groupImageUrl.value,
background: CommunityImage(
imageUrl: groupController.imageUrl.value,
),
collapseMode: CollapseMode.parallax,
);
Expand All @@ -86,15 +87,15 @@ class GroupScreen extends StatelessWidget {
padding: EdgeInsets.all(10),
child: Column(
children: [
GroupInfo(
CommunityInfo(
memberCount: groupController.memberCount,
groupColor: groupController.groupColor,
weeklyRanking: groupController.weeklyRanking,
communityColor: groupController.communityColor,
weeklyRanking: groupController.communityRanking,
),
SizedBox(
height: 20,
),
GroupRecord(
CommunityRecord(
currentPixelCount: groupController.currentPixelCount,
accumulatePixelCount: groupController.accumulatePixelCount,
maxPixelCount: groupController.maxPixelCount,
Expand All @@ -107,7 +108,7 @@ class GroupScreen extends StatelessWidget {
SizedBox(
height: 20,
),
GroupActionButton(
CommunityActionButton(
isJoin: groupController.isJoin.value,
),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
import '../../constants/app_colors.dart';
import '../../constants/text_styles.dart';

class GroupActionButton extends StatelessWidget {
class CommunityActionButton extends StatelessWidget {
final bool isJoin;

const GroupActionButton({super.key, required this.isJoin});
const CommunityActionButton({super.key, required this.isJoin});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';

class GroupImage extends StatelessWidget {
class CommunityImage extends StatelessWidget {
final String imageUrl;

const GroupImage({super.key, required this.imageUrl});
const CommunityImage({super.key, required this.imageUrl});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ import 'package:intl/intl.dart';
import '../../constants/app_colors.dart';
import '../../constants/text_styles.dart';

class GroupInfo extends StatelessWidget {
class CommunityInfo extends StatelessWidget {
final RxInt memberCount;
final RxInt groupColor;
final RxInt communityColor;
final RxInt weeklyRanking;

const GroupInfo({
const CommunityInfo({
super.key,
required this.memberCount,
required this.groupColor,
required this.communityColor,
required this.weeklyRanking,
});

@override
Widget build(BuildContext context) {
return Row(
children: [
GroupInfoElement(
CommunityInfoElement(
title: "멤버",
content: Text(
'${NumberFormat('###,###,###').format(memberCount.value)}명',
Expand All @@ -33,16 +33,16 @@ class GroupInfo extends StatelessWidget {
SizedBox(
width: 10,
),
GroupInfoElement(
CommunityInfoElement(
title: "그룹 색상",
content: GroupColor(
color: groupColor.value,
content: CommunityColor(
color: communityColor.value,
),
),
SizedBox(
width: 10,
),
GroupInfoElement(
CommunityInfoElement(
title: "주간 랭킹",
content: Text(
'${NumberFormat('###,###,###').format(weeklyRanking.value)}등',
Expand All @@ -54,11 +54,11 @@ class GroupInfo extends StatelessWidget {
}
}

class GroupInfoElement extends StatelessWidget {
class CommunityInfoElement extends StatelessWidget {
final String title;
final Widget content;

const GroupInfoElement({
const CommunityInfoElement({
super.key,
required this.title,
required this.content,
Expand Down Expand Up @@ -93,10 +93,10 @@ class GroupInfoElement extends StatelessWidget {
}
}

class GroupColor extends StatelessWidget {
class CommunityColor extends StatelessWidget {
final int color;

const GroupColor({super.key, required this.color});
const CommunityColor({super.key, required this.color});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import 'package:intl/intl.dart';
import '../../constants/app_colors.dart';
import '../../constants/text_styles.dart';

class GroupRecord extends StatelessWidget {
class CommunityRecord extends StatelessWidget {
final RxInt currentPixelCount;
final RxInt accumulatePixelCount;
final RxInt maxPixelCount;
final RxInt maxRankingCount;

const GroupRecord({
const CommunityRecord({
super.key,
required this.currentPixelCount,
required this.accumulatePixelCount,
Expand All @@ -25,15 +25,15 @@ class GroupRecord extends StatelessWidget {
children: [
Row(
children: [
GroupRecordElement(
CommunityRecordElement(
title: "현재 px",
content: currentPixelCount.value,
iconImageUrl: "assets/images/current_pixel_icon.png",
),
SizedBox(
width: 10,
),
GroupRecordElement(
CommunityRecordElement(
title: "누적 px",
content: accumulatePixelCount.value,
iconImageUrl: "assets/images/accumulate_pixel_icon.png",
Expand All @@ -45,15 +45,15 @@ class GroupRecord extends StatelessWidget {
),
Row(
children: [
GroupRecordElement(
CommunityRecordElement(
title: "하루 최대 px",
content: maxPixelCount.value,
iconImageUrl: "assets/images/max_pixel_icon.png",
),
SizedBox(
width: 10,
),
GroupRecordElement(
CommunityRecordElement(
title: "최고 랭킹",
content: maxRankingCount.value,
iconImageUrl: "assets/images/max_ranking_icon.png",
Expand All @@ -65,12 +65,12 @@ class GroupRecord extends StatelessWidget {
}
}

class GroupRecordElement extends StatelessWidget {
class CommunityRecordElement extends StatelessWidget {
final String title;
final int content;
final String iconImageUrl;

const GroupRecordElement({
const CommunityRecordElement({
super.key,
required this.title,
required this.content,
Expand Down
File renamed without changes.

0 comments on commit de91474

Please sign in to comment.