diff --git a/osu.Android.props b/osu.Android.props new file mode 100644 index 0000000000..4c89408203 --- /dev/null +++ b/osu.Android.props @@ -0,0 +1,60 @@ + + + True + portable + False + bin\Debug\ + DEBUG;TRACE + prompt + 4 + True + None + False + false + false + false + CJK;Mideast;Rare;West;Other + + false + + + True + pdbonly + True + bin\Release\ + TRACE + prompt + 4 + true + False + SdkOnly + True + CJK;Mideast;Rare;West;Other + + + + + + + + + + 0.0.7879 + + + 0.0.7879 + + + 0.22.0 + + + 1.1.0 + + + 1.0.0-dev000094 + + + 1.0.0-dev002278 + + + \ No newline at end of file diff --git a/osu.Android/Assets/AboutAssets.txt b/osu.Android/Assets/AboutAssets.txt deleted file mode 100644 index b0633374bd..0000000000 --- a/osu.Android/Assets/AboutAssets.txt +++ /dev/null @@ -1,19 +0,0 @@ -Any raw assets you want to be deployed with your application can be placed in -this directory (and child directories) and given a Build Action of "AndroidAsset". - -These files will be deployed with you package and will be accessible using Android's -AssetManager, like this: - -public class ReadAsset : Activity -{ - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - InputStream input = Assets.Open ("my_asset.txt"); - } -} - -Additionally, some Android functions will automatically load asset files: - -Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); \ No newline at end of file diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj index daff6da961..646ed71d44 100644 --- a/osu.Android/osu.Android.csproj +++ b/osu.Android/osu.Android.csproj @@ -24,43 +24,7 @@ Assets Xamarin.Android.Net.AndroidClientHandler - - True - portable - False - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - None - False - false - false - false - CJK;Mideast;Rare;West;Other - - false - - - True - pdbonly - True - bin\Release\ - TRACE - prompt - 4 - true - False - SdkOnly - True - - - - - - - + @@ -83,7 +47,6 @@ PreserveNewest - @@ -106,27 +69,6 @@ - - - 0.0.7879 - - - 0.0.7879 - - - 0.22.0 - - - 1.1.0 - - - 1.0.0-dev000094 - - - 1.0.0-dev002278 - - - {d9a367c9-4c1a-489f-9b05-a0cea2b53b58} @@ -157,11 +99,4 @@ - \ No newline at end of file diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Assets/AboutAssets.txt b/osu.Game.Rulesets.Catch.Tests.Android/Assets/AboutAssets.txt deleted file mode 100644 index b0633374bd..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Assets/AboutAssets.txt +++ /dev/null @@ -1,19 +0,0 @@ -Any raw assets you want to be deployed with your application can be placed in -this directory (and child directories) and given a Build Action of "AndroidAsset". - -These files will be deployed with you package and will be accessible using Android's -AssetManager, like this: - -public class ReadAsset : Activity -{ - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - InputStream input = Assets.Open ("my_asset.txt"); - } -} - -Additionally, some Android functions will automatically load asset files: - -Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); \ No newline at end of file diff --git a/osu.Game.Rulesets.Catch.Tests.Android/MainActivity.cs b/osu.Game.Rulesets.Catch.Tests.Android/MainActivity.cs index 34f10dd16b..4b13b86ca2 100644 --- a/osu.Game.Rulesets.Catch.Tests.Android/MainActivity.cs +++ b/osu.Game.Rulesets.Catch.Tests.Android/MainActivity.cs @@ -2,21 +2,16 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using Android.App; -using Android.OS; -using Android.Support.V7.App; -using Android.Runtime; -using Android.Widget; +using Android.Content.PM; +using osu.Framework.Android; +using osu.Game.Tests; namespace osu.Game.Rulesets.Catch.Tests.Android { - [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true)] - public class MainActivity : AppCompatActivity + [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.SensorLandscape, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)] + public class MainActivity : AndroidGameActivity { - protected override void OnCreate(Bundle savedInstanceState) - { - base.OnCreate(savedInstanceState); - // Set our view from the "main" layout resource - SetContentView(Resource.Layout.activity_main); - } + protected override Framework.Game CreateGame() + => new OsuTestBrowser(); } } diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/AboutResources.txt b/osu.Game.Rulesets.Catch.Tests.Android/Resources/AboutResources.txt deleted file mode 100644 index c2bca974c4..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Resources/AboutResources.txt +++ /dev/null @@ -1,44 +0,0 @@ -Images, layout descriptions, binary blobs and string dictionaries can be included -in your application as resource files. Various Android APIs are designed to -operate on the resource IDs instead of dealing with images, strings or binary blobs -directly. - -For example, a sample Android app that contains a user interface layout (main.axml), -an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) -would keep its resources in the "Resources" directory of the application: - -Resources/ - drawable/ - icon.png - - layout/ - main.axml - - values/ - strings.xml - -In order to get the build system to recognize Android resources, set the build action to -"AndroidResource". The native Android APIs do not operate directly with filenames, but -instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called "R" -(this is an Android convention) that contains the tokens for each one of the resources -included. For example, for the above Resources layout, this is what the R class would expose: - -public class R { - public class drawable { - public const int icon = 0x123; - } - - public class layout { - public const int main = 0x456; - } - - public class strings { - public const int first_string = 0xabc; - public const int second_string = 0xbcd; - } -} - -You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main -to reference the layout/main.axml file, or R.strings.first_string to reference the first -string in the dictionary file values/strings.xml. \ No newline at end of file diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/Resource.designer.cs b/osu.Game.Rulesets.Catch.Tests.Android/Resources/Resource.designer.cs deleted file mode 100644 index a19fe391a8..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Resources/Resource.designer.cs +++ /dev/null @@ -1,112 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("osu.Game.Rulesets.Catch.Tests.Android.Resource", IsApplication=true)] - -namespace osu.Game.Rulesets.Catch.Tests.Android -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public static void UpdateIdValues() - { - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class Id - { - - // aapt resource value: 0x7f050000 - public const int myButton = 2131034112; - - static Id() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Id() - { - } - } - - public partial class Layout - { - - // aapt resource value: 0x7f030000 - public const int Main = 2130903040; - - static Layout() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Layout() - { - } - } - - public partial class Mipmap - { - - // aapt resource value: 0x7f020000 - public const int Icon = 2130837504; - - static Mipmap() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Mipmap() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7f040001 - public const int app_name = 2130968577; - - // aapt resource value: 0x7f040000 - public const int hello = 2130968576; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - } -} -#pragma warning restore 1591 diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/layout/activity_main.axml b/osu.Game.Rulesets.Catch.Tests.Android/Resources/layout/activity_main.axml deleted file mode 100644 index ff7a60eb50..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Resources/layout/activity_main.axml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc5f..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc5f..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2531cb31ef..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 7a859c2555..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b8d35b3a1c..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 795ea7c005..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index a12b157f00..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 8f56909cdd..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 761cc91d90..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index e7d70a5e2d..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 9737d79c04..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 9133e31b43..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 73ccaa6a2b..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index c3ae5f5ccd..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index d4fd714eed..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index f6584afd4d..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index ef89bd5215..0000000000 Binary files a/osu.Game.Rulesets.Catch.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/Strings.xml b/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/Strings.xml deleted file mode 100644 index f800d6eb45..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/Strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - osu.Game.Rulesets.Catch.Tests.Android - Settings - diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/colors.xml b/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/colors.xml deleted file mode 100644 index 17bb9a9dd1..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #2c3e50 - #1B3147 - #3498db - diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/ic_launcher_background.xml b/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/ic_launcher_background.xml deleted file mode 100644 index 6ec24e6413..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #2C3E50 - \ No newline at end of file diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/styles.xml b/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/styles.xml deleted file mode 100644 index 5885930df6..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.Android/Resources/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj index d1e62c46a1..82c171cb46 100644 --- a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj +++ b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj @@ -24,85 +24,35 @@ Assets Xamarin.Android.Net.AndroidClientHandler - - True - portable - False - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - None - False - - - True - pdbonly - True - bin\Release\ - TRACE - prompt - 4 - true - False - SdkOnly - True - - - - - - - + - osu.licenseheader - - - - Designer - - - - - - - - - - - - - - - - - - - - - - + + %(RecursiveDir)%(Filename)%(Extension) + - + + {d9a367c9-4c1a-489f-9b05-a0cea2b53b58} + osu.Game.Resources + + + {58f6c80c-1253-4a0e-a465-b8c85ebeadf3} + osu.Game.Rulesets.Catch + + + {2A66DD92-ADB1-4994-89E2-C94E04ACDA0D} + osu.Game + - \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Assets/AboutAssets.txt b/osu.Game.Rulesets.Mania.Tests.Android/Assets/AboutAssets.txt deleted file mode 100644 index b0633374bd..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Assets/AboutAssets.txt +++ /dev/null @@ -1,19 +0,0 @@ -Any raw assets you want to be deployed with your application can be placed in -this directory (and child directories) and given a Build Action of "AndroidAsset". - -These files will be deployed with you package and will be accessible using Android's -AssetManager, like this: - -public class ReadAsset : Activity -{ - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - InputStream input = Assets.Open ("my_asset.txt"); - } -} - -Additionally, some Android functions will automatically load asset files: - -Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania.Tests.Android/MainActivity.cs b/osu.Game.Rulesets.Mania.Tests.Android/MainActivity.cs index 09fc7ce770..3c0de47654 100644 --- a/osu.Game.Rulesets.Mania.Tests.Android/MainActivity.cs +++ b/osu.Game.Rulesets.Mania.Tests.Android/MainActivity.cs @@ -1,19 +1,17 @@ -using Android.App; -using Android.OS; -using Android.Support.V7.App; -using Android.Runtime; -using Android.Widget; +// Copyright (c) 2007-2018 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using Android.App; +using Android.Content.PM; +using osu.Framework.Android; +using osu.Game.Tests; namespace osu.Game.Rulesets.Mania.Tests.Android { - [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true)] - public class MainActivity : AppCompatActivity + [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.SensorLandscape, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)] + public class MainActivity : AndroidGameActivity { - protected override void OnCreate(Bundle savedInstanceState) - { - base.OnCreate(savedInstanceState); - // Set our view from the "main" layout resource - SetContentView(Resource.Layout.activity_main); - } + protected override Framework.Game CreateGame() + => new OsuTestBrowser(); } -} \ No newline at end of file +} diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/AboutResources.txt b/osu.Game.Rulesets.Mania.Tests.Android/Resources/AboutResources.txt deleted file mode 100644 index c2bca974c4..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Resources/AboutResources.txt +++ /dev/null @@ -1,44 +0,0 @@ -Images, layout descriptions, binary blobs and string dictionaries can be included -in your application as resource files. Various Android APIs are designed to -operate on the resource IDs instead of dealing with images, strings or binary blobs -directly. - -For example, a sample Android app that contains a user interface layout (main.axml), -an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) -would keep its resources in the "Resources" directory of the application: - -Resources/ - drawable/ - icon.png - - layout/ - main.axml - - values/ - strings.xml - -In order to get the build system to recognize Android resources, set the build action to -"AndroidResource". The native Android APIs do not operate directly with filenames, but -instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called "R" -(this is an Android convention) that contains the tokens for each one of the resources -included. For example, for the above Resources layout, this is what the R class would expose: - -public class R { - public class drawable { - public const int icon = 0x123; - } - - public class layout { - public const int main = 0x456; - } - - public class strings { - public const int first_string = 0xabc; - public const int second_string = 0xbcd; - } -} - -You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main -to reference the layout/main.axml file, or R.strings.first_string to reference the first -string in the dictionary file values/strings.xml. \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/Resource.designer.cs b/osu.Game.Rulesets.Mania.Tests.Android/Resources/Resource.designer.cs deleted file mode 100644 index c27ae8a832..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Resources/Resource.designer.cs +++ /dev/null @@ -1,112 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("osu.Game.Rulesets.Mania.Tests.Android.Resource", IsApplication=true)] - -namespace osu.Game.Rulesets.Mania.Tests.Android -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public static void UpdateIdValues() - { - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class Id - { - - // aapt resource value: 0x7f050000 - public const int myButton = 2131034112; - - static Id() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Id() - { - } - } - - public partial class Layout - { - - // aapt resource value: 0x7f030000 - public const int Main = 2130903040; - - static Layout() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Layout() - { - } - } - - public partial class Mipmap - { - - // aapt resource value: 0x7f020000 - public const int Icon = 2130837504; - - static Mipmap() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Mipmap() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7f040001 - public const int app_name = 2130968577; - - // aapt resource value: 0x7f040000 - public const int hello = 2130968576; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - } -} -#pragma warning restore 1591 diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/layout/activity_main.axml b/osu.Game.Rulesets.Mania.Tests.Android/Resources/layout/activity_main.axml deleted file mode 100644 index ff7a60eb50..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Resources/layout/activity_main.axml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc5f..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc5f..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2531cb31ef..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 7a859c2555..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b8d35b3a1c..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 795ea7c005..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index a12b157f00..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 8f56909cdd..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 761cc91d90..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index e7d70a5e2d..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 9737d79c04..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 9133e31b43..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 73ccaa6a2b..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index c3ae5f5ccd..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index d4fd714eed..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index f6584afd4d..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index ef89bd5215..0000000000 Binary files a/osu.Game.Rulesets.Mania.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/Strings.xml b/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/Strings.xml deleted file mode 100644 index 6ab86b7262..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/Strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - osu.Game.Rulesets.Mania.Tests.Android - Settings - diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/colors.xml b/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/colors.xml deleted file mode 100644 index 17bb9a9dd1..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #2c3e50 - #1B3147 - #3498db - diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/ic_launcher_background.xml b/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/ic_launcher_background.xml deleted file mode 100644 index 6ec24e6413..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #2C3E50 - \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/styles.xml b/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/styles.xml deleted file mode 100644 index 5885930df6..0000000000 --- a/osu.Game.Rulesets.Mania.Tests.Android/Resources/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj index 5fbee695b4..a761f2569a 100644 --- a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj +++ b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj @@ -24,82 +24,35 @@ Assets Xamarin.Android.Net.AndroidClientHandler - - True - portable - False - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - None - False - - - True - pdbonly - True - bin\Release\ - TRACE - prompt - 4 - true - False - SdkOnly - True - - - - - - - + - - + + osu.licenseheader + - - - Designer - - - - - - - - - - - - - - - - - - - - - - + + %(RecursiveDir)%(Filename)%(Extension) + - + + {d9a367c9-4c1a-489f-9b05-a0cea2b53b58} + osu.Game.Resources + + + {48f4582b-7687-4621-9cbe-5c24197cb536} + osu.Game.Rulesets.Mania + + + {2A66DD92-ADB1-4994-89E2-C94E04ACDA0D} + osu.Game + - \ No newline at end of file diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Assets/AboutAssets.txt b/osu.Game.Rulesets.Osu.Tests.Android/Assets/AboutAssets.txt deleted file mode 100644 index b0633374bd..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Assets/AboutAssets.txt +++ /dev/null @@ -1,19 +0,0 @@ -Any raw assets you want to be deployed with your application can be placed in -this directory (and child directories) and given a Build Action of "AndroidAsset". - -These files will be deployed with you package and will be accessible using Android's -AssetManager, like this: - -public class ReadAsset : Activity -{ - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - InputStream input = Assets.Open ("my_asset.txt"); - } -} - -Additionally, some Android functions will automatically load asset files: - -Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); \ No newline at end of file diff --git a/osu.Game.Rulesets.Osu.Tests.Android/MainActivity.cs b/osu.Game.Rulesets.Osu.Tests.Android/MainActivity.cs index 77a75f0d67..622eadef70 100644 --- a/osu.Game.Rulesets.Osu.Tests.Android/MainActivity.cs +++ b/osu.Game.Rulesets.Osu.Tests.Android/MainActivity.cs @@ -1,19 +1,17 @@ -using Android.App; -using Android.OS; -using Android.Support.V7.App; -using Android.Runtime; -using Android.Widget; +// Copyright (c) 2007-2018 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using Android.App; +using Android.Content.PM; +using osu.Framework.Android; +using osu.Game.Tests; namespace osu.Game.Rulesets.Osu.Tests.Android { - [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true)] - public class MainActivity : AppCompatActivity + [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.SensorLandscape, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)] + public class MainActivity : AndroidGameActivity { - protected override void OnCreate(Bundle savedInstanceState) - { - base.OnCreate(savedInstanceState); - // Set our view from the "main" layout resource - SetContentView(Resource.Layout.activity_main); - } + protected override Framework.Game CreateGame() + => new OsuTestBrowser(); } -} \ No newline at end of file +} diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/AboutResources.txt b/osu.Game.Rulesets.Osu.Tests.Android/Resources/AboutResources.txt deleted file mode 100644 index c2bca974c4..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Resources/AboutResources.txt +++ /dev/null @@ -1,44 +0,0 @@ -Images, layout descriptions, binary blobs and string dictionaries can be included -in your application as resource files. Various Android APIs are designed to -operate on the resource IDs instead of dealing with images, strings or binary blobs -directly. - -For example, a sample Android app that contains a user interface layout (main.axml), -an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) -would keep its resources in the "Resources" directory of the application: - -Resources/ - drawable/ - icon.png - - layout/ - main.axml - - values/ - strings.xml - -In order to get the build system to recognize Android resources, set the build action to -"AndroidResource". The native Android APIs do not operate directly with filenames, but -instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called "R" -(this is an Android convention) that contains the tokens for each one of the resources -included. For example, for the above Resources layout, this is what the R class would expose: - -public class R { - public class drawable { - public const int icon = 0x123; - } - - public class layout { - public const int main = 0x456; - } - - public class strings { - public const int first_string = 0xabc; - public const int second_string = 0xbcd; - } -} - -You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main -to reference the layout/main.axml file, or R.strings.first_string to reference the first -string in the dictionary file values/strings.xml. \ No newline at end of file diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/Resource.designer.cs b/osu.Game.Rulesets.Osu.Tests.Android/Resources/Resource.designer.cs deleted file mode 100644 index f229c3f960..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Resources/Resource.designer.cs +++ /dev/null @@ -1,112 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("osu.Game.Rulesets.Osu.Tests.Android.Resource", IsApplication=true)] - -namespace osu.Game.Rulesets.Osu.Tests.Android -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public static void UpdateIdValues() - { - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class Id - { - - // aapt resource value: 0x7f050000 - public const int myButton = 2131034112; - - static Id() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Id() - { - } - } - - public partial class Layout - { - - // aapt resource value: 0x7f030000 - public const int Main = 2130903040; - - static Layout() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Layout() - { - } - } - - public partial class Mipmap - { - - // aapt resource value: 0x7f020000 - public const int Icon = 2130837504; - - static Mipmap() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Mipmap() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7f040001 - public const int app_name = 2130968577; - - // aapt resource value: 0x7f040000 - public const int hello = 2130968576; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - } -} -#pragma warning restore 1591 diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/layout/activity_main.axml b/osu.Game.Rulesets.Osu.Tests.Android/Resources/layout/activity_main.axml deleted file mode 100644 index ff7a60eb50..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Resources/layout/activity_main.axml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc5f..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc5f..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2531cb31ef..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 7a859c2555..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b8d35b3a1c..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 795ea7c005..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index a12b157f00..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 8f56909cdd..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 761cc91d90..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index e7d70a5e2d..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 9737d79c04..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 9133e31b43..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 73ccaa6a2b..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index c3ae5f5ccd..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index d4fd714eed..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index f6584afd4d..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index ef89bd5215..0000000000 Binary files a/osu.Game.Rulesets.Osu.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/Strings.xml b/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/Strings.xml deleted file mode 100644 index 8c47838dfb..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/Strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - osu.Game.Rulesets.Osu.Tests.Android - Settings - diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/colors.xml b/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/colors.xml deleted file mode 100644 index 17bb9a9dd1..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #2c3e50 - #1B3147 - #3498db - diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/ic_launcher_background.xml b/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/ic_launcher_background.xml deleted file mode 100644 index 6ec24e6413..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #2C3E50 - \ No newline at end of file diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/styles.xml b/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/styles.xml deleted file mode 100644 index 5885930df6..0000000000 --- a/osu.Game.Rulesets.Osu.Tests.Android/Resources/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj index 7eeee4fd80..9b2ab38309 100644 --- a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj +++ b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj @@ -24,82 +24,35 @@ Assets Xamarin.Android.Net.AndroidClientHandler - - True - portable - False - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - None - False - - - True - pdbonly - True - bin\Release\ - TRACE - prompt - 4 - true - False - SdkOnly - True - - - - - - - + - - + + osu.licenseheader + - - - Designer - - - - - - - - - - - - - - - - - - - - - - + + %(RecursiveDir)%(Filename)%(Extension) + - + + {d9a367c9-4c1a-489f-9b05-a0cea2b53b58} + osu.Game.Resources + + + {c92a607b-1fdd-4954-9f92-03ff547d9080} + osu.Game.Rulesets.Osu + + + {2a66dd92-adb1-4994-89e2-c94e04acda0d} + osu.Game + - \ No newline at end of file diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Assets/AboutAssets.txt b/osu.Game.Rulesets.Taiko.Tests.Android/Assets/AboutAssets.txt deleted file mode 100644 index b0633374bd..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Assets/AboutAssets.txt +++ /dev/null @@ -1,19 +0,0 @@ -Any raw assets you want to be deployed with your application can be placed in -this directory (and child directories) and given a Build Action of "AndroidAsset". - -These files will be deployed with you package and will be accessible using Android's -AssetManager, like this: - -public class ReadAsset : Activity -{ - protected override void OnCreate (Bundle bundle) - { - base.OnCreate (bundle); - - InputStream input = Assets.Open ("my_asset.txt"); - } -} - -Additionally, some Android functions will automatically load asset files: - -Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); \ No newline at end of file diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/MainActivity.cs b/osu.Game.Rulesets.Taiko.Tests.Android/MainActivity.cs index 8ceca4d436..0c64cbfc5d 100644 --- a/osu.Game.Rulesets.Taiko.Tests.Android/MainActivity.cs +++ b/osu.Game.Rulesets.Taiko.Tests.Android/MainActivity.cs @@ -1,19 +1,17 @@ -using Android.App; -using Android.OS; -using Android.Support.V7.App; -using Android.Runtime; -using Android.Widget; +// Copyright (c) 2007-2018 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using Android.App; +using Android.Content.PM; +using osu.Framework.Android; +using osu.Game.Tests; namespace osu.Game.Rulesets.Taiko.Tests.Android { - [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true)] - public class MainActivity : AppCompatActivity + [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.SensorLandscape, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)] + public class MainActivity : AndroidGameActivity { - protected override void OnCreate(Bundle savedInstanceState) - { - base.OnCreate(savedInstanceState); - // Set our view from the "main" layout resource - SetContentView(Resource.Layout.activity_main); - } + protected override Framework.Game CreateGame() + => new OsuTestBrowser(); } -} \ No newline at end of file +} diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/AboutResources.txt b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/AboutResources.txt deleted file mode 100644 index c2bca974c4..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/AboutResources.txt +++ /dev/null @@ -1,44 +0,0 @@ -Images, layout descriptions, binary blobs and string dictionaries can be included -in your application as resource files. Various Android APIs are designed to -operate on the resource IDs instead of dealing with images, strings or binary blobs -directly. - -For example, a sample Android app that contains a user interface layout (main.axml), -an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) -would keep its resources in the "Resources" directory of the application: - -Resources/ - drawable/ - icon.png - - layout/ - main.axml - - values/ - strings.xml - -In order to get the build system to recognize Android resources, set the build action to -"AndroidResource". The native Android APIs do not operate directly with filenames, but -instead operate on resource IDs. When you compile an Android application that uses resources, -the build system will package the resources for distribution and generate a class called "R" -(this is an Android convention) that contains the tokens for each one of the resources -included. For example, for the above Resources layout, this is what the R class would expose: - -public class R { - public class drawable { - public const int icon = 0x123; - } - - public class layout { - public const int main = 0x456; - } - - public class strings { - public const int first_string = 0xabc; - public const int second_string = 0xbcd; - } -} - -You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main -to reference the layout/main.axml file, or R.strings.first_string to reference the first -string in the dictionary file values/strings.xml. \ No newline at end of file diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/Resource.designer.cs b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/Resource.designer.cs deleted file mode 100644 index d3709d3cdb..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/Resource.designer.cs +++ /dev/null @@ -1,112 +0,0 @@ -#pragma warning disable 1591 -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: global::Android.Runtime.ResourceDesignerAttribute("osu.Game.Rulesets.Taiko.Tests.Android.Resource", IsApplication=true)] - -namespace osu.Game.Rulesets.Taiko.Tests.Android -{ - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - - static Resource() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - public static void UpdateIdValues() - { - } - - public partial class Attribute - { - - static Attribute() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Attribute() - { - } - } - - public partial class Id - { - - // aapt resource value: 0x7f050000 - public const int myButton = 2131034112; - - static Id() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Id() - { - } - } - - public partial class Layout - { - - // aapt resource value: 0x7f030000 - public const int Main = 2130903040; - - static Layout() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Layout() - { - } - } - - public partial class Mipmap - { - - // aapt resource value: 0x7f020000 - public const int Icon = 2130837504; - - static Mipmap() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Mipmap() - { - } - } - - public partial class String - { - - // aapt resource value: 0x7f040001 - public const int app_name = 2130968577; - - // aapt resource value: 0x7f040000 - public const int hello = 2130968576; - - static String() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private String() - { - } - } - } -} -#pragma warning restore 1591 diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/layout/activity_main.axml b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/layout/activity_main.axml deleted file mode 100644 index ff7a60eb50..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/layout/activity_main.axml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc5f..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc5f..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2531cb31ef..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 7a859c2555..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index b8d35b3a1c..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 795ea7c005..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index a12b157f00..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 8f56909cdd..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 761cc91d90..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index e7d70a5e2d..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 9737d79c04..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 9133e31b43..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 73ccaa6a2b..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index c3ae5f5ccd..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index d4fd714eed..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index f6584afd4d..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index ef89bd5215..0000000000 Binary files a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/Strings.xml b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/Strings.xml deleted file mode 100644 index 12965f132d..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/Strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - osu.Game.Rulesets.Taiko.Tests.Android - Settings - diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/colors.xml b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/colors.xml deleted file mode 100644 index 17bb9a9dd1..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #2c3e50 - #1B3147 - #3498db - diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/ic_launcher_background.xml b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/ic_launcher_background.xml deleted file mode 100644 index 6ec24e6413..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #2C3E50 - \ No newline at end of file diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/styles.xml b/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/styles.xml deleted file mode 100644 index 5885930df6..0000000000 --- a/osu.Game.Rulesets.Taiko.Tests.Android/Resources/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj index 62c2cefe06..0174be9451 100644 --- a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj +++ b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj @@ -24,82 +24,38 @@ Assets Xamarin.Android.Net.AndroidClientHandler - - True - portable - False - bin\Debug\ - DEBUG;TRACE - prompt - 4 - True - None - False - - - True - pdbonly - True - bin\Release\ - TRACE - prompt - 4 - true - False - SdkOnly - True - - - - - - - + - - + + osu.licenseheader + - - - Designer - - - - - - - - - - - - - - - - - - - - - - + + %(RecursiveDir)%(Filename)%(Extension) + + + + {d9a367c9-4c1a-489f-9b05-a0cea2b53b58} + osu.Game.Resources + + + {f167e17a-7de6-4af5-b920-a5112296c695} + osu.Game.Rulesets.Taiko + + + {2a66dd92-adb1-4994-89e2-c94e04acda0d} + osu.Game + + - \ No newline at end of file