Skip to content

Commit

Permalink
change app name and icon
Browse files Browse the repository at this point in the history
  • Loading branch information
@MoazSalem
MoazSalem committed Jul 8, 2023
1 parent ae33267 commit 933b9f8
Show file tree
Hide file tree
Showing 43 changed files with 122 additions and 66 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Blue
# ADAS Graduation APP

A starting point for the graduation project app.
The graduation project app.
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.e7na.blue"
applicationId "com.e7na.adas"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion 21
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.e7na.blue">
package="com.e7na.adas">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.e7na.blue">
package="com.e7na.adas">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
Expand Down
Binary file modified android/app/src/main/ic_launcher-playstore.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion android/app/src/main/kotlin/com/moazsalem/reactive_ble/MainActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.e7na.blue
package com.e7na.adas

import io.flutter.embedding.android.FlutterActivity

Expand Down
46 changes: 38 additions & 8 deletions android/app/src/main/res/drawable/ic_launcher_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,44 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="29.88"
android:viewportHeight="47.03">
<group android:scaleX="0.292256"
android:scaleY="0.46"
android:translateX="10.573695"
android:translateY="12.6981">
<path
android:pathData="M29.88,13.42L16.46,0h-2.35L14.11,17.84L3.33,7.05 0,10.38l13.13,13.13L0,36.65l3.33,3.33 10.78,-10.78v17.84h2.35l13.42,-13.42 -10.09,-10.1 10.09,-10.1ZM18.82,9.01l4.42,4.42 -4.42,4.41L18.82,9.01ZM23.24,33.62l-4.42,4.41v-8.84l4.42,4.43Z"
android:viewportWidth="53.07"
android:viewportHeight="52.52">
<group android:scaleX="0.46"
android:scaleY="0.4552327"
android:translateX="14.3289"
android:translateY="14.305589">
<path
android:pathData="m38.39,12.47c-0.35,-1.01 -1.31,-1.73 -2.43,-1.73h-18.8c-1.12,0 -2.08,0.72 -2.43,1.73l-3.55,10.24v13.67c0,0.94 0.77,1.71 1.71,1.71h1.71c0.95,0 1.71,-0.77 1.71,-1.71v-1.71h20.51v1.71c0,0.94 0.77,1.71 1.71,1.71h1.71c0.95,0 1.71,-0.77 1.71,-1.71v-13.67l-3.55,-10.24ZM17.17,29.54c-1.42,0 -2.56,-1.14 -2.56,-2.56s1.14,-2.56 2.56,-2.56 2.56,1.14 2.56,2.56 -1.14,2.56 -2.56,2.56ZM35.97,29.54c-1.42,0 -2.56,-1.14 -2.56,-2.56s1.14,-2.56 2.56,-2.56 2.56,1.14 2.56,2.56 -1.14,2.56 -2.56,2.56ZM14.61,21l2.56,-7.69h18.8l2.56,7.69L14.6,21Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m46.83,20.78l-1.68,1.69c0.84,1.19 0.84,2.71 0,3.89l1.68,1.69c2.02,-2.03 2.02,-5.08 0,-7.27Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m50.14,17.41l-1.63,1.63c2.77,3.02 2.77,7.55 0,10.74l1.63,1.63c3.9,-3.88 3.9,-9.96 0,-14Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m22.93,6.24l1.69,1.68c1.18,-0.84 2.7,-0.84 3.89,0l1.69,-1.68c-2.03,-2.02 -5.07,-2.02 -7.27,0Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m19.56,2.92l1.63,1.63c3.03,-2.77 7.56,-2.77 10.74,0l1.63,-1.63c-3.88,-3.9 -9.95,-3.9 -14,0Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m6.24,28.05l1.68,-1.69c-0.84,-1.19 -0.84,-2.71 0,-3.89l-1.68,-1.69c-2.02,2.03 -2.02,5.08 0,7.27Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m2.92,31.41l1.63,-1.63c-2.77,-3.03 -2.77,-7.56 0,-10.74l-1.63,-1.64c-3.9,3.89 -3.9,9.96 0,14Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m14.59,40.37h1.64l3.12,8.75h-1.7l-0.54,-1.56h-3.39l-0.54,1.56h-1.7l3.12,-8.75ZM14.27,46.01h2.3l-1.15,-3.32 -1.15,3.32Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m20.04,40.37h2.39c2.95,0 4.63,1.89 4.63,4.38s-1.89,4.38 -4.56,4.38h-2.46v-8.75ZM21.67,41.88v5.73h0.64c1.92,0 3.12,-1.24 3.12,-2.87s-1.02,-2.87 -3.19,-2.87h-0.56Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m30.07,40.37h1.64l3.12,8.75h-1.7l-0.54,-1.56h-3.39l-0.54,1.56h-1.7l3.12,-8.75ZM29.75,46.01h2.3l-1.15,-3.32 -1.15,3.32Z"
android:fillColor="#1467ed"/>
<path
android:pathData="m35.05,47.68l1.49,-1.18c0.44,0.77 1.12,1.19 1.92,1.19 0.86,0 1.33,-0.56 1.33,-1.17 0,-0.73 -0.9,-0.97 -1.82,-1.26 -1.19,-0.38 -2.48,-0.83 -2.48,-2.49 0,-1.4 1.22,-2.51 2.9,-2.51 1.4,0 2.23,0.54 2.94,1.27l-1.34,1.02c-0.37,-0.56 -0.9,-0.84 -1.58,-0.84 -0.8,0 -1.22,0.43 -1.22,1 0,0.71 0.83,0.91 1.79,1.24 1.19,0.38 2.53,0.91 2.53,2.59 0,1.38 -1.1,2.72 -3.02,2.72 -1.57,0 -2.61,-0.67 -3.42,-1.57Z"
android:fillColor="#1467ed"/>
</group>
</vector>
46 changes: 38 additions & 8 deletions android/app/src/main/res/drawable/ic_launcher_monochrome.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,44 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="29.88"
android:viewportHeight="47.03">
<group android:scaleX="0.23507549"
android:scaleY="0.37"
android:translateX="11.427972"
android:translateY="14.81445">
<path
android:pathData="M29.88,13.42L16.46,0h-2.35L14.11,17.84L3.33,7.05 0,10.38l13.13,13.13L0,36.65l3.33,3.33 10.78,-10.78v17.84h2.35l13.42,-13.42 -10.09,-10.1 10.09,-10.1ZM18.82,9.01l4.42,4.42 -4.42,4.41L18.82,9.01ZM23.24,33.62l-4.42,4.41v-8.84l4.42,4.43Z"
android:viewportWidth="53.07"
android:viewportHeight="52.52">
<group android:scaleX="0.46"
android:scaleY="0.4552327"
android:translateX="14.3289"
android:translateY="14.305589">
<path
android:pathData="m38.39,12.47c-0.35,-1.01 -1.31,-1.73 -2.43,-1.73h-18.8c-1.12,0 -2.08,0.72 -2.43,1.73l-3.55,10.24v13.67c0,0.94 0.77,1.71 1.71,1.71h1.71c0.95,0 1.71,-0.77 1.71,-1.71v-1.71h20.51v1.71c0,0.94 0.77,1.71 1.71,1.71h1.71c0.95,0 1.71,-0.77 1.71,-1.71v-13.67l-3.55,-10.24ZM17.17,29.54c-1.42,0 -2.56,-1.14 -2.56,-2.56s1.14,-2.56 2.56,-2.56 2.56,1.14 2.56,2.56 -1.14,2.56 -2.56,2.56ZM35.97,29.54c-1.42,0 -2.56,-1.14 -2.56,-2.56s1.14,-2.56 2.56,-2.56 2.56,1.14 2.56,2.56 -1.14,2.56 -2.56,2.56ZM14.61,21l2.56,-7.69h18.8l2.56,7.69L14.6,21Z"
android:fillColor="#44474d"/>
<path
android:pathData="m46.83,20.78l-1.68,1.69c0.84,1.19 0.84,2.71 0,3.89l1.68,1.69c2.02,-2.03 2.02,-5.08 0,-7.27Z"
android:fillColor="#44474d"/>
<path
android:pathData="m50.14,17.41l-1.63,1.63c2.77,3.02 2.77,7.55 0,10.74l1.63,1.63c3.9,-3.88 3.9,-9.96 0,-14Z"
android:fillColor="#44474d"/>
<path
android:pathData="m22.93,6.24l1.69,1.68c1.18,-0.84 2.7,-0.84 3.89,0l1.69,-1.68c-2.03,-2.02 -5.07,-2.02 -7.27,0Z"
android:fillColor="#44474d"/>
<path
android:pathData="m19.56,2.92l1.63,1.63c3.03,-2.77 7.56,-2.77 10.74,0l1.63,-1.63c-3.88,-3.9 -9.95,-3.9 -14,0Z"
android:fillColor="#44474d"/>
<path
android:pathData="m6.24,28.05l1.68,-1.69c-0.84,-1.19 -0.84,-2.71 0,-3.89l-1.68,-1.69c-2.02,2.03 -2.02,5.08 0,7.27Z"
android:fillColor="#44474d"/>
<path
android:pathData="m2.92,31.41l1.63,-1.63c-2.77,-3.03 -2.77,-7.56 0,-10.74l-1.63,-1.64c-3.9,3.89 -3.9,9.96 0,14Z"
android:fillColor="#44474d"/>
<path
android:pathData="m14.59,40.37h1.64l3.12,8.75h-1.7l-0.54,-1.56h-3.39l-0.54,1.56h-1.7l3.12,-8.75ZM14.27,46.01h2.3l-1.15,-3.32 -1.15,3.32Z"
android:fillColor="#44474d"/>
<path
android:pathData="m20.04,40.37h2.39c2.95,0 4.63,1.89 4.63,4.38s-1.89,4.38 -4.56,4.38h-2.46v-8.75ZM21.67,41.88v5.73h0.64c1.92,0 3.12,-1.24 3.12,-2.87s-1.02,-2.87 -3.19,-2.87h-0.56Z"
android:fillColor="#44474d"/>
<path
android:pathData="m30.07,40.37h1.64l3.12,8.75h-1.7l-0.54,-1.56h-3.39l-0.54,1.56h-1.7l3.12,-8.75ZM29.75,46.01h2.3l-1.15,-3.32 -1.15,3.32Z"
android:fillColor="#44474d"/>
<path
android:pathData="m35.05,47.68l1.49,-1.18c0.44,0.77 1.12,1.19 1.92,1.19 0.86,0 1.33,-0.56 1.33,-1.17 0,-0.73 -0.9,-0.97 -1.82,-1.26 -1.19,-0.38 -2.48,-0.83 -2.48,-2.49 0,-1.4 1.22,-2.51 2.9,-2.51 1.4,0 2.23,0.54 2.94,1.27l-1.34,1.02c-0.37,-0.56 -0.9,-0.84 -1.58,-0.84 -0.8,0 -1.22,0.43 -1.22,1 0,0.71 0.83,0.91 1.79,1.24 1.19,0.38 2.53,0.91 2.53,2.59 0,1.38 -1.1,2.72 -3.02,2.72 -1.57,0 -2.61,-0.67 -3.42,-1.57Z"
android:fillColor="#44474d"/>
</group>
</vector>
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions android/app/src/main/res/values-ar/strings.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion android/app/src/main/res/values/ic_launcher_background.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#3DDC84</color>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="appName">Blue</string>
<string name="appName">ADAS</string>
</resources>
2 changes: 1 addition & 1 deletion android/app/src/profile/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.e7na.blue">
package="com.e7na.adas">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
6 changes: 3 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.e7na.blue;
PRODUCT_BUNDLE_IDENTIFIER = com.e7na.adas;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -424,7 +424,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.e7na.blue;
PRODUCT_BUNDLE_IDENTIFIER = com.e7na.adas;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -446,7 +446,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.e7na.blue;
PRODUCT_BUNDLE_IDENTIFIER = com.e7na.adas;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>blue</string>
<string>ADAS</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
4 changes: 2 additions & 2 deletions lib/Bloc/ble_bloc.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import 'package:android_intent_plus/android_intent.dart';
import 'package:app_settings/app_settings.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:encrypt/encrypt.dart' as encrypt;
import 'package:blue/Data/Models/device_model.dart';
import 'package:blue/Services/flex_colors/theme_controller.dart';
import 'package:adas/Data/Models/device_model.dart';
import 'package:adas/Services/flex_colors/theme_controller.dart';

