Merge branch 'release/2.0.8'

bol-project · Aug 11, 2024 · 5891b9a · 5891b9a
2 parents 2bc5fe2 + 1d1d794
commit 5891b9a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 11 deletions.
diff --git a/src/BolWallet/BolWallet.csproj b/src/BolWallet/BolWallet.csproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>BolWallet</RootNamespace>
     <UseMaui>true</UseMaui>
-    <MauiVersion>8.0.70</MauiVersion>
+    <MauiVersion>8.0.80</MauiVersion>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>
 
@@ -211,7 +211,7 @@
   <ItemGroup>
     <PackageReference Include="akavache" Version="9.1.20" />
     <PackageReference Include="Blazing.Mvvm" Version="1.4.0" />
-    <PackageReference Include="BolChain.Core" Version="1.1.2" />
+    <PackageReference Include="BolChain.Core" Version="1.1.3" />
     <PackageReference Include="CommunityToolkit.Maui" Version="8.0.1" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />

diff --git a/src/BolWallet/Pages/CreateCodenameIndividualPage.razor b/src/BolWallet/Pages/CreateCodenameIndividualPage.razor
@@ -95,11 +95,11 @@
                         <!-- Use a div with text-center class to center the buttons -->
                         @if (string.IsNullOrEmpty(createCodenameIndividualViewModel.Codename.Trim()))
                         {
-                            <MudButton Variant="MudBlazor.Variant.Filled" Disabled="!IndividualCodenameForm?.IsFormFilled ?? true" Color="Color.Primary" OnClick="@(()=>createCodenameIndividualViewModel.GenerateCommand.Execute(null))">Generate</MudButton>
+                            <MudButton Variant="MudBlazor.Variant.Filled" Style="background-color:#0050FF !important" Disabled="!IndividualCodenameForm?.IsFormFilled ?? true" OnClick="@(()=>createCodenameIndividualViewModel.GenerateCommand.Execute(null))">Generate</MudButton>
                         }
                         else
                         {
-                            <MudButton Variant="MudBlazor.Variant.Filled" Color="Color.Primary" OnClick="@(()=> createCodenameIndividualViewModel.SubmitCommand.Execute(null))">Submit</MudButton>
+                            <MudButton Variant="MudBlazor.Variant.Filled" Style="background-color:#0050FF !important" OnClick="@(()=> createCodenameIndividualViewModel.SubmitCommand.Execute(null))">Submit</MudButton>
                         }
                     </div>
                 </MudItem>
@@ -111,6 +111,11 @@
     .text-center {
         text-align: center;
     }
+
+    .mud-button{
+        background-color: #594AE2 !important
+    }
+
 </style>
 @code
 {

diff --git a/src/BolWallet/Platforms/Android/MainActivity.cs b/src/BolWallet/Platforms/Android/MainActivity.cs
@@ -2,7 +2,8 @@
 using Android.Content.PM;
 using Android.OS;
 using Android.Views;
-using AndroidX.AppCompat.App;
+using AndroidX.AppCompat.App;
+using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
 
 namespace BolWallet;
 
@@ -14,6 +15,8 @@ protected override void OnCreate(Bundle bundle)
 		base.OnCreate(bundle);
 		Window.AddFlags(WindowManagerFlags.KeepScreenOn);
 
-		AppCompatDelegate.DefaultNightMode = AppCompatDelegate.ModeNightNo;
+        App.Current.On<Microsoft.Maui.Controls.PlatformConfiguration.Android>().UseWindowSoftInputModeAdjust(WindowSoftInputModeAdjust.Resize);
+
+        AppCompatDelegate.DefaultNightMode = AppCompatDelegate.ModeNightNo;
 	}
 }
diff --git a/src/BolWallet/Platforms/MacCatalyst/Info.plist b/src/BolWallet/Platforms/MacCatalyst/Info.plist
@@ -31,9 +31,9 @@
 		<string>processing</string>
 	</array>
 	<key>CFBundleVersion</key>
-    <string>2024.0724.2355</string>
+    <string>2024.0811.0330</string>
 	<key>CFBundleShortVersionString</key>
-    <string>2.0.7</string>
+    <string>2.0.8</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/BolWallet/Platforms/iOS/Info.plist b/src/BolWallet/Platforms/iOS/Info.plist
@@ -35,9 +35,9 @@
     <key>NSPhotoLibraryUsageDescription</key>
     <string>The app can use the photo library to select photos from your library and use them when creating a new wallet.</string>
     <key>CFBundleVersion</key>
-    <string>2024.0724.2355</string>
+    <string>2024.0811.0330</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.0.7</string>
+    <string>2.0.8</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
     <key>NSHumanReadableCopyright</key>

diff --git a/src/BolWallet/Views/GetCertifiedPage.xaml b/src/BolWallet/Views/GetCertifiedPage.xaml
@@ -49,10 +49,15 @@
                     FontSize="24"
                     TextColor="{DynamicResource Primary}" />
                 <Label
-                    Text="You need 2 certifications to Open your Account."
+                    Text="You will get 1 certification in this round."
                     IsVisible="{Binding IsAccountOpen, Converter={StaticResource InverseBooleanConverter}}"
                     HorizontalTextAlignment="Center"
                     TextColor="{DynamicResource Primary}" />
+                <Label
+                   Text="You need 2 rounds with 1 certification in each round to open your account."
+                   IsVisible="{Binding IsAccountOpen, Converter={StaticResource InverseBooleanConverter}}"
+                   HorizontalTextAlignment="Center"
+                   TextColor="{DynamicResource Primary}" />
                 <Label
                     Text="Your Account is Open but you can acquire additional certifications."
                     IsVisible="{Binding IsAccountOpen}"