kishan.bhuta/Regroup
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

bug fixing

Browse Source
This commit is contained in:
cj201199
2024-07-15 19:27:16 +05:30
parent 47c735da45
commit c45ee2e088
19 changed files with 1237 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart Normal file
View File

@@ -0,0 +1,59 @@
class FetchNotification {
String? status;
int? statusCode;
String? message;
Data? data;
FetchNotification({this.status, this.statusCode, this.message, this.data});
FetchNotification.fromJson(Map<String, dynamic> json) {
status = json['status'];
statusCode = json['status_code'];
message = json['message'];
data = json['data'] != null ? new Data.fromJson(json['data']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['status'] = this.status;
data['status_code'] = this.statusCode;
data['message'] = this.message;
if (this.data != null) {
data['data'] = this.data!.toJson();
}
return data;
}
}
class Data {
int? groupNotification;
int? communityNotification;
int? followerNotification;
int? newFollowerNotification;
int? directMessageNotification;
Data(
{this.groupNotification,
this.communityNotification,
this.followerNotification,
this.newFollowerNotification,
this.directMessageNotification});
Data.fromJson(Map<String, dynamic> json) {
groupNotification = json['group_notification'];
communityNotification = json['community_notification'];
followerNotification = json['follower_notification'];
newFollowerNotification = json['new_follower_notification'];
directMessageNotification = json['direct_message_notification'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['group_notification'] = this.groupNotification;
data['community_notification'] = this.communityNotification;
data['follower_notification'] = this.followerNotification;
data['new_follower_notification'] = this.newFollowerNotification;
data['direct_message_notification'] = this.directMessageNotification;
return data;
}
}

76
lib/Feed Module/Main_Screens/ProfileTab/Settings/Notification.dart
View File

@@ -1,76 +0,0 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
class NotificationScreen extends StatefulWidget {
const NotificationScreen({super.key});
@override
State<NotificationScreen> createState() => _NotificationScreenState();
}
class _NotificationScreenState extends State<NotificationScreen> {
List<bool> switchValues = List.generate(5, (index) => false);
bool swichvalue = false;
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Notifications",
),
body: Stack(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Column(children: [
sizedBoxHeight(20.h),
rowTile(text: "Group notification", index: 0),
commonDivider(),
rowTile(text: "Community notification", index: 1),
commonDivider(),
rowTile(text: "Follower notification", index: 2),
commonDivider(),
rowTile(text: "New follower notification", index: 3),
commonDivider(),
rowTile(text: "Direct message notification", index: 4),
]))
]));
}
Widget rowTile({required String text, required int index}) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h),
child: Row(
children: [
text16w400_FCFCFC(text),
Spacer(),
Transform.scale(
scaleY: 1,
child: CupertinoSwitch(
value: switchValues[index],
trackColor: Colors.white.withOpacity(0.4),
activeColor: Color(0xFF34C759),
onChanged: (bool? value) {
setState(() {
switchValues[index] = value ?? false;
});
},
),
),
],
),
);
}
}

172
lib/Feed Module/Main_Screens/ProfileTab/Settings/View/Notification.dart Normal file
View File

