Skip to content

Commit ddb259f

Browse files
PratikdatePratikdate
authored
Merge branch 'main' into issue#38
2 parents 1d00694 + e882b93 commit ddb259f

17 files changed

+181
-159
lines changed

‎.dart_tool/flutter_build/66ceb40382a267b5ece76ea3a82746dc/.filecache

+1-1
Large diffs are not rendered by default.

‎.dart_tool/flutter_build/66ceb40382a267b5ece76ea3a82746dc/app.dill

1.49 KB
Binary file not shown.

‎.dart_tool/flutter_build/66ceb40382a267b5ece76ea3a82746dc/debug_android_application.stamp

+1-1
Large diffs are not rendered by default.

‎.dart_tool/flutter_build/66ceb40382a267b5ece76ea3a82746dc/flutter_assets.d

+1-1
Large diffs are not rendered by default.

‎.dart_tool/flutter_build/66ceb40382a267b5ece76ea3a82746dc/kernel_snapshot.d

+1-1
Large diffs are not rendered by default.

‎.dart_tool/flutter_build/66ceb40382a267b5ece76ea3a82746dc/kernel_snapshot.stamp

+1-1
Large diffs are not rendered by default.

‎.flutter-plugins-dependencies

+2-1
Large diffs are not rendered by default.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Help us build Svanugrahaka even better! We thrive on community contributions. He
7575

7676
<img src="https://imgur.com/wuiJXqr.png"/>
7777
*Thank you for being a part of the monitor project.*
78-
78+
* see you again*
7979
*And don't forget to give a star to repo*
8080

