Skip to content

Commit c975065

Browse files
santacrab2santacrab2
committed
fix permission crash for older android devices
update dependencies bump version for release start of mailbox editor(WIP)
1 parent 99c8283 commit c975065

File tree

9 files changed

+113
-9
lines changed

9 files changed

+113
-9
lines changed

‎PKHeX.MAUI.csproj‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
4+
<TargetFrameworks>net8.0-maccatalyst;net8.0-android34.0</TargetFrameworks>
55
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
77
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
@@ -75,6 +75,20 @@
7575
<AndroidKeyStore>False</AndroidKeyStore>
7676
</PropertyGroup>
7777

78+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android34.0|AnyCPU'">
79+
<AndroidPackageFormat>apk</AndroidPackageFormat>
80+
<AndroidKeyStore>False</AndroidKeyStore>
81+
<AndroidUseAapt2>True</AndroidUseAapt2>
82+
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
83+
</PropertyGroup>
84+
85+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android34.0|AnyCPU'">
86+
<AndroidKeyStore>False</AndroidKeyStore>
87+
<AndroidUseAapt2>True</AndroidUseAapt2>
88+
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
89+
<AndroidPackageFormat>apk</AndroidPackageFormat>
90+
</PropertyGroup>
91+
7892
<ItemGroup>
7993
<!-- App Icon -->
8094
<MauiIcon Include="Resources\AppIcon\icon.png" ForegroundFile="Resources\AppIcon\icon.png" />
@@ -276,6 +290,9 @@
276290
<MauiXaml Update="SaveEditors\Gen2\EventFlags2.xaml">
277291
<Generator>MSBuild:Compile</Generator>
278292
</MauiXaml>
293+
<MauiXaml Update="SaveEditors\Gen2\MailBox.xaml">
294+
<Generator>MSBuild:Compile</Generator>
295+
</MauiXaml>
279296
<MauiXaml Update="SaveEditors\SaveAccessors\gen8+\BlockEditor8.xaml">
280297
<Generator>MSBuild:Compile</Generator>
281298
</MauiXaml>

‎Platforms/Android/MainActivity.cs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@ public class MainActivity : MauiAppCompatActivity
99
{
1010
protected override void OnCreate(Bundle savedInstanceState)
1111
{
12-
if (!Android.OS.Environment.IsExternalStorageManager)
12+
try
1313
{
14-
Intent intent = new Intent();
15-
intent.SetAction(Android.Provider.Settings.ActionManageAppAllFilesAccessPermission);
16-
Android.Net.Uri uri = Android.Net.Uri.FromParts("package", this.PackageName, null);
17-
intent.SetData(uri);
18-
StartActivity(intent);
14+
if (!Android.OS.Environment.IsExternalStorageManager)
15+
{
16+
Intent intent = new Intent();
17+
intent.SetAction(Android.Provider.Settings.ActionManageAppAllFilesAccessPermission);
18+
Android.Net.Uri uri = Android.Net.Uri.FromParts("package", this.PackageName, null);
19+
intent.SetData(uri);
20+
StartActivity(intent);
21+
}
1922
}
23+
catch (Exception e) { };
2024
base.OnCreate(savedInstanceState);
2125
}
2226
}

