elements 1.0

KristofKekesi · Mar 18, 2021 · 6f80ed3 · 6f80ed3
1 parent a3bdc3d
commit 6f80ed3
Show file tree

Hide file tree

Showing 9 changed files with 500 additions and 516 deletions.
diff --git a/lib/loadJsonData.dart b/lib/loadJsonData.dart
@@ -0,0 +1,12 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+var elementData;
+
+Future<Widget> loadJsonDataThenReturnWidget(Widget widget) async {
+  String rawJson = await rootBundle.loadString('lib/elements.json');
+  elementData = json.decode(rawJson);
+  return Future.value(widget);
+}
diff --git a/lib/widgets/build.dart b/lib/widgets/build.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:elements_rework/widgets/localization.dart';
 import 'package:splashscreen/splashscreen.dart';
+import 'package:elements_rework/loadJsonData.dart';
 
 import 'package:elements_rework/widgets/drawer.dart';
 import 'package:elements_rework/widgets/elements.dart';
@@ -9,7 +10,7 @@ class Splash extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SplashScreen(
-      seconds: 2,
+      //seconds: 2,
       title: Text(
         AppLocalizations.of(context).translate('title'),
         style: TextStyle(
@@ -31,7 +32,8 @@ class Splash extends StatelessWidget {
       ),
       photoSize: 50,
       loaderColor: Colors.white,
-      navigateAfterSeconds: Build(),
+      navigateAfterFuture: loadJsonDataThenReturnWidget(Build()),
+      //navigateAfterSeconds: Build(),
     );
   }
 }

diff --git a/lib/widgets/drawer.dart b/lib/widgets/drawer.dart
@@ -36,41 +36,9 @@ class customDrawer extends StatelessWidget {
               ),
             ),
             Padding(
-              padding: EdgeInsets.only(
-                  top: MediaQuery.of(context).size.height * .03),
-              child: GestureDetector(
-                onTap: () {
-                  _launchURL('https://crwd.in/elementsapp');
-                },
-                child: ListTile(
-                  title: Text(
-                    AppLocalizations.of(context).translate('translate'),
-                    style: TextStyle(
-                        letterSpacing: 2,
-                        fontWeight: FontWeight.bold,
-                        fontSize: MediaQuery.of(context).size.width * .07),
-                  ),
-                ),
-              ),
-            ),
-            GestureDetector(
-              onTap: () {
-                _launchURL('https://www.patreon.com/KristofKekesi');
-              },
-              child: ListTile(
-                title: Text(
-                  AppLocalizations.of(context).translate('support'),
-                  style: TextStyle(
-                      letterSpacing: 2,
-                      fontWeight: FontWeight.bold,
-                      fontSize: MediaQuery.of(context).size.width * .07),
-                ),
-              ),
-            ),
-            Divider(
-              thickness: MediaQuery.of(context).size.height * .005,
-            ),
-            GestureDetector(
+                padding: EdgeInsets.only(
+                    top: MediaQuery.of(context).size.height * .03),
+                child: GestureDetector(
               onTap: () {
                 _launchURL(
                     'https://github.com/KristofKekesi/Elements/blob/master/README.md#contributors-');
@@ -85,6 +53,7 @@ class customDrawer extends StatelessWidget {
                 ),
               ),
             ),
+            ),
             GestureDetector(
               onTap: () {
                 _launchURL(