Skip to content

Commit

Permalink
Merge pull request #145 from VladislavAntonyuk/vantonyuk-wpf-netcore
Browse files Browse the repository at this point in the history
WPF NET Core, fix WPF renderer, fix Android X
  • Loading branch information
sthewissen committed Oct 23, 2020
2 parents 755703f + 05c4093 commit e38203c
Show file tree
Hide file tree
Showing 36 changed files with 7,207 additions and 7,719 deletions.
7 changes: 3 additions & 4 deletions example/Thewissen.PancakeViewSample.Android/MainActivity.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Android.App;
using Android.Content.PM;
using Android.OS;
// using Xamarin.Forms.PancakeView.Droid;

namespace Thewissen.PancakeViewSample.Droid
{
[Activity(Label = "PancakeViewSample", Icon = "@mipmap/ic_launcher", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
[Activity(Label = "PancakeViewSample", Icon = "@mipmap/ic_launcher", 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 All @@ -14,10 +14,9 @@ protected override void OnCreate(Bundle savedInstanceState)
ToolbarResource = Resource.Layout.Toolbar;

base.OnCreate(savedInstanceState);

global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
LoadApplication(new App());

// PancakeViewRenderer.Init();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?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="io.thewissen.PancakeViewSample" android:installLocation="auto">
<uses-sdk android:minSdkVersion="25" android:targetSdkVersion="28" />
<application android:label="PancakeViewSample"></application>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="io.thewissen.PancakeViewSample">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
<application android:label="PancakeViewSample" android:theme="@style/MainTheme"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
13,369 changes: 6,347 additions & 7,022 deletions example/Thewissen.PancakeViewSample.Android/Resources/Resource.designer.cs

Large diffs are not rendered by default.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/sliding_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:tabIndicatorColor="@android:color/white"
app:tabGravity="fill"
app:tabMode="fixed" />

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<android.support.v7.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />

Binary file not shown.
Loading

0 comments on commit e38203c

Please sign in to comment.