part 'ble_event.dart';

Expand Down
4 changes: 2 additions & 2 deletions lib/Data/flex_themes.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flex_color_scheme/flex_color_scheme.dart';
import 'package:blue/Services/flex_colors/app_color.dart';
import 'package:blue/Services/flex_colors/theme_controller.dart';
import 'package:adas/Services/flex_colors/app_color.dart';
import 'package:adas/Services/flex_colors/theme_controller.dart';

ThemeData flexTheme(
{required String mode,
Expand Down
2 changes: 1 addition & 1 deletion lib/Data/system_ui.dart
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

Expand Down
4 changes: 2 additions & 2 deletions lib/Screens/ble_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:samsung_ui_scroll_effect/samsung_ui_scroll_effect.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:blue/Widgets/device_tile.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'package:adas/Widgets/device_tile.dart';
import 'settings_page.dart';
import 'setter_page.dart';
import 'share_page.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/Screens/controller_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter_joystick/flutter_joystick.dart';
import 'package:websocket_universal/websocket_universal.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'setter_page.dart';

late String _ip;
Expand Down
2 changes: 1 addition & 1 deletion lib/Screens/controls_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:gauge_indicator/gauge_indicator.dart';
import 'package:samsung_ui_scroll_effect/samsung_ui_scroll_effect.dart';
import 'package:websocket_universal/websocket_universal.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'controller_page.dart';
import 'setter_page.dart';
import 'settings_page.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/Screens/main_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:samsung_ui_scroll_effect/samsung_ui_scroll_effect.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'controls_page.dart';
import 'scan_page.dart';
import 'setter_page.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/Screens/qr_generate_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:qr_flutter/qr_flutter.dart';
import 'package:blue/Screens/setter_page.dart';
import 'package:adas/Screens/setter_page.dart';

class QRGeneratePage extends StatelessWidget {
final String deviceID;
Expand Down
2 changes: 1 addition & 1 deletion lib/Screens/qr_scan_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:blue/Screens/setter_page.dart';
import 'package:adas/Screens/setter_page.dart';
import 'package:flutter/material.dart';
import 'package:mobile_scanner/mobile_scanner.dart';
import 'package:easy_localization/easy_localization.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/Screens/qr_select_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:samsung_ui_scroll_effect/samsung_ui_scroll_effect.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'qr_generate_page.dart';
import 'setter_page.dart';

Expand Down
6 changes: 3 additions & 3 deletions lib/Screens/scan_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:samsung_ui_scroll_effect/samsung_ui_scroll_effect.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:blue/Widgets/ble_tile.dart';
import 'package:blue/Data/Models/device_model.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'package:adas/Widgets/ble_tile.dart';
import 'package:adas/Data/Models/device_model.dart';
import 'ble_page.dart';
import 'settings_page.dart';
import 'setter_page.dart';
Expand Down
6 changes: 3 additions & 3 deletions lib/Screens/setter_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:hive/hive.dart';
import 'package:blue/Services/flex_colors/theme_controller.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:blue/Data/system_ui.dart';
import 'package:adas/Services/flex_colors/theme_controller.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'package:adas/Data/system_ui.dart';
import 'main_page.dart';

late BleBloc B;
Expand Down
4 changes: 2 additions & 2 deletions lib/Screens/settings_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:samsung_ui_scroll_effect/samsung_ui_scroll_effect.dart';
import 'package:blue/Widgets/theme_popup_menu.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:adas/Widgets/theme_popup_menu.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'scan_page.dart';
import 'setter_page.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/Screens/share_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:samsung_ui_scroll_effect/samsung_ui_scroll_effect.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'qr_scan_page.dart';
import 'setter_page.dart';
import 'qr_select_page.dart';
Expand Down
6 changes: 3 additions & 3 deletions lib/Widgets/ble_tile.dart
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:blue/Data/Models/device_model.dart';
import 'package:blue/Screens/setter_page.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'package:adas/Data/Models/device_model.dart';
import 'package:adas/Screens/setter_page.dart';

class BleTile extends StatefulWidget {
final BleDevice device;
Expand Down
4 changes: 2 additions & 2 deletions lib/Widgets/device_tile.dart
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:blue/Bloc/ble_bloc.dart';
import 'package:flutter/material.dart';
import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:blue/Data/Models/device_model.dart';
import 'package:adas/Data/Models/device_model.dart';
import 'package:adas/Bloc/ble_bloc.dart';

class DeviceTile extends StatelessWidget {
final BleDevice device;
Expand Down
2 changes: 1 addition & 1 deletion lib/Widgets/theme_popup_menu.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:blue/Services/flex_colors/app_color.dart';
import 'package:adas/Services/flex_colors/app_color.dart';

// Widget used to change the used AppColor.customSchemes[index] in example 4.
class ThemePopupMenu extends StatelessWidget {
Expand Down
6 changes: 3 additions & 3 deletions lib/main.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:dynamic_color/dynamic_color.dart';
import 'package:hive_flutter/hive_flutter.dart';
import 'package:blue/Bloc/ble_bloc.dart';
import 'Services/flex_colors/theme_controller.dart';
import 'Services/flex_colors/theme_service.dart';
import 'Services/flex_colors/theme_service_hive.dart';
import 'package:blue/Screens/setter_page.dart';
import 'package:adas/Bloc/ble_bloc.dart';
import 'package:adas/Screens/setter_page.dart';
import 'Data/flex_themes.dart';
import 'Data/theme.dart';

Expand Down Expand Up @@ -53,7 +53,7 @@ class MyApp extends StatelessWidget {
builder: (context, state) {
return DynamicColorBuilder(builder: (lightColorScheme, darkColorScheme) {
return MaterialApp(
title: 'Blue',
title: 'ADAS',
debugShowCheckedModeBanner: false,
theme: flexTheme(
mode: "light",
Expand Down
Loading

0 comments on commit 933b9f8

Please sign in to comment.