Skip to content
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

Jump to bottom

Fixed Overflow Bugs & Updated To 2.5.2 #12

Merged
merged 5 commits into from Oct 25, 2021
Merged

Fixed Overflow Bugs & Updated To 2.5.2 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2467ed0
base infos fixed
Abdusin Oct 9, 2021
9e36774
Get Page Route System Updated
Abdusin Oct 9, 2021
2cdccd6
Fixed Design Bugs
Abdusin Oct 9, 2021
a985a20
Deleted unused import
Abdusin Oct 9, 2021
128900f
Bottom Sheet System Update & Other Changes
Abdusin Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 14 additions & 20 deletions lib/BottomSheets/bottom_sheets.dart
View file
Open in desktop
@@ -1,29 +1,23 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:taskez/Values/values.dart';
import 'package:taskez/widgets/BottomSheets/project_detail_sheet.dart';

class TaskezBottomSheet {
static const MethodChannel _channel = MethodChannel('taskezBottomSheet');
// static const MethodChannel _channel = MethodChannel('taskezBottomSheet');
}

showSettingsBottomSheet(context) {
showModalBottomSheet(
isScrollControlled: true,
context: context,
backgroundColor: AppColors.primaryBackgroundColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(20),
showSettingsBottomSheet() => showAppBottomSheet(ProjectDetailBottomSheet());

showAppBottomSheet(Widget widget, {bool isScrollControlled = false, bool popAndShow = false, double? height}) {
if (popAndShow) Get.back();
return Get.bottomSheet(height == null ? widget : Container(height: height, child: widget),
backgroundColor: AppColors.primaryBackgroundColor,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(20),
),
),
),
clipBehavior: Clip.antiAliasWithSaveLayer,
builder: (BuildContext context) {
return Container(
// padding: EdgeInsets.only(bottom: 20),
height: Utils.screenHeight * 1.4,
decoration: BoxDecoration(),
child: ProjectDetailBottomSheet());
},
);
clipBehavior: Clip.antiAliasWithSaveLayer,
isScrollControlled: isScrollControlled);
}
72 changes: 29 additions & 43 deletions lib/Screens/Auth/choose_plan.dart
View file
Open in desktop
Expand Up @@ -52,29 +52,24 @@ class ChoosePlan extends StatelessWidget {
Text('Choose Plan', style: AppTextStyles.header2),
AppSpaces.verticalSpace10,
Text('Unlock all features with Premium Plan',
style: GoogleFonts.lato(
fontSize: 14,
color: HexColor.fromHex("666A7A"))),
style: GoogleFonts.lato(fontSize: 14, color: HexColor.fromHex("666A7A"))),
AppSpaces.verticalSpace20,
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
PlanCard(
notifierValue: _planContainerTrigger,
selectedIndex: 0,
header: "It's Free",
subHeader: "For team\nfrom 1 - 5",
),
PlanCard(
notifierValue: _planContainerTrigger,
selectedIndex: 1,
header: "Premium",
subHeader: "\$19/mo")
]),
Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
PlanCard(
notifierValue: _planContainerTrigger,
selectedIndex: 0,
header: "It's Free",
subHeader: "For team\nfrom 1 - 5",
),
AppSpaces.horizontalSpace20,
PlanCard(
notifierValue: _planContainerTrigger,
selectedIndex: 1,
header: "Premium",
subHeader: "\$19/mo")
]),
AppSpaces.verticalSpace20,
Text('Enable Features',
style: AppTextStyles.header2),
Text('Enable Features', style: AppTextStyles.header2),
AppSpaces.verticalSpace10,
Container(
width: Utils.screenWidth * 0.8,
Expand All @@ -87,10 +82,7 @@ class ChoosePlan extends StatelessWidget {
'You can customize the features in your workspace now. Or you can do it later in ',
style: GoogleFonts.lato(fontSize: 14, color: HexColor.fromHex("666A7A")),
children: <TextSpan>[
TextSpan(
text: 'Menu - Workspace',
style: TextStyle(
color: Colors.white))
TextSpan(text: 'Menu - Workspace', style: TextStyle(color: Colors.white))
]),
),
],
Expand All @@ -102,9 +94,7 @@ class ChoosePlan extends StatelessWidget {
notifierValue: _multiUserTrigger,
icon: Icons.groups),
ToggleLabelOption(
label: ' Custom Labels',
notifierValue: _customLabelTrigger,
icon: Icons.category)
label: ' Custom Labels', notifierValue: _customLabelTrigger, icon: Icons.category)
],
))),
)))
Expand All @@ -114,21 +104,17 @@ class ChoosePlan extends StatelessWidget {
child: Container(
padding: EdgeInsets.only(left: 40, right: 20),
width: Utils.screenWidth,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('Back',
style: GoogleFonts.lato(
color: HexColor.fromHex("616575"),
fontSize: 16,
fontWeight: FontWeight.bold)),
PrimaryProgressButton(
width: 120,
label: "Done",
callback: () {
Get.to(Timeline());
})
]),
child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Text('Back',
style:
GoogleFonts.lato(color: HexColor.fromHex("616575"), fontSize: 16, fontWeight: FontWeight.bold)),
PrimaryProgressButton(
width: 120,
label: "Done",
callback: () {
Get.to(() => Timeline());
})
]),
))
]));
}
Expand Down
18 changes: 5 additions & 13 deletions lib/Screens/Auth/email_address.dart
View file
Open in desktop
Expand Up @@ -29,21 +29,15 @@ class _EmailAddressScreenState extends State<EmailAddressScreen> {
Positioned(
top: Utils.screenHeight / 2,
left: Utils.screenWidth,
child: Transform.rotate(
angle: -math.pi / 2,
child: CustomPaint(painter: BackgroundHexagon()))),
child: Transform.rotate(angle: -math.pi / 2, child: CustomPaint(painter: BackgroundHexagon()))),
Padding(
padding: EdgeInsets.all(20.0),
child: SafeArea(
child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
NavigationBack(),
SizedBox(height: 40),
Text("What's your\nemail\naddress?",
style: GoogleFonts.lato(
color: Colors.white,
fontSize: 40,
fontWeight: FontWeight.bold)),
style: GoogleFonts.lato(color: Colors.white, fontSize: 40, fontWeight: FontWeight.bold)),
AppSpaces.verticalSpace20,
LabelledFormInput(
placeholder: "Email",
Expand All @@ -57,16 +51,14 @@ class _EmailAddressScreenState extends State<EmailAddressScreen> {
height: 60,
child: ElevatedButton(
onPressed: () {
Get.to(SignUp(email: _emailController.text));
Get.to(() => SignUp(email: _emailController.text));
},
style: ButtonStyles.blueRounded,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.email, color: Colors.white),
Text(' Continue with Email',
style: GoogleFonts.lato(
fontSize: 20, color: Colors.white)),
Text(' Continue with Email', style: GoogleFonts.lato(fontSize: 20, color: Colors.white)),
],
)),
)
Expand Down
23 changes: 5 additions & 18 deletions lib/Screens/Auth/login.dart
View file
Open in desktop
Expand Up @@ -17,7 +17,6 @@ class Login extends StatefulWidget {
}

