Update to 0.10

Change background colour to have android option. Rework a few things to get build that works when produced as an app bundle.
g-weston · Sep 15, 2024 · 8375c07 · 8375c07
1 parent 555afb4
commit 8375c07
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/AboutPage.xaml b/AboutPage.xaml
@@ -32,7 +32,7 @@
                        HorizontalTextAlignment="Center"
                        Grid.Row="1" 
                        Grid.Column="1"/>
-                <Label Text="Version 0.9"
+                <Label Text="Version 0.10"
                        VerticalOptions="CenterAndExpand"
                        HorizontalOptions="CenterAndExpand"
                        FontSize="Small"

diff --git a/AppShell.xaml b/AppShell.xaml
@@ -40,7 +40,7 @@
                         <VisualStateGroup x:Name="CommonStates">
                             <VisualState x:Name="Normal">
                                 <VisualState.Setters>
-                                    <Setter Property="BackgroundColor" Value="{x:OnPlatform UWP=Transparent, iOS=White}" />
+                                    <Setter Property="BackgroundColor" Value="{x:OnPlatform WinUI=Transparent, iOS=White, Android=Transparent}" />
                                     <Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{StaticResource Primary}" />
                                 </VisualState.Setters>
                             </VisualState>
@@ -154,7 +154,7 @@
                 <Button TextColor="{StaticResource Secondary}"
                         Text="About"
                         Clicked="AboutButtonClicked"/>
-                <Label Text="Version 0.9"
+                <Label Text="Version 0.10"
                        TextColor="{StaticResource Secondary}"
                        HorizontalTextAlignment="Center"/>
                 <BoxView Color="{StaticResource Primary}"

diff --git a/Platforms/Android/AndroidManifest.xml b/Platforms/Android/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="9" android:versionName="0.9" package="com.bearapps.umpirecounter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="10" android:versionName="0.10" package="com.companyname.umpirecounter">
 	<application android:allowBackup="true" android:icon="@mipmap/cricketumpirecountersvg_logo" android:supportsRtl="true" android:label="Umpire Counter"></application>
-	<uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.WAKE_LOCK" />
 </manifest>
diff --git a/UmpireCounterMAUI.csproj b/UmpireCounterMAUI.csproj
@@ -41,11 +41,34 @@
 
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android34.0|AnyCPU'">
 	  <AndroidKeyStore>False</AndroidKeyStore>
+	  <ApplicationDisplayVersion>0.10</ApplicationDisplayVersion>
+	  <ApplicationVersion>10</ApplicationVersion>
+	  <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
+	  <ApplicationTitle>Umpire Counter</ApplicationTitle>
+	  <ApplicationId>com.companyname.umpirecounter</ApplicationId>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android34.0|AnyCPU'">
 	  <AndroidKeyStore>False</AndroidKeyStore>
 	  <AndroidLinkTool>r8</AndroidLinkTool>
+	  <ApplicationDisplayVersion>0.10</ApplicationDisplayVersion>
+	  <ApplicationVersion>10</ApplicationVersion>
+	  <ApplicationTitle>Umpire Counter</ApplicationTitle>
+	  <ApplicationId>com.companyname.umpirecounter</ApplicationId>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-maccatalyst|AnyCPU'">
+	  <ApplicationDisplayVersion>0.10</ApplicationDisplayVersion>
+	  <ApplicationVersion>10</ApplicationVersion>
+	  <ApplicationTitle>Umpire Counter</ApplicationTitle>
+	  <ApplicationId>com.companyname.umpirecounter</ApplicationId>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-maccatalyst|AnyCPU'">
+	  <ApplicationDisplayVersion>0.10</ApplicationDisplayVersion>
+	  <ApplicationVersion>10</ApplicationVersion>
+	  <ApplicationTitle>Umpire Counter</ApplicationTitle>
+	  <ApplicationId>com.companyname.umpirecounter</ApplicationId>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -76,9 +99,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.82" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android34.0'">
+	  <PackageReference Include="Xamarin.AndroidX.Startup.StartupRuntime">
+	    <Version>1.1.1.16</Version>
+	  </PackageReference>
+	</ItemGroup>
+
 </Project>