messing around with the web inde.html

gwbischof · Jul 18, 2024 · 275d57f · 275d57f
1 parent d611e68
commit 275d57f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 // Package imports
+import 'package:flutter_bloc/flutter_bloc.dart';
 import "package:flutter_displaymode/flutter_displaymode.dart";
 import 'package:dart_ping_ios/dart_ping_ios.dart';
 import 'package:dynamic_color/dynamic_color.dart';
@@ -194,8 +195,12 @@ class _ThunderAppState extends State<ThunderApp> {
 
           return DynamicColorBuilder(
             builder: (lightColorScheme, darkColorScheme) {
-              ThemeData theme = FlexThemeData.light(useMaterial3: true, scheme: FlexScheme.values.byName(state.selectedTheme.name));
-              ThemeData darkTheme = FlexThemeData.dark(useMaterial3: true, scheme: FlexScheme.values.byName(state.selectedTheme.name), darkIsTrueBlack: state.themeType == ThemeType.pureBlack);
+              ThemeData theme = FlexThemeData.light(
+                  useMaterial3: true, scheme: FlexScheme.values.byName(state.selectedTheme.name));
+              ThemeData darkTheme = FlexThemeData.dark(
+                  useMaterial3: true,
+                  scheme: FlexScheme.values.byName(state.selectedTheme.name),
+                  darkIsTrueBlack: state.themeType == ThemeType.pureBlack);
 
               // Enable Material You theme
               if (state.useMaterialYouTheme == true) {
@@ -231,7 +236,10 @@ class _ThunderAppState extends State<ThunderApp> {
                 ),
               );
 
-              Locale? locale = AppLocalizations.supportedLocales.where((Locale locale) => locale.languageCode == thunderBloc.state.appLanguageCode).firstOrNull;
+              Locale? locale = AppLocalizations.supportedLocales
+                  .where(
+                      (Locale locale) => locale.languageCode == thunderBloc.state.appLanguageCode)
+                  .firstOrNull;
 
               return OverlaySupport.global(
                 child: MaterialApp.router(
@@ -247,12 +255,16 @@ class _ThunderAppState extends State<ThunderApp> {
                     Locale('eo'), // Additional locale which is not officially supported: Esperanto
                   ],
                   routerConfig: router,
-                  themeMode: state.themeType == ThemeType.system ? ThemeMode.system : (state.themeType == ThemeType.light ? ThemeMode.light : ThemeMode.dark),
+                  themeMode: state.themeType == ThemeType.system
+                      ? ThemeMode.system
+                      : (state.themeType == ThemeType.light ? ThemeMode.light : ThemeMode.dark),
                   theme: theme,
                   darkTheme: darkTheme,
                   debugShowCheckedModeBanner: false,
                   scaffoldMessengerKey: GlobalContext.scaffoldMessengerKey,
-                  scrollBehavior: (state.reduceAnimations && Platform.isAndroid) ? const ScrollBehavior().copyWith(overscroll: false) : null,
+                  scrollBehavior: (state.reduceAnimations && Platform.isAndroid)
+                      ? const ScrollBehavior().copyWith(overscroll: false)
+                      : null,
                 ),
               );
             },

diff --git a/lib/splash/pages/splash_page.dart b/lib/splash/pages/splash_page.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
 import 'package:thunder/thunder/thunder.dart';
 
-PageController thunderPageController = PageController(initialPage: 1);
+PageController thunderPageController = PageController(initialPage: 0);
 
 class SplashScreen extends StatelessWidget {
   const SplashScreen({Key? key}) : super(key: key);

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -172,6 +172,6 @@ flutter:
      fonts:
       - asset: fonts/Thunder.ttf
 
-flutter_native_splash:
-  image: assets/logo.png
-  color: 212123
+#flutter_native_splash:
+#  image: assets/logo.png
+#  color: 212123
diff --git a/web/index.html b/web/index.html
@@ -94,14 +94,16 @@
       right: 0;
     }
   </style>
+
   <script id="splash-screen-script">
     function removeSplashFromWeb() {
       document.getElementById("splash")?.remove();
       document.getElementById("splash-branding")?.remove();
       document.body.style.background = "transparent";
     }
+
   </script>
-  <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
+  <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"> 
 </head>
 <body>
   <picture id="splash">