Merge Conflict Resolved

.github/workflows/codeql.yml

@@ -0,0 +1,54 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '43 3 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'dart' ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # Additional step for Dart analysis
+      - name: Install Dart SDK
+        uses: dart-lang/setup-dart@v1
+
+      # Add any pre-build steps specific to your Flutter project if necessary
+      # For example, running `flutter pub get` to get dependencies
+      - name: Flutter pub get
+        run: flutter pub get
+
+      # Add your Flutter/Dart build step if needed
+      # - name: Flutter build
+      #   run: flutter build apk --release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "Dart analysis"

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+            android:src="@drawable/splash screen.png" />
+    </item>
 </layer-list>

lib/main.dart

@@ -11,6 +11,7 @@ import 'package:opso/programs%20screen/summer_of_bitcoin.dart';
 import 'package:opso/services/notificationService.dart';
 import 'home_page.dart';
 import 'package:adaptive_theme/adaptive_theme.dart';
+import 'splash_screen.dart'; 
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -33,7 +34,7 @@ class OpSoApp extends StatelessWidget {
             dark: ThemeData.dark(),
             initial: AdaptiveThemeMode.system,
             builder: (theme, darkTheme) => MaterialApp(
-              initialRoute: '/landing_page',
+              initialRoute: '/splash_screen', 
               routes: {
                 "/progarm_page": (context) => const HomePage(),
                 "/girl_script_summer_of_code": (context) => const GSSOCScreen(),
@@ -47,6 +48,7 @@ class OpSoApp extends StatelessWidget {
                     const MajorLeagueHackingFellowship(),
                 "/linux_foundation": (context) => const LinuxFoundation(),
                 "/landing_page": (context) => const LandingPage(),
+                '/splash_screen': (context) => SplashScreen(), 
               },
               title: 'OpSo',
               debugShowCheckedModeBanner: false,
@@ -57,8 +59,9 @@ class OpSoApp extends StatelessWidget {
               //   visualDensity: VisualDensity.adaptivePlatformDensity,
               // ),
               home: const HomePage(),
+
             ),
           );
         });
   }
-}
+}

lib/splash_screen.dart

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'dart:async';
+
+class SplashScreen extends StatefulWidget {
+  @override
+  _SplashScreenState createState() => _SplashScreenState();
+}
+
+class _SplashScreenState extends State<SplashScreen> {
+  @override
+  void initState() {
+    super.initState();
+    Timer(Duration(seconds: 3), () {
+      Navigator.of(context).pushReplacementNamed('/landing_page');
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Image.asset('assets/splash screen.png'),
+      ),
+    );
+  }
+}

pubspec.yaml

@@ -85,6 +85,7 @@ flutter:
     - assets/projects/gsod/
     - assets/projects/sob/
     - assets/projects/linux_foundation/
+    - assets/splash screen.png
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware
   # For details regarding adding assets from package dependencies, see