Skip to content
This repository was archived by the owner on May 15, 2024. It is now read-only.

We are going to be using spaces instead of tabs #46

Merged
merged 1 commit into from
Mar 1, 2018
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
18 changes: 9 additions & 9 deletions Caboodle.Tests/Preferences_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

namespace Microsoft.Caboodle.Tests
{
public class Preferences_Tests
{
[Fact]
public void Preferences_Fail_On_NetStandard()
{
var p = new Preferences();
Assert.Throws<NotImplentedInReferenceAssembly>(() => p.Set("anything", "fails"));
}
}
public class Preferences_Tests
{
[Fact]
public void Preferences_Fail_On_NetStandard()
{
var p = new Preferences();
Assert.Throws<NotImplentedInReferenceAssembly>(() => p.Set("anything", "fails"));
}
}
}
6 changes: 3 additions & 3 deletions Caboodle/Caboodle.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<!--Work around so the conditions work below-->
<TargetFrameworks></TargetFrameworks>
<!--Work around so the conditions work below-->
<TargetFrameworks></TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard1.0;netstandard2.0;Xamarin.iOS10;MonoAndroid80;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.0;netstandard2.0;Xamarin.iOS10;MonoAndroid80</TargetFrameworks>
<AssemblyName>Microsoft.Caboodle</AssemblyName>
Expand Down Expand Up @@ -30,7 +30,7 @@
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=868961</PackageLicenseUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=868960</PackageProjectUrl>
<MDocDocumentationDirectory>$(MSBuildThisFileDirectory)..\docs\en</MDocDocumentationDirectory>
<FileUpgradeFlags>
Expand Down
104 changes: 52 additions & 52 deletions Caboodle/Platform/Platform.android.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,69 +5,69 @@

namespace Microsoft.Caboodle
{
public partial class Platform
{
static ActivityLifecycleContextListener lifecycleListener;
public partial class Platform
{
static ActivityLifecycleContextListener lifecycleListener;

internal static Context CurrentContext =>
lifecycleListener?.Context ?? Application.Context;
internal static Context CurrentContext =>
lifecycleListener?.Context ?? Application.Context;

internal static Activity CurrentActivity =>
lifecycleListener?.Activity;
internal static Activity CurrentActivity =>
lifecycleListener?.Activity;

public static void Init(Activity activity, Bundle bundle)
{
lifecycleListener = new ActivityLifecycleContextListener();
activity.Application.RegisterActivityLifecycleCallbacks(lifecycleListener);
}
}
public static void Init(Activity activity, Bundle bundle)
{
lifecycleListener = new ActivityLifecycleContextListener();
activity.Application.RegisterActivityLifecycleCallbacks(lifecycleListener);
}
}

class ActivityLifecycleContextListener : Java.Lang.Object, Application.IActivityLifecycleCallbacks
{
WeakReference<Activity> currentActivity = new WeakReference<Activity>(null);
class ActivityLifecycleContextListener : Java.Lang.Object, Application.IActivityLifecycleCallbacks
{
WeakReference<Activity> currentActivity = new WeakReference<Activity>(null);

public Context Context =>
Activity ?? Application.Context;
public Context Context =>
Activity ?? Application.Context;

public Activity Activity
{
get
{
Activity a;
if (currentActivity.TryGetTarget(out a))
return a;
return null;
}
}
public Activity Activity
{
get
{
Activity a;
if (currentActivity.TryGetTarget(out a))
return a;
return null;
}
}

public void OnActivityCreated(Activity activity, Bundle savedInstanceState)
{
}
public void OnActivityCreated(Activity activity, Bundle savedInstanceState)
{
}

public void OnActivityDestroyed(Activity activity)
{
}
public void OnActivityDestroyed(Activity activity)
{
}

public void OnActivityPaused(Activity activity)
{
currentActivity.SetTarget(null);
}
public void OnActivityPaused(Activity activity)
{
currentActivity.SetTarget(null);
}

public void OnActivityResumed(Activity activity)
{
currentActivity.SetTarget(activity);
}
public void OnActivityResumed(Activity activity)
{
currentActivity.SetTarget(activity);
}

public void OnActivitySaveInstanceState(Activity activity, Bundle outState)
{
}
public void OnActivitySaveInstanceState(Activity activity, Bundle outState)
{
}

public void OnActivityStarted(Activity activity)
{
}
public void OnActivityStarted(Activity activity)
{
}

public void OnActivityStopped(Activity activity)
{
}
}
public void OnActivityStopped(Activity activity)
{
}
}
}
6 changes: 3 additions & 3 deletions Caboodle/Platform/Platform.ios.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Microsoft.Caboodle
{
public partial class Platform
{
}
public partial class Platform
{
}
}
6 changes: 3 additions & 3 deletions Caboodle/Platform/Platform.netstandard.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Microsoft.Caboodle
{
public partial class Platform
{
}
public partial class Platform
{
}
}
6 changes: 3 additions & 3 deletions Caboodle/Platform/Platform.shared.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Microsoft.Caboodle
{
public partial class Platform
{
}
public partial class Platform
{
}
}
6 changes: 3 additions & 3 deletions Caboodle/Platform/Platform.uwp.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Microsoft.Caboodle
{
public partial class Platform
{
}
public partial class Platform
{
}
}
Loading