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.

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
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
sync
marizvi committed Oct 30, 2021
commit d26b43d35a2e7db3e531a37e62e531a9c14893b4
6 changes: 3 additions & 3 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -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();
Empty file removed lib/ui/event_feedback.dart
Empty file.
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);
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);
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';


4 changes: 2 additions & 2 deletions lib/ui/login_screen.dart → lib/ui/pages/login_screen.dart
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";
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'package:club_calendar/ui/past_event_list.dart';
import 'package:club_calendar/ui/utils/past_event_list.dart';
import 'package:club_calendar/ui/widgets/page_scaffold_widget.dart';
import 'package:flutter/material.dart';
import '../styles.dart';
import 'MenuWidget.dart';
import '../../styles.dart';
import '../widgets/MenuWidget.dart';



class PastEventListPage extends StatefulWidget {
@@ -45,7 +47,7 @@ class _PastEventListPageState extends State<PastEventListPage> {

),
drawer: MenuWidget(),
body: PastEventList()
body:PastEventList()


);
15 changes: 11 additions & 4 deletions lib/ui/MenuWidget.dart → lib/ui/utils/MenuWidget.dart
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
import 'package:club_calendar/ui/homePage(temporary).dart';
import 'package:club_calendar/ui/past_event_page.dart';
import 'package:club_calendar/ui/pages/homePage(temporary).dart';
import 'package:club_calendar/ui/pages/past_event_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter_neumorphic/flutter_neumorphic.dart' as neu;
import 'package:flutter_neumorphic/flutter_neumorphic.dart';
import '../styles.dart';
import '../util/google_sign_in.dart';
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';
<<<<<<< HEAD:lib/ui/MenuWidget.dart
import 'event_list.dart';
import 'app_feedback_page.dart';
import 'event_details.dart';
import 'event_list.dart';
import 'event_list_page.dart';
=======

import '../pages/app_feedback_page.dart';
import 'event_details.dart';
import '../pages/event_list_page.dart';
>>>>>>> 61cd5ac99555326df304af417ef7719d406325a8:lib/ui/utils/MenuWidget.dart

//Drawer Code
class MenuWidget extends StatefulWidget {
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/ui/event_details.dart → lib/ui/utils/event_details.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:club_calendar/ui/slider_widget_present.dart';
import 'package:club_calendar/ui/widgets/slider_widget_present.dart';
import 'package:flutter/material.dart';
import 'package:flutter_neumorphic/flutter_neumorphic.dart' as neu;
import 'package:sliding_sheet/sliding_sheet.dart';

import '../styles.dart';
import '../../styles.dart';
class EventDetailsPage extends StatelessWidget {
static const String routeName = '\EventDetailsScreen';
final styles = Styles(Colors.grey.shade800,Colors.white,Colors.black12,Colors.black38);
2 changes: 1 addition & 1 deletion lib/ui/event_list.dart → lib/ui/utils/event_list.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:club_calendar/styles.dart';
import 'package:flutter/material.dart';
import 'EventCard.dart';
import '../widgets/EventCard.dart';
import 'event_details.dart';
import 'MenuWidget.dart';

Original file line number Diff line number Diff line change
@@ -3,9 +3,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
import 'package:sliding_sheet/sliding_sheet.dart';

import '../styles.dart';
import '../../styles.dart';
import 'dialog_widget.dart';
import 'slider_widget.dart';
import '../widgets/slider_widget.dart';
class PastEventDetailsPage extends StatelessWidget {

final styles = Styles(Colors.grey.shade800,Colors.white,Colors.black12,Colors.black38);
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import 'package:club_calendar/styles.dart';
import 'package:club_calendar/ui/past_event_details.dart';
import 'package:club_calendar/ui/utils/past_event_details.dart';
import 'package:flutter/material.dart';
import 'package:club_calendar/ui/MenuWidget.dart';
import 'EventCard.dart';
import 'event_details.dart';
import '../widgets/EventCard.dart';
import 'event_list.dart';

class PastEventList extends StatefulWidget {
File renamed without changes.
Loading