@@ -0,0 +1,172 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/dialogs.dart';
import 'package:regroup/Utils/texts.dart';
class NotificationScreen extends StatefulWidget {
const NotificationScreen({super.key});
@override
State<NotificationScreen> createState() => _NotificationScreenState();
}
class _NotificationScreenState extends State<NotificationScreen> {
var switchValues = List<bool>.generate(5, (index) => false).obs;
void toggleSwitch(int index, bool value) {
switchValues[index] = value;
}
String switchValueFinal(int index) {
return switchValues[index] ? '1' : '0';
}
void switchValueBool() {
final notifications = [
fetchNoti!.data!.groupNotification,
fetchNoti!.data!.communityNotification,
fetchNoti!.data!.followerNotification,
fetchNoti!.data!.newFollowerNotification,
fetchNoti!.data!.directMessageNotification,
];
for (int i = 0; i < notifications.length; i++) {
toggleSwitch(i, notifications[i] == 1);
}
}
Future<void> updateNotification() async {
Map<String, String> updata = {
"group_notification": switchValueFinal(0),
"community_notification": switchValueFinal(1),
"follower_notification": switchValueFinal(2),
"new_follower_notification": switchValueFinal(3),
"direct_message_notification": switchValueFinal(4),
};
final data = await NotificationAPI().notificationPostApi(updata);
if (data.status == ResponseStatus.SUCCESS) {
utils.showToast('Notification updated');
} else {
Get.snackbar(
"Error!",
data.data['message'],
duration: Duration(seconds: 2),
colorText: Colors.white,
backgroundColor: Colors.red,
margin: EdgeInsets.all(8),
snackStyle: SnackStyle.FLOATING,
snackPosition: SnackPosition.BOTTOM,
);
}
}
late Future myfuture;
@override
void initState() {
myfuture = NotificationAPI().getNotification();
super.initState();
}
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Notifications",
),
body: FutureBuilder(
future: myfuture,
builder: (ctx, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return Center(
child: CircularProgressIndicator(
color: Colors.blue,
),
);
}
if (snapshot.hasError) {
return Center(
child: Text(
'${snapshot.error} occurred',
style: TextStyle(fontSize: 18.spMin),
),
);
}
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
switchValueBool();
return Stack(
children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill,
),
),
),
SingleChildScrollView(
child: Column(
children: [
sizedBoxHeight(20.h),
rowTile(text: "Group notification", index: 0),
commonDivider(),
rowTile(text: "Community notification", index: 1),
commonDivider(),
rowTile(text: "Follower notification", index: 2),
commonDivider(),
rowTile(text: "New follower notification", index: 3),
commonDivider(),
rowTile(text: "Direct message notification", index: 4),
],
),
),
],
);
}
return Container();
},
),
);
}
Widget rowTile({required String text, required int index}) {
return Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h),
child: Row(
children: [
text16w400_FCFCFC(text),
Spacer(),
Obx(
() => Transform.scale(
scaleY: 1,
child: CupertinoSwitch(
value: switchValues[index],
trackColor: Colors.white.withOpacity(0.4),
activeColor: Color(0xFF34C759),
onChanged: (bool? value) {
toggleSwitch(index, value ?? false);
updateNotification();
},
),
),
),
],
),
);
}
}

54
lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart Normal file
View File

@@ -0,0 +1,54 @@
import 'package:regroup/Common/api_urls.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Common/controller/data/network/network_api.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart';
FetchNotification? fetchNoti;
class NotificationAPI {
NotificationAPI();
// class otpAPI {
// otpAPI(this.data);
// var data;
Future<ResponseData<dynamic>> notificationPostApi(var data) async {
final response = await NetworkApiServices().postApi(
data,
ApiUrls.postnotification,
// "https://regroup.betadelivery.com/api/v1/forgot-password",
);
if (response.status == ResponseStatus.SUCCESS) {
//Map<String, dynamic> responseData = jsonDecode(response.data);
if (response.data['status'] == "success") {
return ResponseData<dynamic>(
response.data['message'], ResponseStatus.SUCCESS,
// data: response.data
);
} else {
return ResponseData<dynamic>(
response.data['message'], ResponseStatus.FAILED);
}
}
return response;
}
Future<ResponseData<dynamic>> getNotification() async {
final response = await NetworkApiServices().getApi(
ApiUrls.getnotification,
);
fetchNoti = FetchNotification.fromJson(response.data);
if (response.status == ResponseStatus.SUCCESS) {
if (response.data['success'] == true) {
return ResponseData<dynamic>(
response.data['message'], ResponseStatus.SUCCESS,
data: response.data);
} else {
return ResponseData<dynamic>(
response.data['message'], ResponseStatus.FAILED);
}
}
return response;
}
}

82
lib/Feed Module/sidemenu/Community/Announcements/View/Announcements.dart
View File

@@ -50,46 +50,48 @@ class _AnnouncementsState extends State<Announcements> {
titleTxt: "Announcements",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(25.h),
Row(
children: [
Spacer(),
InkWell(
onTap: () {
Get.toNamed(RouteName.announcementrequest);
},
child: text16w700_FCFCFCUnderline(
"View announcement requests"),
),
],
),
sizedBoxHeight(30.h),
Column(
children: List.generate(announcement.length, (index) {
return Column(
children: [
announcementWidget(
imagepath: announcement[index]["imagepath"],
title: announcement[index]["title"],
date: announcement[index]["date"],
subtitle: announcement[index]["subtitle"]),
sizedBoxHeight(16.h)
],
);
}),
)
]))))
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(25.h),
Row(
children: [
Spacer(),
InkWell(
onTap: () {
Get.toNamed(RouteName.announcementrequest);
},
child: text16w700_FCFCFCUnderline(
"View announcement requests"),
),
],
),
sizedBoxHeight(30.h),
Column(
children: List.generate(announcement.length, (index) {
return Column(
children: [
announcementWidget(
imagepath: announcement[index]["imagepath"],
title: announcement[index]["title"],
date: announcement[index]["date"],
subtitle: announcement[index]["subtitle"]),
sizedBoxHeight(16.h)
],
);
}),
)
])),
),
]),
floatingActionButton: Container(
height: 55.h,