Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

Commit

Permalink
Update to latest nugets, light theme only,
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesmontemagno committed Jan 28, 2022
1 parent 89c1600 commit 1f9c544
Show file tree
Hide file tree
Showing 63 changed files with 194,587 additions and 7,758 deletions.
5 changes: 5 additions & 0 deletions Directory.build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>

</PropertyGroup>
</Project>
8 changes: 8 additions & 0 deletions Directory.build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.1" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.2337" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions Finish/MonkeyFinder.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29009.5
# Visual Studio Version 17
VisualStudioVersion = 17.1.32120.378
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonkeyFinder.Android", "MonkeyFinder\MonkeyFinder.Android\MonkeyFinder.Android.csproj", "{1B07E64E-8718-4E39-ADAA-B639EE3A1C03}"
EndProject
Expand All @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonkeyFinder", "MonkeyFinde
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3EB00B02-CDB9-4C6F-9D87-BCABD1A3675D}"
ProjectSection(SolutionItems) = preProject
..\Directory.build.props = ..\Directory.build.props
..\Directory.build.targets = ..\Directory.build.targets
..\README.md = ..\README.md
EndProjectSection
EndProject
Expand Down
2 changes: 1 addition & 1 deletion Finish/MonkeyFinder/MonkeyFinder.Android/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace MonkeyFinder.Droid
{
[Activity(Label = "MonkeyFinder", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
[Activity(Label = "MonkeyFinder", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
{
protected override void OnCreate(Bundle savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
Expand Down Expand Up @@ -56,27 +56,6 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AppCenter">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.6.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
<PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>5.0.0.1874</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
<Compile Include="Resources\Resource.Designer.cs" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.MonkeyFinder" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<application android:label="MonkeyFinder.Android"></application>
</manifest>
26,575 changes: 19,755 additions & 6,820 deletions Finish/MonkeyFinder/MonkeyFinder.Android/Resources/Resource.designer.cs

Large diffs are not rendered by default.

17 changes: 4 additions & 13 deletions Finish/MonkeyFinder/MonkeyFinder.UWP/MonkeyFinder.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AssemblyName>MonkeyFinder.UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -150,18 +150,9 @@
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter" Version="4.1.0" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.1.0" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.1874" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MonkeyFinder\MonkeyFinder.csproj">
<Project>{a4767409-fd5a-408c-a0de-9caa76254719}</Project>
Expand Down
21 changes: 0 additions & 21 deletions Finish/MonkeyFinder/MonkeyFinder.iOS/MonkeyFinder.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -161,27 +161,6 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AppCenter">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.6.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
<PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>5.0.0.1874</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\MonkeyFinder\MonkeyFinder.csproj">
Expand Down
10 changes: 10 additions & 0 deletions Finish/MonkeyFinder/MonkeyFinder/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@
<Setter Property="BackgroundColor" Value="White"/>
<Setter Property="CornerRadius" Value="10"/>
</Style>

<Style TargetType="Page" ApplyToDerivedTypes="True">
<Setter Property="BackgroundColor" Value="#FAF9F8" />
</Style>
<Style TargetType="Label" ApplyToDerivedTypes="True">
<Setter Property="TextColor" Value="#1F1F1F" />
</Style>
<Style TargetType="RefreshView" ApplyToDerivedTypes="True">
<Setter Property="RefreshColor" Value="{StaticResource Primary}" />
</Style>
</ResourceDictionary>
</Application.Resources>
</Application>
17 changes: 1 addition & 16 deletions Finish/MonkeyFinder/MonkeyFinder/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using Microsoft.AppCenter.Analytics;
using Microsoft.AppCenter.Crashes;
using Microsoft.AppCenter;
using MonkeyFinder.View;
using MonkeyFinder.View;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
using Device = Xamarin.Forms.Device;
Expand All @@ -24,19 +21,7 @@ public App()
BarBackgroundColor = (Color)Resources["Primary"],
BarTextColor = Color.White
};
}

const string AppCenteriOS = "";
const string AppCenterAndroid = "";

protected override void OnStart()
{
if (!string.IsNullOrWhiteSpace(AppCenteriOS) && !string.IsNullOrWhiteSpace(AppCenterAndroid))
{
AppCenter.Start($"ios={AppCenteriOS};" +
$"android={AppCenterAndroid}",
typeof(Analytics), typeof(Crashes));
}
}

protected override void OnSleep()
Expand Down
9 changes: 0 additions & 9 deletions Finish/MonkeyFinder/MonkeyFinder/MonkeyFinder.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,4 @@
<EmbeddedResource Include="monkeydata.json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AppCenter" Version="4.1.0" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.1.0" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="5.0.0.1874" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions Part 1 - Displaying Data/MonkeyFinder.sln
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonkeyFinder", "MonkeyFinde
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3EB00B02-CDB9-4C6F-9D87-BCABD1A3675D}"
ProjectSection(SolutionItems) = preProject
..\Directory.build.props = ..\Directory.build.props
..\Directory.build.targets = ..\Directory.build.targets
README.md = README.md
EndProjectSection
EndProject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace MonkeyFinder.Droid
{
[Activity(Label = "MonkeyFinder", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
[Activity(Label = "MonkeyFinder", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
{
protected override void OnCreate(Bundle savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
Expand Down Expand Up @@ -56,27 +56,6 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AppCenter">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.6.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
<PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>5.0.0.1874</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
<Compile Include="Resources\Resource.Designer.cs" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.MonkeyFinder" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<application android:label="MonkeyFinder.Android"></application>
</manifest>
Loading

0 comments on commit 1f9c544

Please sign in to comment.