‎SaveEditors/Gen2/MailBox.xaml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
x:Class="PKHeXMAUI.MailBox"
5+
Title="MailBox Editor">
6+
<VerticalStackLayout>
7+
<Grid>
8+
<Grid.ColumnDefinitions>
9+
<ColumnDefinition Width="*"/>
10+
<ColumnDefinition Width="*"/>
11+
</Grid.ColumnDefinitions>
12+
<Grid.RowDefinitions>
13+
<RowDefinition Height="*"/>
14+
<RowDefinition Height="*"/>
15+
<RowDefinition Height="*"/>
16+
<RowDefinition Height="*"/>
17+
<RowDefinition Height="*"/>
18+
<RowDefinition Height="*"/>
19+
<RowDefinition Height="*"/>
20+
<RowDefinition Height="*"/>
21+
<RowDefinition Height="*"/>
22+
<RowDefinition Height="*"/>
23+
<RowDefinition Height="*"/>
24+
<RowDefinition Height="*"/>
25+
</Grid.RowDefinitions>
26+
<Label Text="MailBox (Party)"/>
27+
<Label Text="MailBox (PC)" Grid.Column="1"/>
28+
<CollectionView x:Name="MBP_CV" HeightRequest="150" Grid.Row="1"/>
29+
<CollectionView x:Name="MBPC_CV" HeightRequest="150" Grid.Row="1" Grid.Column="1"/>
30+
<Grid Grid.Row="2">
31+
<Grid.ColumnDefinitions>
32+
<ColumnDefinition Width="*"/>
33+
<ColumnDefinition Width="*"/>
34+
</Grid.ColumnDefinitions>
35+
<Label Text="MailBox (PC) Served:"/>
36+
<Entry x:Name="MBServed" Grid.Column="1"/>
37+
</Grid>
38+
<Button Text="Delete" Grid.Row="2" Grid.Column="1"/>
39+
<Label Text="Message" Grid.Row="3"/>
40+
<Label Text="Author" Grid.Row="3" Grid.Column="1"/>
41+
<Entry x:Name="Message1" Grid.Row="4"/>
42+
<Entry x:Name="Message2" Grid.Row="5"/>
43+
<Grid Grid.Row="4" Grid.Column="1">
44+
<Grid.RowDefinitions>
45+
<RowDefinition Height="*"/>
46+
<RowDefinition Height="*"/>
47+
</Grid.RowDefinitions>
48+
<Grid.ColumnDefinitions>
49+
<ColumnDefinition Width="*"/>
50+
<ColumnDefinition Width="*"/>
51+
</Grid.ColumnDefinitions>
52+
<Entry x:Name="AuthorOT"/>
53+
<Picker x:Name="AuthorLang" Grid.Column="1"/>
54+
<Entry x:Name="AuthorSID" Grid.Row="1"/>
55+
<CheckBox x:Name="UserEnteredCB" Grid.Row="1" Grid.Column="1" HorizontalOptions="Start" VerticalOptions="Center"/>
56+
<Label Text="User Entered" Grid.Row="1" Grid.Column="1" HorizontalOptions="End" VerticalOptions="Center"/>
57+
</Grid>
58+
<Label Text="Mail Type:" Grid.Row="6"/>
59+
<Picker x:Name="MailTypePicker" Grid.Row="6" Grid.Column="1"/>
60+
<Label Text="Appear PKM:" Grid.Row="7"/>
61+
<Picker x:Name="AppearPKMPicker" Grid.Row="7" Grid.Column="1"/>
62+
<Label Text="Held MailID" Grid.Row="8"/>
63+
<CollectionView x:Name="HMID_CV" Grid.Row="8" Grid.Column="1" HeightRequest="150"/>
64+
</Grid>
65+
</VerticalStackLayout>
66+
</ContentPage>

‎SaveEditors/Gen2/MailBox.xaml.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace PKHeXMAUI;
2+
3+
public partial class MailBox : ContentPage
4+
{
5+
public MailBox()
6+
{
7+
InitializeComponent();
8+
}
9+
}

‎SaveEditors/Save Editors.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<Button Text="Inventory Editor" Clicked="OpenItems"/>
1111
<Button x:Name="Button_Pokedex1" Text="Pokedex" Clicked="OpenSimplePokedex" IsVisible="False"/>
1212
<Button x:Name="TrainerInfoButton" Text="Trainer Info" IsVisible="false" Clicked="OpenTrainerEditor"/>
13-
13+
<Button x:Name="MailBoxButton" Text="Mail Box" IsVisible="False" Clicked="OpenMailBoxEditor"/>
1414
</VerticalStackLayout>
1515
</ContentPage>

‎SaveEditors/Save Editors.xaml.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ private void ToggleControls()
4848
if (sav is SAV1 or SAV2 or SAV3)
4949
Button_Pokedex1.IsVisible = true;
5050
if (sav is SAV2)
51+
{
5152
Button_RTCEditor.IsVisible = true;
53+
MailBoxButton.IsVisible = true;
54+
}
5255

5356
}
5457

@@ -101,4 +104,9 @@ private async void OpenRTCEditor(object sender, EventArgs e)
101104
break;
102105
}
103106
}
107+
108+
private void OpenMailBoxEditor(object sender, EventArgs e)
109+
{
110+
Navigation.PushModalAsync(new MailBox());
111+
}
104112
}

‎deps/PKHeX.Core.AutoMod.dll‎

1 KB
Binary file not shown.

‎deps/PKHeX.Core.Injection.dll‎

0 Bytes
Binary file not shown.

‎pktabs/PKTab.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace PKHeXMAUI;
1111

1212
public partial class MainPage : ContentPage
1313
{
14-
public static string Version = "v24.09.06";
14+
public static string Version = "v24.10.06";
1515
public bool SkipTextChange = false;
1616
public static int[] NoFormSpriteSpecies = [664, 665, 744, 982, 855, 854, 869,892,1012,1013];
1717
public bool FirstLoad = true;

0 commit comments

Comments
 (0)