class _LoginState extends State<Login> {
TextEditingController _nameController = new TextEditingController();
TextEditingController _passController = new TextEditingController();
bool obscureText = false;
@override
Expand All @@ -36,25 +35,15 @@ class _LoginState extends State<Login> {
children: [
NavigationBack(),
SizedBox(height: 40),
Text('Login',
style: GoogleFonts.lato(
color: Colors.white,
fontSize: 40,
fontWeight: FontWeight.bold)),
Text('Login', style: GoogleFonts.lato(color: Colors.white, fontSize: 40, fontWeight: FontWeight.bold)),
AppSpaces.verticalSpace20,
RichText(
text: TextSpan(
text: 'Using ',
style: GoogleFonts.lato(color: HexColor.fromHex("676979")),
children: <TextSpan>[
TextSpan(
text: widget.email,
style: TextStyle(
color: Colors.white70, fontWeight: FontWeight.bold)),
TextSpan(
text: " to login.",
style:
GoogleFonts.lato(color: HexColor.fromHex("676979"))),
TextSpan(text: widget.email, style: TextStyle(color: Colors.white70, fontWeight: FontWeight.bold)),
TextSpan(text: " to login.", style: GoogleFonts.lato(color: HexColor.fromHex("676979"))),
],
),
),
Expand All @@ -71,12 +60,10 @@ class _LoginState extends State<Login> {
height: 60,
child: ElevatedButton(
onPressed: () {
Get.to(NewWorkSpace());
Get.to(() => NewWorkSpace());
},
style: ButtonStyles.blueRounded,
child: Text('Sign In',
style:
GoogleFonts.lato(fontSize: 20, color: Colors.white))),
child: Text('Sign In', style: GoogleFonts.lato(fontSize: 20, color: Colors.white))),
)
],
)),
Expand Down
100 changes: 37 additions & 63 deletions lib/Screens/Auth/new_workspace.dart
View file
Open in desktop
Expand Up @@ -48,68 +48,46 @@ class NewWorkSpace extends StatelessWidget {
scale: 2.5,
image: "assets/plant.png"),
AppSpaces.verticalSpace10,
Text('Stuart\'s Workspace',
style: GoogleFonts.lato(
fontSize: 30, color: Colors.white)),
Text('Stuart\'s Workspace', style: GoogleFonts.lato(fontSize: 30, color: Colors.white)),
AppSpaces.verticalSpace10,
Text('Tap the logo to upload a new image.',
style: GoogleFonts.lato(
fontSize: 14,
color: HexColor.fromHex("666A7A"))),
style: GoogleFonts.lato(fontSize: 14, color: HexColor.fromHex("666A7A"))),
SizedBox(height: 50),
ContainerLabel(
label: 'HOW MANY PEOPLE IN YOUR TEAM'),
ContainerLabel(label: 'HOW MANY PEOPLE IN YOUR TEAM'),
Padding(
padding: const EdgeInsets.all(15.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text('11 - 25',
style: GoogleFonts.lato(
color: Colors.white, fontSize: 20)),
RotatedBox(
quarterTurns: 1,
child: Icon(Icons.share,
color: Colors.white, size: 30),
)
]),
child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Text('11 - 25', style: GoogleFonts.lato(color: Colors.white, fontSize: 20)),
RotatedBox(
quarterTurns: 1,
child: Icon(Icons.share, color: Colors.white, size: 30),
)
]),
),
AppSpaces.verticalSpace20,
ContainerLabel(
label: 'INVITE PEOPLE TO YOUR WORKSPACE'),
ContainerLabel(label: 'INVITE PEOPLE TO YOUR WORKSPACE'),
Padding(
padding: const EdgeInsets.all(15.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text('Email Address',
style: GoogleFonts.lato(
color: Colors.blue, fontSize: 17)),
Icon(Icons.add,
color: Colors.white, size: 30)
]),
child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Text('Email Address', style: GoogleFonts.lato(color: Colors.blue, fontSize: 17)),
Icon(Icons.add, color: Colors.white, size: 30)
]),
),
AppSpaces.verticalSpace20,
ContainerLabel(label: 'CHOOSE COLOR THEME'),
Container(
child: Padding(
padding: EdgeInsets.only(top: 15.0),
child: Wrap(
alignment: WrapAlignment.start,
children: [
...List.generate(
AppColors.ballColors.length,
(index) => GradientColorBall(
valueChanger: _colorTrigger,
selectIndex: index,
gradientList: [
...AppColors.ballColors[index]
],
),
)
])),
child: Wrap(alignment: WrapAlignment.start, children: [
...List.generate(
AppColors.ballColors.length,
(index) => GradientColorBall(
valueChanger: _colorTrigger,
selectIndex: index,
gradientList: [...AppColors.ballColors[index]],
),
)
])),
),
AppSpaces.verticalSpace20,
]),
Expand All @@ -121,22 +99,18 @@ class NewWorkSpace extends StatelessWidget {
child: Container(
padding: EdgeInsets.only(left: 40, right: 20),
width: Utils.screenWidth,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('Skip',
style: GoogleFonts.lato(
color: HexColor.fromHex("616575"),
fontSize: 16,
fontWeight: FontWeight.bold)),
PrimaryProgressButton(
width: 120,
label: "Next",
callback: () {
Get.to(ChoosePlan());
},
)
]),
child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Text('Skip',
style:
GoogleFonts.lato(color: HexColor.fromHex("616575"), fontSize: 16, fontWeight: FontWeight.bold)),
PrimaryProgressButton(
width: 120,
label: "Next",
callback: () {
Get.to(() => ChoosePlan());
},
)
]),
))
]),
);
Expand Down