Merge pull request #33 from bremade/feature/TYS-9-clean-up-code

Feature/tys 9 clean up code

README.md

@@ -1,6 +1,6 @@
 # Track Your Stop
 
-Track your favorite mvv stops.
+Track your favorite public transport stops.
 
 ## Getting Started
 

android/build.gradle

@@ -1,31 +1,31 @@
-buildscript {
-    ext.kotlin_version = '1.7.20'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(':app')
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+buildscript {
+    ext.kotlin_version = '1.7.20'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.buildDir = '../build'
+subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    project.evaluationDependsOn(':app')
+}
+
+tasks.register("clean", Delete) {
+    delete rootProject.buildDir
+}

ios/Runner.xcodeproj/project.pbxproj

@@ -365,7 +365,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.tracker.mvvTracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.tracker.trackyourstop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -493,7 +493,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.tracker.mvvTracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.tracker.trackyourstop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -515,7 +515,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.tracker.mvvTracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.tracker.trackyourstop;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

ios/Runner/Info.plist

@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Mvv Tracker</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>TrackYourStop</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
-</plist>
+  <dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>$(DEVELOPMENT_LANGUAGE)</string>
+    <key>CFBundleDisplayName</key>
+    <string>TrackYourStop</string>
+    <key>CFBundleExecutable</key>
+    <string>$(EXECUTABLE_NAME)</string>
+    <key>CFBundleIdentifier</key>
+    <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>TrackYourStop</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>$(FLUTTER_BUILD_NAME)</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>$(FLUTTER_BUILD_NUMBER)</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>UILaunchStoryboardName</key>
+    <string>LaunchScreen</string>
+    <key>UIMainStoryboardFile</key>
+    <string>Main</string>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+      <string>UIInterfaceOrientationPortrait</string>
+      <string>UIInterfaceOrientationLandscapeLeft</string>
+      <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+      <string>UIInterfaceOrientationPortrait</string>
+      <string>UIInterfaceOrientationPortraitUpsideDown</string>
+      <string>UIInterfaceOrientationLandscapeLeft</string>
+      <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UIViewControllerBasedStatusBarAppearance</key>
+    <false/>
+    <key>CADisableMinimumFrameDurationOnPhone</key>
+    <true/>
+    <key>UIApplicationSupportsIndirectInputEvents</key>
+    <true/>
+  </dict>
+</plist>

lib/constants/colors.dart

@@ -1,69 +1,72 @@
 import 'package:flutter/material.dart';
 
-// GLOBAL
-Color? hint = Colors.grey[600];
-Color themeSeed = const Color(0xFF2196F3);
+class GlobalColors {
+  static Color? hint = Colors.grey[600];
+  static const Color themeSeed = Color(0xFF2196F3);
+}
 
-// DARK THEME
-Color primaryColorDark = const Color(0xFF9ECAFF);
-Color onPrimaryColorDark = const Color(0xFF003258);
-Color primaryContainerColorDark = const Color(0xFF00497D);
-Color onPrimaryContainerColorDark = const Color(0xFFD1E4FF);
-Color secondaryColorDark = const Color(0xFFBBC7DB);
-Color onSecondaryColorDark = const Color(0xFF253140);
-Color secondaryContainerColorDark = const Color(0xFF3B4858);
-Color onSecondaryContainerColorDark = const Color(0xFFD7E3F7);
-Color tertiaryColorDark = const Color(0xFFD6BEE4);
-Color onTertiaryColorDark = const Color(0xFF3B2948);
-Color tertiaryContainerColorDark = const Color(0xFF523F5F);
-Color onTertiaryContainerColorDark = const Color(0xFFF2DAFF);
-Color errorColorDark = const Color(0xFFFFB4AB);
-Color onErrorColorDark = const Color(0xFF690005);
-Color errorContainerColorDark = const Color(0xFFFFDAD6);
-Color onErrorContainerColorDark = const Color(0xFF93000A);
-Color outlineColorDark = const Color(0xFF8D9199);
-Color backgroundColorDark = const Color(0xFF1A1C1E);
-Color onBackgroundColorDark = const Color(0xFFE2E2E6);
-Color surfaceColorDark = const Color(0xFF1A1C1E);
-Color onSurfaceColorDark = const Color(0xFFE2E2E6);
-Color surfaceVariantColorDark = const Color(0xFF43474E);
-Color onSurfaceVariantColorDark = const Color(0xFFC3C7CF);
-Color inverseSurfaceColorDark = const Color(0xFFE2E2E6);
-Color onInverseSurfaceColorDark = const Color(0xFF1A1C1E);
-Color inversePrimaryColorDark = const Color(0xFF0061A4);
-Color shadowColorDark = const Color(0xFF000000);
-Color surfaceTintColorDark = const Color(0xFF9ECAFF);
-Color outlineVariantColorDark = const Color(0xFF43474E);
-Color scrimColorDark = const Color(0xFF000000);
+class LightThemeColors {
+  static const Color primaryColor = Color(0xFF0061A4);
+  static const Color onPrimaryColor = Color(0xFFFFFFFF);
+  static const Color primaryContainerColor = Color(0xFFD1E4FF);
+  static const Color onPrimaryContainerColor = Color(0xFF001D36);
+  static const Color secondaryColor = Color(0xFF535F70);
+  static const Color onSecondaryColor = Color(0xFFFFFFFF);
+  static const Color secondaryContainerColor = Color(0xFFD7E3F7);
+  static const Color onSecondaryContainerColor = Color(0xFF101C2B);
+  static const Color tertiaryColor = Color(0xFF6B5778);
+  static const Color onTertiaryColor = Color(0xFFFFFFFF);
+  static const Color tertiaryContainerColor = Color(0xFFF2DAFF);
+  static const Color onTertiaryContainerColor = Color(0xFF251431);
+  static const Color errorColor = Color(0xFFBA1A1A);
+  static const Color onErrorColor = Color(0xFFFFFFFF);
+  static const Color errorContainerColor = Color(0xFFFFDAD6);
+  static const Color onErrorContainerColor = Color(0xFF410002);
+  static const Color outlineColor = Color(0xFF73777F);
+  static const Color backgroundColor = Color(0xFFFDFCFF);
+  static const Color onBackgroundColor = Color(0xFF1A1C1E);
+  static const Color surfaceColor = Color(0xFFFDFCFF);
+  static const Color onSurfaceColor = Color(0xFF1A1C1E);
+  static const Color surfaceVariantColor = Color(0xFFDFE2EB);
+  static const Color onSurfaceVariantColor = Color(0xFF43474E);
+  static const Color inverseSurfaceColor = Color(0xFFE2E2E6);
+  static const Color onInverseSurfaceColor = Color(0xFF1A1C1E);
+  static const Color inversePrimaryColor = Color(0xFF9ECAFF);
+  static const Color shadowColor = Color(0xFF000000);
+  static const Color surfaceTintColor = Color(0xFF0061A4);
+  static const Color outlineVariantColor = Color(0xFFC3C7CF);
+  static const Color scrimColor = Color(0xFF000000);
+}
 
-// LIGHT THEME
-Color primaryColor = const Color(0xFF0061A4);
-Color onPrimaryColor = const Color(0xFFFFFFFF);
-Color primaryContainerColor = const Color(0xFFD1E4FF);
-Color onPrimaryContainerColor = const Color(0xFF001D36);
-Color secondaryColor = const Color(0xFF535F70);
-Color onSecondaryColor = const Color(0xFFFFFFFF);
-Color secondaryContainerColor = const Color(0xFFD7E3F7);
-Color onSecondaryContainerColor = const Color(0xFF101C2B);
-Color tertiaryColor = const Color(0xFF6B5778);
-Color onTertiaryColor = const Color(0xFFFFFFFF);
-Color tertiaryContainerColor = const Color(0xFFF2DAFF);
-Color onTertiaryContainerColor = const Color(0xFF251431);
-Color errorColor = const Color(0xFFBA1A1A);
-Color onErrorColor = const Color(0xFFFFFFFF);
-Color errorContainerColor = const Color(0xFFFFDAD6);
-Color onErrorContainerColor = const Color(0xFF410002);
-Color outlineColor = const Color(0xFF73777F);
-Color backgroundColor = const Color(0xFFFDFCFF);
-Color onBackgroundColor = const Color(0xFF1A1C1E);
-Color surfaceColor = const Color(0xFFFDFCFF);
-Color onSurfaceColor = const Color(0xFF1A1C1E);
-Color surfaceVariantColor = const Color(0xFFDFE2EB);
-Color onSurfaceVariantColor = const Color(0xFF43474E);
-Color inverseSurfaceColor = const Color(0xFFE2E2E6);
-Color onInverseSurfaceColor = const Color(0xFF1A1C1E);
-Color inversePrimaryColor = const Color(0xFF9ECAFF);
-Color shadowColor = const Color(0xFF000000);
-Color surfaceTintColor = const Color(0xFF0061A4);
-Color outlineVariantColor = const Color(0xFFC3C7CF);
-Color scrimColor = const Color(0xFF000000);
+class DarkThemeColors {
+  static const Color primaryColor = Color(0xFF9ECAFF);
+  static const Color onPrimaryColor = Color(0xFF003258);
+  static const Color primaryContainerColor = Color(0xFF00497D);
+  static const Color onPrimaryContainerColor = Color(0xFFD1E4FF);
+  static const Color secondaryColor = Color(0xFFBBC7DB);
+  static const Color onSecondaryColor = Color(0xFF253140);
+  static const Color secondaryContainerColor = Color(0xFF3B4858);
+  static const Color onSecondaryContainerColor = Color(0xFFD7E3F7);
+  static const Color tertiaryColor = Color(0xFFD6BEE4);
+  static const Color onTertiaryColor = Color(0xFF3B2948);
+  static const Color tertiaryContainerColor = Color(0xFF523F5F);
+  static const Color onTertiaryContainerColor = Color(0xFFF2DAFF);
+  static const Color errorColor = Color(0xFFFFB4AB);
+  static const Color onErrorColor = Color(0xFF690005);
+  static const Color errorContainerColor = Color(0xFFFFDAD6);
+  static const Color onErrorContainerColor = Color(0xFF93000A);
+  static const Color outlineColor = Color(0xFF8D9199);
+  static const Color backgroundColor = Color(0xFF1A1C1E);
+  static const Color onBackgroundColor = Color(0xFFE2E2E6);
+  static const Color surfaceColor = Color(0xFF1A1C1E);
+  static const Color onSurfaceColor = Color(0xFFE2E2E6);
+  static const Color surfaceVariantColor = Color(0xFF43474E);
+  static const Color onSurfaceVariantColor = Color(0xFFC3C7CF);
+  static const Color inverseSurfaceColor = Color(0xFFE2E2E6);
+  static const Color onInverseSurfaceColor = Color(0xFF1A1C1E);
+  static const Color inversePrimaryColor = Color(0xFF0061A4);
+  static const Color shadowColor = Color(0xFF000000);
+  static const Color surfaceTintColor = Color(0xFF9ECAFF);
+  static const Color outlineVariantColor = Color(0xFF43474E);
+  static const Color scrimColor = Color(0xFF000000);
+}

lib/main.dart

@@ -14,7 +14,7 @@ import 'package:track_your_stop/utils/logger.dart';
 final logger = getLogger("Main");
 final _appRouter = AppRouter();
 
-void main() async {
+void main() {
   Logger.level = Level.debug;
   runApp(const ProviderScope(child: HaltestellenTrackerApp()));
 }
@@ -52,14 +52,15 @@ class HaltestellenTrackerState extends ConsumerState<HaltestellenTrackerApp>
     }
   }
 
-  Future<void> initApp() async {
+  void initApp() {
     WidgetsBinding.instance.addObserver(this);
   }
 
   @override
-  initState() {
+  void initState() {
     super.initState();
-    initApp().then((_) => logger.d("App Init Completed"));
+    initApp();
+    logger.d("App Init Completed");
   }
 
   @override