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

Light theme added #1

Closed
wants to merge 3 commits into from
Closed

Light theme added #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d58231
organised files
AkhileshManda Oct 29, 2021
e28f967
Merge branch 'master' into master
AkhileshManda Oct 29, 2021
61cd5ac
Merge pull request #71 from AkhileshManda/master
vikiwarrior Oct 29, 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
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
Empty file removed lib/ui/event_feedback.dart
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 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 Down
6 changes: 3 additions & 3 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 Down
8 changes: 4 additions & 4 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
4 changes: 2 additions & 2 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 Down
10 changes: 6 additions & 4 deletions lib/ui/past_event_page.dart → lib/ui/pages/past_event_page.dart
View file
Open in desktop
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 {
Expand Down Expand Up @@ -45,7 +47,7 @@ class _PastEventListPageState extends State<PastEventListPage> {

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


);
Expand Down
12 changes: 6 additions & 6 deletions lib/ui/MenuWidget.dart → lib/ui/utils/MenuWidget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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';

import 'app_feedback_page.dart';
import '../pages/app_feedback_page.dart';
import 'event_details.dart';
import 'event_list_page.dart';
import '../pages/event_list_page.dart';

//Drawer Code
class MenuWidget extends StatefulWidget {
Expand Down
0 lib/ui/app_feedback.dart → lib/ui/utils/app_feedback.dart
View file
Open in desktop
File renamed without changes.
0 lib/ui/dialog_widget.dart → lib/ui/utils/dialog_widget.dart
View file
Open in desktop
File renamed without changes.
0 lib/ui/event_creation.dart → lib/ui/utils/event_creation.dart
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/ui/event_details.dart → lib/ui/utils/event_details.dart
View file
Open in desktop
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();
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/event_list.dart → lib/ui/utils/event_list.dart
View file
Open in desktop
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';

class EventList extends StatefulWidget {
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/past_event_details.dart → lib/ui/utils/past_event_details.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/past_event_list.dart → lib/ui/utils/past_event_list.dart
View file
Open in desktop
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/past_event_details.dart';
import 'package:club_calendar/ui/utils/past_event_details.dart';
import 'package:flutter/material.dart';
import 'EventCard.dart';
import '../widgets/EventCard.dart';
import 'event_details.dart';
import 'event_list.dart';

Expand Down
0 lib/ui/EventCard.dart → lib/ui/widgets/EventCard.dart
View file
Open in desktop
File renamed without changes.
Loading