-
-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #145 from VladislavAntonyuk/vantonyuk-wpf-netcore
WPF NET Core, fix WPF renderer, fix Android X
- Loading branch information
Showing
36 changed files
with
7,207 additions
and
7,719 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 4 additions & 3 deletions
7
example/Thewissen.PancakeViewSample.Android/Properties/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
13,369
example/Thewissen.PancakeViewSample.Android/Resources/Resource.designer.cs
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
example/Thewissen.PancakeViewSample.Android/Resources/layout/Tabbar.axml
This file was deleted.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
example/Thewissen.PancakeViewSample.Android/Resources/layout/Tabbar.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" /> |
2 changes: 0 additions & 2 deletions
2
example/Thewissen.PancakeViewSample.Android/Resources/layout/Toolbar.axml
This file was deleted.
Oops, something went wrong.
9 changes: 9 additions & 0 deletions
9
example/Thewissen.PancakeViewSample.Android/Resources/layout/Toolbar.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 removed
BIN
-161 KB
example/Thewissen.PancakeViewSample.Android/Resources/playstore-icon.png
Binary file not shown.
Oops, something went wrong.