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

Light Theme added #73

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Light Theme added #73

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
3817291
Light theme added
marizvi Oct 30, 2021
d26b43d
sync
marizvi Oct 30, 2021
9e9535f
check
marizvi Oct 30, 2021
67c6ec5
ligh theme added
marizvi Oct 30, 2021
7709c72
ligh theme added
marizvi Oct 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,22 @@
"certificate_hash": "801fff0f078b43c4b50647cb4daf1bcb2f4edee0"
}
},
{
"client_id": "1012587669993-df7cql2c589llepq0u26157vvjj4hqb0.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.iiitvadodara.club_calendar",
"certificate_hash": "b3ab6e09695210226fb8670a84c534cf7a501f83"
}
},
{
"client_id": "1012587669993-lu5f65fj1j1p9r1u6t53s3nppvphnqbe.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.iiitvadodara.club_calendar",
"certificate_hash": "acc84fdee92b84c4652762ebe2728fa3ad3b4f64"
}
},
{
"client_id": "1012587669993-oq5hjb3n70oc0aiqjcf85cr6rndre6pb.apps.googleusercontent.com",
"client_type": 1,
Expand Down
6 changes: 3 additions & 3 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import 'package:flutter_neumorphic/flutter_neumorphic.dart';

import './util/cloud_messaging_handler.dart';
import './util/crashlytics_handler.dart';
import './ui/login_screen.dart';
import './ui/homePage(temporary).dart';
import 'ui/event_details.dart';
import 'ui/pages/login_screen.dart';
import 'ui/pages/homePage(temporary).dart';
import 'ui/utils/event_details.dart';

void main() {
WidgetsFlutterBinding.ensureInitialized();
Expand Down
43 changes: 25 additions & 18 deletions lib/styles.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,24 @@ import 'package:flutter/rendering.dart';

class Styles {
static double elevation = 10.0;
static const Color backgroundColor = Color(0xff313131);
static Color backgroundColor = Color(0xff313131);
static Color cardColor = Colors.black12;
static Color subCardColor = Colors.black38;
static const Color buttonColor = Color(0xffF48076);
static const Color fontColor = Color.fromRGBO(229, 229, 229, 1);
static Color textColor = Color.fromRGBO(229, 229, 229, 1);
static Color fontColor = Color.fromRGBO(229, 229, 229, 1);
static const Color descriptionColor = Color.fromRGBO(204, 203, 203, 1);
static const Color detailsColor = Color.fromRGBO(187, 187, 187, 1);
static const String googleImage = "assets/icons/google_bg.png";
static const String logoImage = "assets/icons/CC-Logo(1).png";

Styles(colour, textcolor, cardcolor, subcard) {
backgroundColor = colour;
textColor = textcolor;
fontColor = textcolor;
cardColor = cardcolor;
subCardColor = subcard;
}
Styles.namedConstructor() {}
Widget getIcon(IconData iconData,
{colour = buttonColor,
defaultSize = 40.0,
Expand All @@ -37,40 +47,37 @@ class Styles {
}

TextStyle customStyle(
{color = fontColor, size = 18.0, fontWeight = FontWeight.w400}) {
{size: 18.0, color = "", fontWeight = FontWeight.w500}) {
return GoogleFonts.montserrat(
fontSize: size, color: color, fontWeight: fontWeight);
fontSize: 18.0, color: fontColor, fontWeight: FontWeight.w400);
}

TextStyle titleStyle({color = fontColor}) {
TextStyle titleStyle({color = ""}) {
return GoogleFonts.montserrat(
fontSize: 28, color: color, fontWeight: FontWeight.w500);
fontSize: 28, color: fontColor, fontWeight: FontWeight.w500);
}

TextStyle headingStyle({color = fontColor, fontWeight = FontWeight.w500}) {
TextStyle headingStyle({color = "", fontWeight = FontWeight.w500}) {
return GoogleFonts.montserrat(
fontSize: 20, color: color, fontWeight: fontWeight);
fontSize: 20, color: fontColor, fontWeight: fontWeight);
}

TextStyle descriptionStyle({color = descriptionColor}) {
return GoogleFonts.roboto(
fontSize: 18, color: color, fontWeight: FontWeight.w400);
}

TextStyle cardHeadingStyle({color = fontColor, fontWeight= FontWeight.w400}){
TextStyle cardHeadingStyle({color = "", fontWeight = FontWeight.w400}) {
return GoogleFonts.montserrat(
fontSize: 25, color: color, fontWeight: fontWeight);
fontSize: 25, color: fontColor, fontWeight: fontWeight);
}

TextStyle cardDurationStyle({color = buttonColor, fontWeight= FontWeight.w400}){
TextStyle cardDurationStyle(
{color = buttonColor, fontWeight = FontWeight.w400}) {
return GoogleFonts.montserrat(
fontSize: 16, color: color, fontWeight: fontWeight);
}





List<BoxShadow> shadowToContainer() {
return [
BoxShadow(
Expand Down Expand Up @@ -145,8 +152,8 @@ class Styles {
info[index]['info'].toString(),
softWrap: false,
style: (info[index]['iconData'] != null)
? styles.headingStyle(fontWeight: FontWeight.normal)
: styles.customStyle(size: 20.0,color: Styles.detailsColor),
? styles.headingStyle(fontWeight: FontWeight.normal,color:Colors.red)
: styles.customStyle(size: 20.0, color: Colors.red),
),
subtitle: (index == 0 && info[index]['iconData'] != null)
? Text(
Expand Down
12 changes: 12 additions & 0 deletions lib/theme_setup.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import 'package:flutter/material.dart';

class MyThemes {
static final darkTheme = ThemeData(
scaffoldBackgroundColor: Colors.grey.shade900,
colorScheme: ColorScheme.dark(),
);
static final lightTheme = ThemeData(
scaffoldBackgroundColor: Colors.white,
colorScheme: ColorScheme.light(),
);
}
Empty file removed lib/ui/event_feedback.dart
View file
Open in desktop
Empty file.
152 changes: 0 additions & 152 deletions lib/ui/event_list.dart
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions lib/ui/app_feedback_page.dart → lib/ui/pages/app_feedback_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';

import '../styles.dart';
import 'MenuWidget.dart';
import 'app_feedback.dart';
import '../../styles.dart';
import '../widgets/MenuWidget.dart';
import '../utils/app_feedback.dart';

class AppFeedBackPage extends StatefulWidget {
const AppFeedBackPage({Key key}) : super(key: key);
Expand All @@ -19,7 +19,7 @@ class _AppFeedBackPageState extends State<AppFeedBackPage> {

@override
Widget build(BuildContext context) {
Styles styles = new Styles();
Styles styles = new Styles(Colors.grey.shade800,Colors.white,Colors.black12,Colors.black38);
return Scaffold(

backgroundColor: Styles.backgroundColor,
Expand Down
8 changes: 4 additions & 4 deletions lib/ui/event_list_page.dart → lib/ui/pages/event_list_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';

import '../styles.dart';
import 'MenuWidget.dart';
import 'event_list.dart';
import '../../styles.dart';
import '../widgets/MenuWidget.dart';
import '../utils/event_list.dart';

class EventListPage extends StatefulWidget {
const EventListPage({Key key}) : super(key: key);
Expand All @@ -12,7 +12,7 @@ class EventListPage extends StatefulWidget {
}

class _EventListPageState extends State<EventListPage> {
Styles styles =new Styles();
Styles styles =new Styles(Colors.grey.shade800,Colors.white,Colors.black12,Colors.black38);

@override
Widget build(BuildContext context) {
Expand Down
10 changes: 5 additions & 5 deletions lib/ui/homePage(temporary).dart → lib/ui/pages/homePage(temporary).dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
//this is temporary homepage till the th erequired homepage is made.
//this is made for the checking whether the login page is siigning correctly
import 'package:club_calendar/styles.dart';
import 'package:club_calendar/ui/event_list.dart';
import 'package:club_calendar/ui/past_event_list.dart';
import 'package:club_calendar/ui/utils/event_list.dart';
import 'package:club_calendar/ui/utils/past_event_list.dart';
import 'package:flutter/material.dart';
import 'MenuWidget.dart';
import 'app_feedback.dart';
import '../widgets/MenuWidget.dart';
import '../utils/app_feedback.dart';
import 'event_list_page.dart';


Expand Down Expand Up @@ -50,7 +50,7 @@ class _MyHomePageState extends State<MyHomePage> {
@override
Widget build(BuildContext context) {

Styles styles = new Styles();
Styles styles = new Styles(Colors.grey.shade800,Colors.white,Colors.black12,Colors.black38);

return Scaffold(

Expand Down
6 changes: 3 additions & 3 deletions lib/ui/login_screen.dart → lib/ui/pages/login_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_neumorphic/flutter_neumorphic.dart' as neu;

import '../styles.dart';
import '../util/google_sign_in.dart';
import '../../styles.dart';
import '../../util/google_sign_in.dart';

class LoginScreen extends StatefulWidget {
static const routeName = "/loginScreen";
Expand All @@ -12,7 +12,7 @@ class LoginScreen extends StatefulWidget {

class _LoginScreenState extends State<LoginScreen> {
bool isPressed = false;
var styles = Styles();
var styles = Styles(Colors.grey.shade800,Colors.white,Colors.black12,Colors.black38);
@override
Widget build(BuildContext context) {
double deviceHeight = MediaQuery.of(context).size.height,
Expand Down
Loading