TYS-9: Fixed app icon and android specific ui parts

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/modules/home/views/home_page.dart

@@ -19,7 +19,7 @@ class HomePage extends StatelessWidget {
           onTap: tabsRouter.setActiveIndex,
           items: const [
             BottomNavigationBarItem(
-                label: 'Dapartures', icon: Icon(Icons.train)),
+                label: 'Departures', icon: Icon(Icons.train)),
             BottomNavigationBarItem(label: 'News', icon: Icon(Icons.newspaper)),
             BottomNavigationBarItem(
                 label: 'Settings', icon: Icon(Icons.settings)),

lib/modules/news/views/news_page.dart

@@ -4,7 +4,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:track_your_stop/modules/news/provider/news_list_provider.dart';
 import 'package:track_your_stop/modules/news/ui/news_view.dart';
 import 'package:track_your_stop/outbound/models/news_response.dart';
-import 'package:track_your_stop/shared/ui/bottom_app_bar.dart';
 
 class NewsPage extends HookConsumerWidget {
   const NewsPage({Key? key}) : super(key: key);

lib/modules/settings/ui/news_section.dart

@@ -13,24 +13,24 @@ SettingsSection buildNewsSettingsSection(BuildContext context, WidgetRef ref) {
       SettingsTile.switchTile(
         activeSwitchColor: Theme.of(context).toggleButtonsTheme.selectedColor,
         onToggle: (isActive) {
-          ref.watch(newsSettingsFilterProvider.notifier).state = isActive;
+          ref.watch(newsSettingsFetchAllProvider.notifier).state = isActive;
         },
-        initialValue: isNewsFiltered,
+        initialValue: fetchAllNews,
         leading: const Icon(Icons.filter_alt),
-        title: Text(AppLocalizations.of(context)!.settingsNewsFilterTitle),
+        title: Text(AppLocalizations.of(context)!.settingsNewsFetchAllTitle),
         description:
-            Text(AppLocalizations.of(context)!.settingsNewsFilterDescription),
+            Text(AppLocalizations.of(context)!.settingsNewsFetchAllDescription),
       ),
       SettingsTile.switchTile(
         activeSwitchColor: Theme.of(context).toggleButtonsTheme.selectedColor,
         onToggle: (isActive) {
-          ref.watch(newsSettingsFetchAllProvider.notifier).state = isActive;
+          ref.watch(newsSettingsFilterProvider.notifier).state = isActive;
         },
-        initialValue: fetchAllNews,
+        initialValue: isNewsFiltered,
         leading: const Icon(Icons.filter_alt),
-        title: Text(AppLocalizations.of(context)!.settingsNewsFetchAllTitle),
+        title: Text(AppLocalizations.of(context)!.settingsNewsFilterTitle),
         description:
-            Text(AppLocalizations.of(context)!.settingsNewsFetchAllDescription),
+            Text(AppLocalizations.of(context)!.settingsNewsFilterDescription),
       ),
     ],
   );

lib/modules/settings/views/settings_page.dart

@@ -5,14 +5,13 @@ import "package:track_your_stop/utils/app_theme.dart";
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:settings_ui/settings_ui.dart";
-import "package:track_your_stop/shared/ui/bottom_app_bar.dart";
 
 class SettingsPage extends HookConsumerWidget {
   const SettingsPage({Key? key}) : super(key: key);
 
   Widget _buildSettings(BuildContext context, WidgetRef ref) {
     return Padding(
-        padding: const EdgeInsets.only(top: 20),
+        padding: const EdgeInsets.only(top: 35),
         child: SettingsList(
           darkTheme: darkSettings,
           lightTheme: lightSettings,

lib/utils/app_theme.dart

@@ -18,11 +18,11 @@ final themeProvider = StateProvider<ThemeMode>((ref) {
 void _setUiStyle(final ThemeMode configuredMode) {
   SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
       statusBarColor: configuredMode == ThemeMode.dark
-          ? DarkThemeColors.secondaryContainerColor
-          : LightThemeColors.secondaryContainerColor,
+          ? DarkThemeColors.backgroundColor
+          : LightThemeColors.backgroundColor,
       systemNavigationBarColor: configuredMode == ThemeMode.dark
-          ? DarkThemeColors.secondaryContainerColor
-          : LightThemeColors.secondaryContainerColor));
+          ? DarkThemeColors.backgroundColor
+          : LightThemeColors.backgroundColor));
 }
 
 void switchTheme(WidgetRef ref, bool isActive) {

macos/Runner/Configs/AppInfo.xcconfig

@@ -8,7 +8,7 @@
 PRODUCT_NAME = TrackYourStop
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.tracker.mvvTracker
+PRODUCT_BUNDLE_IDENTIFIER = com.tracker.trackyourstop
 
 // The copyright displayed in application information
 PRODUCT_COPYRIGHT = Copyright © 2022 com.tracker. All rights reserved.

pubspec.yaml

@@ -1,5 +1,5 @@
 name: track_your_stop
-description: Track your favorite mvv stops.
+description: Track your favorite public transport stops.
 
 publish_to: "none"
 
@@ -63,7 +63,10 @@ flutter:
     - assets/images/
 
 # Flutter app icon
-flutter_icons:
+flutter_launcher_icons:
+  adaptive_icon_background: "#000000"
+  remove_alpha_ios: true
   android: true
   ios: true
-  image_path: assets/images/logo.png
+  image_path_android: assets/images/logo-android.png
+  image_path: assets/images/logo-ios.png

web/index.html

@@ -18,7 +18,7 @@
 
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="Track your favorite mvv stops.">
+  <meta name="description" content="Track your favorite public transport stops.">
 
   <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">

web/manifest.json

@@ -5,7 +5,7 @@
   "display": "standalone",
   "background_color": "#0175C2",
   "theme_color": "#0175C2",
-  "description": "Track your favorite mvv stops.",
+  "description": "Track your favorite public transport stops.",
   "orientation": "portrait-primary",
   "prefer_related_applications": false,
   "icons": [