diff --git a/android/app/build.gradle b/android/app/build.gradle
index c4957b0..ae26fd2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -37,8 +37,8 @@ if (keystorePropertiesFile.exists()) {
android {
- namespace "com.example.sfm_app"
- compileSdkVersion 34
+ namespace "vn.smatec.sfm"
+ compileSdkVersion 35
ndkVersion flutter.ndkVersion
compileOptions {
@@ -72,11 +72,11 @@ android {
multiDexEnabled true
// END: Flutter Local Notifications
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.example.sfm_app"
+ applicationId "vn.smatec.sfm"
// 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 23
- targetSdkVersion 33
+ targetSdkVersion 35
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
@@ -92,7 +92,7 @@ android {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
+ signingConfig signingConfigs.release
}
}
}
diff --git a/android/app/google-services.json b/android/app/google-services.json
index 7b35503..8e1aa41 100644
--- a/android/app/google-services.json
+++ b/android/app/google-services.json
@@ -1,21 +1,21 @@
{
"project_info": {
- "project_number": "910110439150",
- "project_id": "sfm-notification",
- "storage_bucket": "sfm-notification.firebasestorage.app"
+ "project_number": "926568447136",
+ "project_id": "smart-fire-monitoring",
+ "storage_bucket": "smart-fire-monitoring.firebasestorage.app"
},
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:910110439150:android:c3dbc3b4a85d7cb75b65ff",
+ "mobilesdk_app_id": "1:926568447136:android:58a2bfdd8fedbebf14ddc5",
"android_client_info": {
- "package_name": "com.example.sfm_app"
+ "package_name": "vn.smatec.sfm"
}
},
"oauth_client": [],
"api_key": [
{
- "current_key": "AIzaSyADdZ66_q4HALlb0-yEGgeyGnsbwmlvDsA"
+ "current_key": "AIzaSyBdyZGdAaE-p7fhhCqOST84XaFzi44JM0k"
}
],
"services": {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 0f2efd2..738ab0c 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,27 +2,27 @@
-
+
-
+
-
+
-
+
+ android:icon="@mipmap/launcher_icon">
+ CADisableMinimumFrameDurationOnPhone
+
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDisplayName
@@ -24,6 +26,23 @@
$(FLUTTER_BUILD_NUMBER)
LSRequiresIPhoneOS
+ NSCameraUsageDescription
+ Camera permission is required for barcode scanning.
+ NSLocationAlwaysAndWhenInUseUsageDescription
+ Always and when in use!
+ NSLocationAlwaysUsageDescription
+ Can I have location always?
+ NSLocationUsageDescription
+ Older devices need location.
+ NSLocationWhenInUseUsageDescription
+ Need location when in use
+ UIApplicationSupportsIndirectInputEvents
+
+ UIBackgroundModes
+
+ fetch
+ remote-notification
+
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
@@ -43,28 +62,5 @@
UIViewControllerBasedStatusBarAppearance
- CADisableMinimumFrameDurationOnPhone
-
- UIApplicationSupportsIndirectInputEvents
-
-
-
- NSLocationWhenInUseUsageDescription
- Need location when in use
- NSLocationAlwaysAndWhenInUseUsageDescription
- Always and when in use!
- NSLocationUsageDescription
- Older devices need location.
- NSLocationAlwaysUsageDescription
- Can I have location always?
-
- NSCameraUsageDescription
- camera
-
-
- NSCameraUsageDescription
- Camera permission is required for barcode scanning.
-
-
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
new file mode 100644
index 0000000..903def2
--- /dev/null
+++ b/ios/Runner/Runner.entitlements
@@ -0,0 +1,8 @@
+
+
+
+
+ aps-environment
+ development
+
+
diff --git a/lib/feature/auth/login/screen/login_screen.dart b/lib/feature/auth/login/screen/login_screen.dart
index 9d541d2..4ae7302 100644
--- a/lib/feature/auth/login/screen/login_screen.dart
+++ b/lib/feature/auth/login/screen/login_screen.dart
@@ -44,31 +44,27 @@ class _LoginScreenState extends State {
Widget build(BuildContext context) {
return Scaffold(
body: SharedBackground(
- child: SingleChildScrollView(
+ child: SizedBox(
+ height: MediaQuery.sizeOf(context).height,
+ width: MediaQuery.sizeOf(context).width,
child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Row(
+ Column(
children: [
- const Spacer(),
- Expanded(
- flex: 4,
- child: Image.asset(
- ImageConstants.instance.getImage("logo"),
- height: context.dynamicHeight(0.2),
- ),
+ const SizedBox(height: 100.0,),
+ Image.asset(
+ ImageConstants.instance.getImage("lo-go"),
+ height: context.dynamicHeight(0.1),
),
- const Spacer(),
],
),
- SizedBox(
- height: context.mediumValue,
- ),
+
StreamBuilder