Skip to content

Commit

Permalink
ligh theme added
Browse files Browse the repository at this point in the history
  • Loading branch information
@marizvi
marizvi committed Oct 30, 2021
1 parent 9e9535f commit 67c6ec5
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 52 deletions.
2 changes: 1 addition & 1 deletion lib/ui/utils/MenuWidget.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class _MenuWidgetState extends State<MenuWidget> {
child: Column(
children: [
SizedBox(
height: 40,
height: 80,
),
Column(
children:[
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/utils/app_feedback.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:club_calendar/styles.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'MenuWidget.dart';
import '../widgets/MenuWidget.dart';
import 'package:flutter_neumorphic/flutter_neumorphic.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/ui/utils/event_list.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:club_calendar/styles.dart';
import 'package:flutter/material.dart';
import '../widgets/EventCard.dart';
import 'event_details.dart';
import 'MenuWidget.dart';
import '../widgets/MenuWidget.dart';

class EventList extends StatefulWidget {
const EventList({Key key}) : super(key: key);
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/utils/past_event_list.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:club_calendar/styles.dart';
import 'package:club_calendar/ui/utils/past_event_details.dart';
import 'package:flutter/material.dart';
import 'MenuWidget.dart';
import '../widgets/MenuWidget.dart';
import '../widgets/EventCard.dart';
import 'event_list.dart';

Expand Down
127 changes: 79 additions & 48 deletions lib/ui/widgets/MenuWidget.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,24 @@ import '../../styles.dart';
import '../../util/google_sign_in.dart';
import 'package:sliding_switch/sliding_switch.dart';
import 'package:auto_size_text/auto_size_text.dart';

import '../pages/event_list_page.dart';
import '../pages/app_feedback_page.dart';
import '../utils/event_list.dart';
import '../utils/app_feedback.dart';
import '../utils/event_details.dart';
import '../pages/event_list_page.dart';
import '../utils/event_list.dart';
import '../utils/event_list.dart';

//Drawer Code
bool lit = false;

class MenuWidget extends StatefulWidget {
const MenuWidget({Key key}) : super(key: key);

@override
_MenuWidgetState createState() => _MenuWidgetState();
}

bool lit = false;

class _MenuWidgetState extends State<MenuWidget> {
@override
Widget build(BuildContext context) {
Expand All @@ -31,26 +34,48 @@ class _MenuWidgetState extends State<MenuWidget> {
bool isPressedPastEvent = false;
bool isPressedFeedBack = false;

final styles = Styles(
Colors.grey.shade800, Colors.white, Colors.black12, Colors.black);
if (lit == true)
final styles =
Styles(Colors.white, Colors.black, Colors.white60, Colors.white);
var styles = Styles(Colors.grey.shade800, Colors.white,Colors.black12,Colors.white12);
if (lit == true) {
var styles = Styles(Colors.white, Colors.black,Colors.white60,Colors.white60);
}

double deviceHeight = MediaQuery.of(context).size.height,
deviceWidth = MediaQuery.of(context).size.width;

//**********************************************************************************************

return Drawer(
child: SingleChildScrollView(
child: Container(
width: deviceWidth,
color: Styles.backgroundColor,
child: Container(
child: Container(
width: deviceWidth,
color: Styles.backgroundColor,
child: Column(
children: [
SizedBox(
height: 40,
),
Column(
children:[
Text("Dark-Light",
style: TextStyle(color: Styles.fontColor),
),
Switch(
value: lit,
onChanged: (val) {
setState(() {
lit = val;
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => EventListPage()),
);
});
}),
]),
Container(
height: deviceHeight,
child: ListView(children: [

//Image

Padding(
padding: const EdgeInsets.all(25),
child: Container(
Expand All @@ -64,35 +89,39 @@ class _MenuWidgetState extends State<MenuWidget> {
),

//**********************************************************************************************
SizedBox(
width:10,
height: 40,
),

//Slider
Padding(
padding: const EdgeInsets.only(
top: 20, bottom: 50, left: 10, right: 10),
child: SizedBox(
height: deviceHeight * 0.06399636,
width: deviceWidth * 0.8,
child: SlidingSwitch(
value: false,
width: deviceWidth * 0.731, //check adaptability
onChanged: (bool value) {
print(value);
},
height: 55,
animationDuration: const Duration(milliseconds: 400),
onTap: () {},
onDoubleTap: () {},
onSwipe: () {},
textOff: "Dark",
textOn: "Light",
colorOn: Colors.white,
colorOff: const Color(0xff6682c0),
background: Colors.black38,
buttonColor: Colors.black,
inactiveColor: const Color(0xff636f7b),
),
),
),
// Padding(
// padding: const EdgeInsets.only(
// top: 20, bottom: 50, left: 10, right: 10),
// child: SizedBox(
// height: deviceHeight * 0.06399636,
// width: deviceWidth * 0.8,
// child: SlidingSwitch(
// value: false,
// width: deviceWidth * 0.731, //check adaptability
// onChanged: (bool value) {
// print(value);
// },
// height: 55,
// animationDuration: const Duration(milliseconds: 400),
// onTap: () {},
// onDoubleTap: () {},
// onSwipe: () {},
// textOff: "Dark",
// textOn: "Light",
// colorOn: Colors.white,
// colorOff: const Color(0xff6682c0),
// background: Colors.black38,
// buttonColor: Colors.black,
// inactiveColor: const Color(0xff636f7b),
// ),
// ),
// ),

//**********************************************************************************************

Expand Down Expand Up @@ -149,7 +178,7 @@ class _MenuWidgetState extends State<MenuWidget> {
child: AutoSizeText(
"Events",
style: TextStyle(
color: Styles.fontColor,
color: Styles.textColor,
fontSize: 20,
fontWeight: FontWeight.w400),
textAlign: TextAlign.center,
Expand Down Expand Up @@ -219,7 +248,7 @@ class _MenuWidgetState extends State<MenuWidget> {
child: AutoSizeText(
"Past Events",
style: TextStyle(
color: Styles.fontColor,
color: Styles.textColor,
fontWeight: FontWeight.w400,
fontSize: 20),
textAlign: TextAlign.center,
Expand Down Expand Up @@ -286,7 +315,7 @@ class _MenuWidgetState extends State<MenuWidget> {
child: AutoSizeText(
"Send feedback",
style: TextStyle(
color: Styles.fontColor,
color: Styles.textColor,
fontWeight: FontWeight.w400,
fontSize: 20),
textAlign: TextAlign.center,
Expand All @@ -312,7 +341,7 @@ class _MenuWidgetState extends State<MenuWidget> {
child: Align(
alignment: Alignment.bottomLeft,
child: FloatingActionButton(
backgroundColor: Colors.grey[800],
backgroundColor: Styles.subCardColor,
onPressed: () {
var googleSignMe = GoogleSignMeIn();
googleSignMe.logout();
Expand All @@ -322,7 +351,9 @@ class _MenuWidgetState extends State<MenuWidget> {
),
),
]),
)),
));
),
],
),
)));
}
}

0 comments on commit 67c6ec5

Please sign in to comment.