From 3850f0ed5a0e3043ea64a78e549f5b5e3b4b1cad Mon Sep 17 00:00:00 2001
From: Rodrigo Moraes <rodrigomoraes61@outlook.com>
Date: Tue, 7 Nov 2023 11:28:24 -0300
Subject: [PATCH 1/2] fix: Ajuste para biblioteca do android Broadcast
 respeitas as regras do android 12, ajuste no nome do aplicativo, ajuste no
 launch do aplicativo, ajuste para gerar um build assinado

---
 src/MobileApp/android/.gitignore              |  1 +
 src/MobileApp/android/app/build.gradle        | 18 +++++++++++++++---
 .../android/app/src/main/AndroidManifest.xml  | 19 ++++++++++++++++---
 src/MobileApp/android/build.gradle            |  2 ++
 src/MobileApp/pubspec.yaml                    |  2 +-
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/MobileApp/android/.gitignore b/src/MobileApp/android/.gitignore
index 0a741cb4..9b7c0982 100644
--- a/src/MobileApp/android/.gitignore
+++ b/src/MobileApp/android/.gitignore
@@ -9,3 +9,4 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+keystore.jks
\ No newline at end of file
diff --git a/src/MobileApp/android/app/build.gradle b/src/MobileApp/android/app/build.gradle
index 98c87274..c14887da 100644
--- a/src/MobileApp/android/app/build.gradle
+++ b/src/MobileApp/android/app/build.gradle
@@ -5,6 +5,11 @@ if (localPropertiesFile.exists()) {
         localProperties.load(reader)
     }
 }
+def keystoreProperties = new Properties()
+   def keystorePropertiesFile = rootProject.file('key.properties')
+   if (keystorePropertiesFile.exists()) {
+       keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+   }
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
@@ -42,15 +47,22 @@ android {
         minSdkVersion 21
         targetSdkVersion 33
         ndkVersion "25.1.8937393"
+        multiDexEnabled true
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
     buildTypes {
         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/src/MobileApp/android/app/src/main/AndroidManifest.xml b/src/MobileApp/android/app/src/main/AndroidManifest.xml
index ff038206..92a193b9 100644
--- a/src/MobileApp/android/app/src/main/AndroidManifest.xml
+++ b/src/MobileApp/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.CSoft.ReachUp">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -11,16 +12,28 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/> 
     <application
-        android:name="com.CSoft.ReachUp"
+        android:name="io.flutter.app.FlutterApplication"
         android:label="ReachUp"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher" 
+        android:exported="true"
+        tools:node="merge">
+        <receiver android:name="org.altbeacon.beacon.startup.StartupBroadcastReceiver"   android:exported="false"
+            tools:node="merge">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
+            </intent-filter>
+        </receiver>
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true"
+            tools:node="merge">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/src/MobileApp/android/build.gradle b/src/MobileApp/android/build.gradle
index 29bbb552..3c3ee4b7 100644
--- a/src/MobileApp/android/build.gradle
+++ b/src/MobileApp/android/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     ext.kotlin_version = '1.6.10'
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
     dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
 }
diff --git a/src/MobileApp/pubspec.yaml b/src/MobileApp/pubspec.yaml
index d67deb2a..50d9e00d 100644
--- a/src/MobileApp/pubspec.yaml
+++ b/src/MobileApp/pubspec.yaml
@@ -3,7 +3,7 @@ description: Mobile application for indoor location, provides blind and visually
 
 publish_to: 'none' 
 
-version: 1.0.0+1
+version: 1.0.4+5
 
 environment:
   sdk: "2.12.0"

From 1962206505bf2020662ef0614db8352bfa0a5a08 Mon Sep 17 00:00:00 2001
From: Rodrigo Moraes <rodrigomoraes61@outlook.com>
Date: Tue, 7 Nov 2023 11:33:32 -0300
Subject: [PATCH 2/2] =?UTF-8?q?Ajustes=20de=20vers=C3=A3o=20e=20de=20impor?=
 =?UTF-8?q?ts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MobileApp/lib/View/SignView/SignUp.view.dart | 11 ++++++-----
 src/MobileApp/pubspec.yaml                       |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/MobileApp/lib/View/SignView/SignUp.view.dart b/src/MobileApp/lib/View/SignView/SignUp.view.dart
index fff2d5ca..bb8b52db 100644
--- a/src/MobileApp/lib/View/SignView/SignUp.view.dart
+++ b/src/MobileApp/lib/View/SignView/SignUp.view.dart
@@ -1,4 +1,7 @@
 // @dart=2.9
+import 'dart:convert';
+
+import 'package:ReachUp/Component/Database/Database.db.dart';
 import 'package:ReachUp/Component/Dialog/CustomDialog.component.dart';
 import 'package:ReachUp/Controller/Account.controller.dart';
 import 'package:ReachUp/Controller/Category.controller.dart';
@@ -314,11 +317,9 @@ class _StepperBodyState extends State<StepperBody> {
           EasyLoading.show(status: "Carregando");
           accountController.signUp().then((value) {
             EasyLoading.dismiss();
-              Globals.user = value;
-              Database.insert(
-                  key: "user",
-                  value: jsonEncode(
-                      Globals.user.toJson()));
+            Globals.user = value;
+            Database.insert(
+                key: "user", value: jsonEncode(Globals.user.toJson()));
           });
 
           List<Category> categories = new List<Category>();
diff --git a/src/MobileApp/pubspec.yaml b/src/MobileApp/pubspec.yaml
index 50d9e00d..48b90c30 100644
--- a/src/MobileApp/pubspec.yaml
+++ b/src/MobileApp/pubspec.yaml
@@ -3,7 +3,7 @@ description: Mobile application for indoor location, provides blind and visually
 
 publish_to: 'none' 
 
-version: 1.0.4+5
+version: 1.0.6+6
 
 environment:
   sdk: "2.12.0"