Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BMM.UI.Android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.brunstad.bmm" android:versionCode="1" android:versionName="DEV" android:installLocation="auto">
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="34" />
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="35" />
<application android:icon="@drawable/app_icon" android:label="BMM" android:windowSoftInputMode="adjustResize|adjustPan" android:networkSecurityConfig="@xml/network_security_config" android:fullBackupContent="@xml/auto_backup_rules">
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/xam_mediamanager_notify_ic" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
using BMM.Core.ViewModels;
using BMM.UI.Droid.Application.Extensions;
using BMM.UI.Droid.Application.Helpers;
using Microsoft.Extensions.Logging;
using MvvmCross;
using MvvmCross.Binding;
using MvvmCross.Logging;
using MvvmCross.Views;
using MvvmCross.WeakSubscription;
using Fragment = AndroidX.Fragment.App.Fragment;
Expand Down Expand Up @@ -71,7 +74,7 @@ protected virtual void SetItemsSource(IEnumerable<TViewModel> value)

if (_itemsSource != null && !(_itemsSource is IList))
{
MvxBindingLog.Warning("Binding to IEnumerable rather than IList - this can be inefficient, especially for large lists");
MvxBindingLog.Instance?.LogWarning("Binding to IEnumerable rather than IList - this can be inefficient, especially for large lists");
}

var newObservable = _itemsSource as INotifyCollectionChanged;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,7 @@ public override void OnCreate()

base.OnCreate();

var sessionIntent = PackageManager.GetLaunchIntentForPackage(PackageName);
var pendingIntent = PendingIntent.GetActivity(this, 0, sessionIntent, PendingIntentsUtils.GetImmutable());

_mediaSession = new MediaSessionCompat(this, nameof(MusicService), null, pendingIntent);
_mediaSession = new MediaSessionCompat(this, nameof(MusicService), null, null);
_mediaSession.Active = true;
SessionToken = _mediaSession.SessionToken;

Expand Down
36 changes: 18 additions & 18 deletions BMM.UI.Android/BMM.UI.Droid.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-android</TargetFramework>
<TargetFramework>net9.0-android</TargetFramework>
<SupportedOSPlatformVersion>24</SupportedOSPlatformVersion>
<OutputType>Exe</OutputType>
<Nullable>disable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<ApplicationId>org.brunstad.bmm</ApplicationId>
<ApplicationVersion>1</ApplicationVersion>
<ApplicationDisplayVersion>1.102.0</ApplicationDisplayVersion>
<TargetPlatformVersion>34</TargetPlatformVersion>
<TargetPlatformVersion>35</TargetPlatformVersion>
<UseMauiEssentials>true</UseMauiEssentials>
<RootNamespace>BMM.UI.Droid</RootNamespace>
<AssemblyName>BMM.UI.Android</AssemblyName>
Expand All @@ -23,25 +23,25 @@
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MvvmCross" Version="9.2.0" />
<PackageReference Include="MvvmCross.DroidX.RecyclerView" Version="9.2.0" />
<PackageReference Include="MvvmCross.DroidX.SwipeRefreshLayout" Version="9.2.0" />
<PackageReference Include="MvvmCross.Plugin.Color" Version="9.2.0" />
<PackageReference Include="MvvmCross.Plugin.JsonLocalization" Version="9.2.0" />
<PackageReference Include="NewRelic.MAUI.Android.Binding" Version="7.5.0" />
<PackageReference Include="Sentry" Version="5.0.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="MvvmCross" Version="9.4.0" />
<PackageReference Include="MvvmCross.DroidX.RecyclerView" Version="9.4.0" />
<PackageReference Include="MvvmCross.DroidX.SwipeRefreshLayout" Version="9.4.0" />
<PackageReference Include="MvvmCross.Plugin.Color" Version="9.4.0" />
<PackageReference Include="MvvmCross.Plugin.JsonLocalization" Version="9.4.0" />
<PackageReference Include="NewRelic.MAUI.Android.Binding" Version="7.6.6" />
<PackageReference Include="Sentry" Version="5.13.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
<PackageReference Include="XAB.FlexboxLayout" Version="3.0.0.2" />
<PackageReference Include="Xam.Plugins.Android.ExoPlayer" Version="2.19.1" />
<PackageReference Include="Xam.Plugins.Android.ExoPlayer.MediaSession" Version="2.19.1" />
<PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.9.1" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.4" />
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.2" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx" Version="2.8.4" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.27" />
<PackageReference Include="Xamarin.Firebase.Config" Version="122.0.0.1" />
<PackageReference Include="Xamarin.Firebase.Messaging" Version="124.0.0.1" />
<PackageReference Update="Microsoft.Maui.Essentials" Version="8.0.80" />
<PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.10.1.2" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.10" />
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.5.0.2" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx" Version="2.9.1" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.33" />
<PackageReference Include="Xamarin.Firebase.Config" Version="122.1.2" />
<PackageReference Include="Xamarin.Firebase.Messaging" Version="124.1.2" />
<PackageReference Update="Microsoft.Maui.Essentials" Version="9.0.90" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BMM.Core\BMM.Core.csproj" />
Expand Down
5 changes: 5 additions & 0 deletions BMM.sln
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ Global
{17B63452-8064-46E6-A1C8-DDF5605B5995}.UITests|iPhone.Build.0 = UITests|iPhone
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|iPhone.Deploy.0 = Debug|iPhone
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|Any CPU.Deploy.0 = Debug|iPhoneSimulator
{9AB7A107-7947-4F98-8790-DC39AD51F4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9AB7A107-7947-4F98-8790-DC39AD51F4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9AB7A107-7947-4F98-8790-DC39AD51F4DE}.Release|Any CPU.Build.0 = Release|Any CPU
Expand Down Expand Up @@ -182,6 +185,8 @@ Global
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.UITests|iPhone.ActiveCfg = UITests|iPhone
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.UITests|iPhone.Build.0 = UITests|iPhone
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
{E60FF6C8-2AD8-49CB-B312-DB62F7C63560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E60FF6C8-2AD8-49CB-B312-DB62F7C63560}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E60FF6C8-2AD8-49CB-B312-DB62F7C63560}.Debug|iPhone.ActiveCfg = Debug|Any CPU
Expand Down
Loading