8181
*For more information, join monitor discord server* [monitor server](https://discord.gg/JK4qnXSZ)

‎android/app/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,10 @@ flutter {
7373

7474
dependencies {
7575
//manual
76-
implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
76+
implementation(platform("com.google.firebase:firebase-bom:23.1.0"))
7777
implementation("com.google.firebase:firebase-analytics")
7878
implementation 'com.android.support:multidex:1.0.3'
79+
implementation("com.google.firebase:firebase-auth")
7980
implementation("com.google.firebase:firebase-firestore")
8081

8182

‎lib/Controller/Profile/ProfileController.dart

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ class ProfileController extends GetxController {
88

99
var userProfile = Rxn<DocumentSnapshot>();
1010

11+
1112
@override
1213
void onInit() {
1314
super.onInit();

‎lib/View/analysis_screen.dart

+17-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class AnalysisScreen extends StatelessWidget {
2424
Widget build(BuildContext context) {
2525
return Scaffold(
2626
appBar: AppBar(
27-
toolbarHeight: 20.r,
27+
toolbarHeight: 24.r,
2828
leadingWidth: MediaQuery.of(context).size.width,
2929
backgroundColor: ColorHandler.bgColor,
3030
),
@@ -73,8 +73,22 @@ class AnalysisScreen extends StatelessWidget {
7373
()=>Container(
7474

7575
height: controller.height.value,
76-
decoration: const ShapeDecoration(
77-
color: ColorHandler.yellow,
76+
decoration: ShapeDecoration(
77+
//color: ColorHandler.bgColor,
78+
//
79+
shadows: [
80+
BoxShadow(
81+
color: ColorHandler.normalFont.withOpacity(0.2),
82+
spreadRadius: 5,
83+
blurRadius: 7,
84+
offset: Offset(0, 1), // changes position of shadow
85+
),
86+
BoxShadow(
87+
color: ColorHandler.bgColor.withOpacity(0.8),
88+
// spreadRadius: 5,
89+
// blurRadius: 7,
90+
//offset: Offset(0, 3), // changes position of shadow
91+
),],
7892

7993
shape: RoundedRectangleBorder(
8094
borderRadius: BorderRadius.vertical(

‎lib/View/subscreen/Comunity/ChatScreenHandler.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,7 @@ class ChatScreenHandler extends StatelessWidget {
221221
)
222222
: null,
223223
body: Obx(
224-
() =>controller.messages.isEmpty
225-
? Center(child: CircularProgressIndicator())
226-
: Chat(
224+
() =>Chat(
227225
messages: controller.messages.reversed.toList(),
228226
bubbleBuilder: _bubbleBuilder,
229227
onAttachmentPressed: () =>

‎lib/View/subscreen/Comunity/SocialPost.dart

+120-142
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
21
import 'package:flutter/material.dart';
32
import 'package:flutter_screenutil/flutter_screenutil.dart';
43
import 'package:video_player/video_player.dart';
54
import '../../../Resource/color_handler.dart';
65
import '../../../Resource/font-handler.dart';
76
import '../../widges/VideoPlayerScreen.dart';
87

9-
10-
118
class SocialPage extends StatefulWidget {
129
const SocialPage({super.key});
1310

@@ -16,166 +13,147 @@ class SocialPage extends StatefulWidget {
1613
}
1714

1815
class _LearningPageState extends State<SocialPage> {
19-
20-
21-
MaterialStatesController _materialStatesController=MaterialStatesController();
22-
23-
Widget buttonElevated(final text,dynamic onPress,) {
24-
return
25-
Padding(
26-
padding: const EdgeInsets.symmetric(horizontal: 10),
27-
child: ElevatedButton(
28-
statesController: _materialStatesController,
29-
autofocus: true,
30-
style: ButtonStyle(
31-
backgroundColor: MaterialStateProperty.resolveWith((states) {
32-
// If the button is pressed, return green, otherwise blue
33-
if (states.contains(MaterialState.pressed)) {
34-
return ColorHandler.bgColor.withOpacity(0.8);
35-
}
36-
return ColorHandler.normalFont.withOpacity(0.2);
37-
}),
38-
39-
),
40-
onPressed: onPress,
41-
child: FontHandler(text,color: ColorHandler.normalFont.withOpacity(0.6), textAlign:TextAlign.center,fontsize: 12,),//function
42-
43-
16+
MaterialStatesController _materialStatesController = MaterialStatesController();
17+
18+
Widget buttonElevated(final text, dynamic onPress) {
19+
return Padding(
20+
padding: const EdgeInsets.symmetric(horizontal: 10),
21+
child: ElevatedButton(
22+
statesController: _materialStatesController,
23+
autofocus: true,
24+
style: ButtonStyle(
25+
backgroundColor: MaterialStateProperty.resolveWith((states) {
26+
if (states.contains(MaterialState.pressed)) {
27+
return ColorHandler.bgColor.withOpacity(0.8);
28+
}
29+
return ColorHandler.normalFont.withOpacity(0.2);
30+
}),
4431
),
45-
);
32+
onPressed: onPress,
33+
child: FontHandler(
34+
text,
35+
color: ColorHandler.normalFont.withOpacity(0.6),
36+
textAlign: TextAlign.center,
37+
fontsize: 12,
38+
), //function
39+
),
40+
);
4641
}
47-
48-
49-
Widget Thumbnails(){
42+
43+
Widget Thumbnails(BuildContext context) {
5044
return Container(
5145
child: Column(
5246
children: [
5347
InkWell(
54-
onTap: (){
55-
Navigator.push(context, MaterialPageRoute(builder: (context)=>VideoPlayerScreen()));
48+
onTap: () {
49+
Navigator.push(context,
50+
MaterialPageRoute(builder: (context) => VideoPlayerScreen()));
5651
},
57-
child: Image.network("https://www.wowmakers.com/static/e743f3689ca0c0bac8faab39023da37f/4cb25/Video-thumbnail.jpg",width:600 ,height:200 ,)),
58-
59-
Row(
60-
children: [
61-
Padding(
62-
padding: EdgeInsets.only(left:10.sp,right: 10.sp),
63-
child: SizedBox(
64-
width: 45.sp,
65-
height: 45.sp,
66-
child: ClipRRect(
67-
borderRadius: BorderRadius.circular(100.sp),
68-
child: Image(
69-
image: AssetImage("assets/img1.jpg"),
70-
fit: BoxFit.fill,
71-
),
52+
child: Image.network(
53+
"https://www.wowmakers.com/static/e743f3689ca0c0bac8faab39023da37f/4cb25/Video-thumbnail.jpg",
54+
width: MediaQuery.of(context).size.width * 0.9,
55+
height: 200,
56+
fit: BoxFit.cover,
57+
),
58+
),
59+
Row(
60+
children: [
61+
Padding(
62+
padding: EdgeInsets.only(left: 15.sp, right: 10.sp),
63+
child: SizedBox(
64+
width: 45.sp,
65+
height: 45.sp,
66+
child: ClipRRect(
67+
borderRadius: BorderRadius.circular(100.sp),
68+
child: Image(
69+
image: AssetImage("assets/img1.jpg"),
70+
fit: BoxFit.fill,
7271
),
7372
),
7473
),
75-
Container(
76-
padding: EdgeInsets.only(top:10.sp,bottom: 10.sp),
77-
74+
),
75+
Expanded(
76+
child: Container(
77+
padding: EdgeInsets.only(top: 10.sp, bottom: 10.sp),
7878
child: Column(
79-
crossAxisAlignment: CrossAxisAlignment.start,
80-
children: [
81-
SizedBox(
82-
width:MediaQuery.of(context).size.width-90.w,
83-
child: Text(
84-
"Sizing elements to percentage of screen width/height",
85-
textAlign: TextAlign.left,
86-
maxLines: 3,
87-
style: TextStyle(
88-
color: ColorHandler.normalFont,
89-
fontSize: 15
90-
91-
),
92-
93-
),
79+
crossAxisAlignment: CrossAxisAlignment.start,
80+
children: [
81+
Text(
82+
"Sizing elements to percentage of screen width/height",
83+
textAlign: TextAlign.left,
84+
maxLines: 3,
85+
style: TextStyle(
86+
color: ColorHandler.normalFont,
87+
fontSize: 15,
9488
),
95-
Row(
96-
crossAxisAlignment: CrossAxisAlignment.start,
97-
children: [
98-
FontHandler("by Pratik Date", color: ColorHandler.normalFont.withOpacity(0.6), textAlign: TextAlign.start),
99-
SizedBox(width: 10.sp,),
100-
FontHandler("views 20", color: ColorHandler.normalFont.withOpacity(0.6), textAlign: TextAlign.start),
101-
102-
],
103-
)
104-
105-
106-
]),
89+
),
90+
Row(
91+
crossAxisAlignment: CrossAxisAlignment.start,
92+
children: [
93+
FontHandler("by Pratik Date",
94+
color: ColorHandler.normalFont.withOpacity(0.6),
95+
textAlign: TextAlign.start),
96+
SizedBox(
97+
width: 10.sp,
98+
),
99+
FontHandler("views 20",
100+
color: ColorHandler.normalFont.withOpacity(0.6),
101+
textAlign: TextAlign.start),
102+
],
103+
)
104+
],
105+
),
107106
),
108-
109-
],
110-
),
111-
107+
),
108+
],
109+
),
112110
],
113111
),
114112
);
115-
}
116-
117-
113+
}
118114

119115
@override
120116
Widget build(BuildContext context) {
121-
122-
123-
return Column(
124-
children: [
125-
Container(
126-
padding: EdgeInsets.symmetric(horizontal: 10) ,
127-
width: MediaQuery.of(context).size.width,
128-
child: SingleChildScrollView(
129-
scrollDirection: Axis.horizontal,
130-
child: Column(
131-
children: [
132-
Row(
133-
mainAxisAlignment: MainAxisAlignment.spaceBetween,
134-
children: [
135-
buttonElevated("All",(){}),
136-
137-
buttonElevated("News",(){}),
138-
buttonElevated("Podcast",(){}),
139-
buttonElevated("Events",(){}),
140-
141-
142-
],
143-
),
144-
145-
146-
147-
],
117+
return LayoutBuilder(
118+
builder: (context, constraints) {
119+
return Column(
120+
children: [
121+
Container(
122+
padding: EdgeInsets.symmetric(horizontal: 10),
123+
width: constraints.maxWidth,
124+
child: SingleChildScrollView(
125+
scrollDirection: Axis.horizontal,
126+
child: Row(
127+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
128+
children: [
129+
buttonElevated("All", () {}),
130+
buttonElevated("News", () {}),
131+
buttonElevated("Podcast", () {}),
132+
buttonElevated("Events", () {}),
133+
],
134+
),
148135
),
149-
150-
151-
)
152-
),
153-
154-
155-
156-
SizedBox(
157-
height: 0.64.sh,
158-
child: SingleChildScrollView(
159-
scrollDirection: Axis.vertical,
160-
padding: EdgeInsets.only(top: 20.sp),
161-
child: Column(
162-
children: [
163-
Thumbnails(),
164-
Thumbnails(),
165-
Thumbnails(),
166-
Thumbnails(),
167-
Thumbnails(),
168-
Thumbnails(),
169-
170-
],
171136
),
172-
),
173-
),
174-
],
137+
SizedBox(
138+
height: 0.64.sh,
139+
child: SingleChildScrollView(
140+
scrollDirection: Axis.vertical,
141+
padding: EdgeInsets.only(top: 20.sp),
142+
child: Column(
143+
children: [
144+
Thumbnails(context),
145+
Thumbnails(context),
146+
Thumbnails(context),
147+
Thumbnails(context),
148+
Thumbnails(context),
149+
Thumbnails(context),
150+
],
151+
),
152+
),
153+
),
154+
],
155+
);
156+
},
175157
);
176158
}
177159
}
178-
179-
180-
181-

‎lib/View/subscreen/authenticat/twitter.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class _TwitterAuthState extends State<TwitterAuth> {
6060
final twitterLogin = TwitterLogin(
6161
apiKey: apiKey,
6262
apiSecretKey: apiSecretKey,
63-
redirectURI: 'com.example.ecard://',
63+
redirectURI: 'https://personalbrand-a789e.firebaseapp.com/__/auth/handler',
6464
);
6565

6666
final authResult = await twitterLogin.loginV2();

0 commit comments

Comments
 (0)