Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix android template issues #1456

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Fix android template issues #1456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
005d765
ignore configs
ykafia Nov 12, 2021
8ee77d4
Merge branch 'stride3d:master' into master
ykafia Nov 28, 2021
f58625e
Merge branch 'stride3d:master' into master
ykafia Jan 4, 2022
1f5beac
Merge branch 'stride3d:master' into master
ykafia Mar 20, 2022
970e672
Merge branch 'stride3d:master' into master
ykafia Jun 12, 2022
5bc78b1
Merge branch 'stride3d:master' into master
ykafia Jul 8, 2022
882f270
Merge branch 'stride3d:master' into master
ykafia Jul 17, 2022
9636c51
Update app name in android template
ykafia Jul 17, 2022
8c75c45
removed useless text view that was creating a bug
ykafia Jul 17, 2022
cd574fb
Update .gitignore
ykafia Jul 17, 2022
f389b23
redo app name
ykafia Jul 17, 2022
2fb4936
Merge branch 'fix-android-resx' of https://github.com/ykafia/stride i…
ykafia Jul 17, 2022
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
28 changes: 14 additions & 14 deletions build/Stride.Android.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.352
# Visual Studio Version 17
VisualStudioVersion = 17.2.32602.215
MinimumVisualStudioVersion = 16.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}"
EndProject
Expand Down Expand Up @@ -141,12 +141,6 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Rendering", "..\sources\engine\Stride.Rendering\Stride.Rendering.csproj", "{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{b33e576f-2279-4bfc-a438-d9b84343b56b}*SharedItemsImports = 13
..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 5
..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 5
..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Android = Debug|Android
Release|Android = Release|Android
Expand All @@ -160,15 +154,15 @@ Global
{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Android.Build.0 = Debug|Any CPU
{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Android.ActiveCfg = Release|Any CPU
{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Android.Build.0 = Release|Any CPU
{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.ActiveCfg = Debug|Android
{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.Build.0 = Debug|Android
{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.Deploy.0 = Debug|Android
{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.ActiveCfg = Debug|Any CPU
{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.Build.0 = Debug|Any CPU
{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.Deploy.0 = Debug|Any CPU
{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Android.ActiveCfg = Release|Android
{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Android.Build.0 = Release|Android
{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Android.Deploy.0 = Release|Android
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.ActiveCfg = Debug|Android
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.Build.0 = Debug|Android
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.Deploy.0 = Debug|Android
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.ActiveCfg = Debug|Any CPU
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.Build.0 = Debug|Any CPU
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.Deploy.0 = Debug|Any CPU
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Android.ActiveCfg = Release|Android
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Android.Build.0 = Release|Android
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Android.Deploy.0 = Release|Android
Expand Down Expand Up @@ -294,4 +288,10 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
EndGlobalSection
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{b33e576f-2279-4bfc-a438-d9b84343b56b}*SharedItemsImports = 13
..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 5
..\sources\shared\Stride.Core.ShellHelper\Stride.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 5
..\sources\engine\Stride.Shared\Refactor\Stride.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 5
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion ...ts.Presentation/Templates/Core/ProjectExecutable.Android/ProjectExecutable.Android.ttproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Files:
- {Source: AndroidManifest.xml.t4, Target: AndroidManifest.xml, IsTemplate: true}
- {Source: Resources\mipmap-mdpi\gameicon.png, Target: Resources\mipmap-mdpi\gameicon.png }
- {Source: Resources\layout\activity_main.xml, Target: Resources\layout\activity_main.xml }
- {Source: Resources\values\strings.xml, Target: Resources\values\strings.xml }
- {Source: Resources\values\strings.xml.t4, Target: Resources\values\strings.xml, IsTemplate: true}
4 changes: 2 additions & 2 deletions ....Presentation/Templates/Core/ProjectExecutable.Android/Resources/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/app_text"
android:text="@string/app_name"
/>
</RelativeLayout>
</RelativeLayout>
1 change: 1 addition & 0 deletions ...able.Android/Resources/values/strings.xml → ...e.Android/Resources/values/strings.xml.t4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<#@ template inherits="ProjectTemplateTransformation" language="C#" #>
<resources>
<string name="app_name"><#= Properties.PackageGameDisplayName #></string>
</resources>