Merge pull request #5 from JothishKamal/dev

refactor: reset project for revamp
GDGVIT · Aug 1, 2024 · a328ee5 · a328ee5
2 parents 011ab09 + a5c57cd
commit a328ee5
Show file tree

Hide file tree

Showing 48 changed files with 252 additions and 298 deletions.
diff --git a/fonts/AvenirNext/AvenirNextCyr-Bold.ttf b/fonts/AvenirNext/AvenirNextCyr-Bold.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-BoldItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-BoldItalic.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-Demi.ttf b/fonts/AvenirNext/AvenirNextCyr-Demi.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-DemiItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-DemiItalic.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-Heavy.ttf b/fonts/AvenirNext/AvenirNextCyr-Heavy.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-HeavyItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-HeavyItalic.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-Italic.ttf b/fonts/AvenirNext/AvenirNextCyr-Italic.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-Light.ttf b/fonts/AvenirNext/AvenirNextCyr-Light.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-LightItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-LightItalic.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-Medium.ttf b/fonts/AvenirNext/AvenirNextCyr-Medium.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-MediumItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-MediumItalic.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-Regular.ttf b/fonts/AvenirNext/AvenirNextCyr-Regular.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-Thin.ttf b/fonts/AvenirNext/AvenirNextCyr-Thin.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-ThinItalic.ttf b/fonts/AvenirNext/AvenirNextCyr-ThinItalic.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-UltraLight.ttf b/fonts/AvenirNext/AvenirNextCyr-UltraLight.ttf
diff --git a/fonts/AvenirNext/AvenirNextCyr-UltraLightIt.ttf b/fonts/AvenirNext/AvenirNextCyr-UltraLightIt.ttf
diff --git a/fonts/Poppins/Poppins-Black.ttf b/fonts/Poppins/Poppins-Black.ttf
diff --git a/fonts/Poppins/Poppins-BlackItalic.ttf b/fonts/Poppins/Poppins-BlackItalic.ttf
diff --git a/fonts/Poppins/Poppins-Bold.ttf b/fonts/Poppins/Poppins-Bold.ttf
diff --git a/fonts/Poppins/Poppins-BoldItalic.ttf b/fonts/Poppins/Poppins-BoldItalic.ttf
diff --git a/fonts/Poppins/Poppins-ExtraBold.ttf b/fonts/Poppins/Poppins-ExtraBold.ttf
diff --git a/fonts/Poppins/Poppins-ExtraBoldItalic.ttf b/fonts/Poppins/Poppins-ExtraBoldItalic.ttf
diff --git a/fonts/Poppins/Poppins-ExtraLight.ttf b/fonts/Poppins/Poppins-ExtraLight.ttf
diff --git a/fonts/Poppins/Poppins-ExtraLightItalic.ttf b/fonts/Poppins/Poppins-ExtraLightItalic.ttf
diff --git a/fonts/Poppins/Poppins-Italic.ttf b/fonts/Poppins/Poppins-Italic.ttf
diff --git a/fonts/Poppins/Poppins-Light.ttf b/fonts/Poppins/Poppins-Light.ttf
diff --git a/fonts/Poppins/Poppins-LightItalic.ttf b/fonts/Poppins/Poppins-LightItalic.ttf
diff --git a/fonts/Poppins/Poppins-Medium.ttf b/fonts/Poppins/Poppins-Medium.ttf
diff --git a/fonts/Poppins/Poppins-MediumItalic.ttf b/fonts/Poppins/Poppins-MediumItalic.ttf
diff --git a/fonts/Poppins/Poppins-Regular.ttf b/fonts/Poppins/Poppins-Regular.ttf
diff --git a/fonts/Poppins/Poppins-SemiBold.ttf b/fonts/Poppins/Poppins-SemiBold.ttf
diff --git a/fonts/Poppins/Poppins-SemiBoldItalic.ttf b/fonts/Poppins/Poppins-SemiBoldItalic.ttf
diff --git a/fonts/Poppins/Poppins-Thin.ttf b/fonts/Poppins/Poppins-Thin.ttf
diff --git a/fonts/Poppins/Poppins-ThinItalic.ttf b/fonts/Poppins/Poppins-ThinItalic.ttf
diff --git a/lib/app/app.dart b/lib/app/app.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+import 'package:spotify_collab_app/app/router/router.dart';
+import 'package:spotify_collab_app/app/theme/theme.dart';
+
+class CollabifyApp extends StatelessWidget {
+  const CollabifyApp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp.router(
+      title: 'Kalculate',
+      theme: darkTheme,
+      themeMode: ThemeMode.dark,
+      debugShowCheckedModeBanner: false,
+      routerConfig: router,
+    );
+  }
+}
+
+void main() {
+  runApp(const CollabifyApp());
+}
diff --git a/lib/app/router/router.dart b/lib/app/router/router.dart
@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:spotify_collab_app/view/screens/u_home_screen.dart';
+
+final router = GoRouter(
+  initialLocation: '/',
+  routes: <GoRoute>[
+    GoRoute(
+      path: '/',
+      pageBuilder: (context, state) => const MaterialPage(child: HomeScreen()),
+    ),
+  ],
+);
diff --git a/lib/theme/theme.dart → lib/app/theme/theme.dart b/lib/theme/theme.dart → lib/app/theme/theme.dart
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,22 +1,6 @@
+import 'package:spotify_collab_app/app/app.dart';
 import 'package:flutter/material.dart';
-import 'package:spotify_collab_app/screens/home_screen.dart';
-import 'package:spotify_collab_app/screens/login_screen.dart';
-import 'theme/theme.dart';
 
 void main() {
-  runApp(const MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      debugShowCheckedModeBanner: false,
-      title: 'Spotify Collab',
-      theme: darkTheme,
-      home: const HomeScreen(),
-    );
-  }
+  runApp(const CollabifyApp());
 }
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart