Resolvendo delay entre loading messages e sincronizando dados

ozielguimaraes · Jun 9, 2024 · 4cf61f4 · 4cf61f4
1 parent bb45be6
commit 4cf61f4
Show file tree

Hide file tree

Showing 35 changed files with 617 additions and 309 deletions.
diff --git a/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Constants/ConfigurationConstant.cs b/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Constants/ConfigurationConstant.cs
@@ -5,7 +5,7 @@ public class ConfigurationConstant
         public const string DatabaseName = "Gtech.Ebd";
 
         //public const string BaseUrl = "https://ozielguimaraes.dev/api";
-        public const string BaseUrl = "https://101e-2804-14d-a4ba-8028-c9dc-ca4b-1b7d-d321.ngrok-free.app/api";
+        public const string BaseUrl = "https://69a4-2804-14d-a4ba-8028-c9dc-ca4b-1b7d-d321.ngrok-free.app/api";
         //public const string BaseUrl = "https://192.168.0.64:5005/api";
     }
 }
diff --git a/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/DependencyInjection.cs b/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/DependencyInjection.cs
@@ -12,7 +12,10 @@
 using Ebd.Mobile.Views.Chamada;
 using Ebd.MobileApp.Network;
 using Ebd.MobileApp.Services.Implementations;
+using Ebd.MobileApp.Services.Implementations.BottomSheets;
+using Ebd.MobileApp.Services.Interfaces.BottomSheets;
 using Ebd.MobileApp.ViewModels.Home;
+using Ebd.MobileApp.ViewModels.Perfil;
 using Ebd.MobileApp.ViewModels.Welcome;
 using Ebd.MobileApp.Views.Welcome;
 
@@ -49,6 +52,9 @@ public static IServiceCollection ConfigureAndHandleHttpClient(this IServiceColle
 
         public static IServiceCollection ConfigureServices(this IServiceCollection services)
         {
+            services.AddSingleton<IConfiguracoesDoUsuarioService, ConfiguracoesDoUsuarioService>();
+            services.AddSingleton<IPreferences>(Preferences.Default);
+
             //services.AddSingleton<IApiService, ApiService>();
             services.AddSingleton<ILoggerService, LoggerService>();
             services.AddSingleton<IDiagnosticService, DiagnosticService>();
@@ -67,6 +73,9 @@ public static IServiceCollection ConfigureServices(this IServiceCollection servi
             services.AddSingleton<ITurmaService, TurmaService>();
             services.AddSingleton<IUsuarioService, UsuarioService>();
 
+            //BottomSheets
+            services.AddSingleton<IEscolherTurmaBottomSheetService, EscolherTurmaBottomSheetService>();
+
             return services;
         }
 
@@ -110,6 +119,10 @@ public static IServiceCollection ConfigureViewModels(this IServiceCollection ser
             services.AddTransient<NovoAlunoViewModel>();
             services.AddTransient<AdicionarResponsavelViewModel>();
 
+            //Perfil
+            services.AddTransient<PerfilPageViewModel>();
+
+
             return services;
         }
 

diff --git a/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Ebd.MobileApp.csproj b/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Ebd.MobileApp.csproj
@@ -84,6 +84,7 @@
 		<PackageReference Include="Refractored.MvvmHelpers" Version="1.6.2" />
 		<PackageReference Include="System.Text.Json" Version="8.0.0" />
 		<PackageReference Include="CommunityToolkit.Maui" Version="7.0.1" />
+		<PackageReference Include="The49.Maui.BottomSheet" Version="8.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -199,6 +200,12 @@
 	  <MauiXaml Update="Views\NewItemPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\Perfil\PerfilPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\Turma\EscolherTurmaBottomSheet.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\Welcome\WelcomePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

diff --git a/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/MauiProgram.cs b/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/MauiProgram.cs
@@ -1,6 +1,7 @@
 using CommunityToolkit.Maui;
 using Controls.UserDialogs.Maui;
 using Microsoft.Extensions.Logging;
+using The49.Maui.BottomSheet;
 
 namespace Ebd.Mobile;
 
@@ -12,6 +13,7 @@ public static MauiApp CreateMauiApp()
         builder
             .UseMauiApp<App>()
             .UseUserDialogs()
+            .UseBottomSheet()
             .ConfigureFonts(fonts =>
             {
                 fonts.AddFont("OpenSansRegular.ttf", "OpenSansRegular");

diff --git a/...laBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Platforms/Android/Resources/values/styles.xml b/...laBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Platforms/Android/Resources/values/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+    <style name="Maui.MainTheme" parent="Theme.Material3.DayNight"></style>
+</resources>
diff --git a/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Repository/Repository.cs b/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Repository/Repository.cs
@@ -79,9 +79,9 @@ public bool DeleteItems<T>(Expression<Func<T, bool>> predicate)
         public IEnumerable<T> FiltrarItens<T>(Query query, int limit = int.MaxValue)
         {
             return DataBase
-                ?.GetCollection<T>()
-                ?.Find(query: Query.All(Query.Descending), limit: limit)
-                ?.Take(limit);
+                .GetCollection<T>()
+                .Find(query: Query.All(Query.Descending), limit: limit)
+                .Take(limit);
         }
 
         public IEnumerable<T> FiltrarItens<T>(Expression<Func<T, bool>> predicate) => DataBase.GetCollection<T>().Find(predicate);

diff --git a/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Services/Implementations/AlunoService.cs b/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Services/Implementations/AlunoService.cs
@@ -6,7 +6,7 @@
 
 namespace Ebd.Mobile.Services.Implementations
 {
-    public class AlunoService : BaseService, IAlunoService
+    internal sealed class AlunoService : BaseService, IAlunoService
     {
         private const string PathToService = "aluno";
 

diff --git a/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Services/Implementations/AvaliacaoService.cs b/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Services/Implementations/AvaliacaoService.cs
@@ -2,12 +2,10 @@
 using Ebd.Mobile.Services.Interfaces;
 using Ebd.Mobile.Services.Responses;
 using Ebd.Mobile.Services.Responses.Avaliacao;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Ebd.Mobile.Services.Implementations
 {
-    public class AvaliacaoService : BaseService, IAvaliacaoService
+    internal sealed class AvaliacaoService : BaseService, IAvaliacaoService
     {
         private const string PathToService = "avaliacao";
 

diff --git a/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Services/Implementations/BairroService.cs b/EscolaBiblicaDominical/Ebd.Mobile/Ebd.MobileApp/Services/Implementations/BairroService.cs
@@ -5,7 +5,7 @@
 
 namespace Ebd.Mobile.Services.Implementations
 {
-    public class BairroService : BaseService, IBairroService
+    internal sealed class BairroService : BaseService, IBairroService
     {
         private const string PathToService = "bairro";