diff --git a/osu.Android.props b/osu.Android.props
index 7b22b76e0e..5ee0573c58 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
Off
True
Xamarin.Android.Net.AndroidClientHandler
- v8.1
+ v9.0
false
diff --git a/osu.Android/Properties/AndroidManifest.xml b/osu.Android/Properties/AndroidManifest.xml
index 326d32f7ab..acd21f9587 100644
--- a/osu.Android/Properties/AndroidManifest.xml
+++ b/osu.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 42a3185cd1..ac3905a372 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -14,6 +14,11 @@
Properties\AndroidManifest.xml
armeabi-v7a;x86;arm64-v8a
+
+ cjk;mideast;other;rare;west
+ d8
+ r8
+
diff --git a/osu.Game.Rulesets.Catch.Tests.Android/Properties/AndroidManifest.xml b/osu.Game.Rulesets.Catch.Tests.Android/Properties/AndroidManifest.xml
index b04b0718f5..db95e18f13 100644
--- a/osu.Game.Rulesets.Catch.Tests.Android/Properties/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Catch.Tests.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests.Android/Properties/AndroidManifest.xml b/osu.Game.Rulesets.Mania.Tests.Android/Properties/AndroidManifest.xml
index c315581606..e6728c801d 100644
--- a/osu.Game.Rulesets.Mania.Tests.Android/Properties/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Mania.Tests.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests.Android/Properties/AndroidManifest.xml b/osu.Game.Rulesets.Osu.Tests.Android/Properties/AndroidManifest.xml
index dac9c19477..aad907b241 100644
--- a/osu.Game.Rulesets.Osu.Tests.Android/Properties/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Osu.Tests.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/Properties/AndroidManifest.xml b/osu.Game.Rulesets.Taiko.Tests.Android/Properties/AndroidManifest.xml
index f731042a4c..cd4b74aa16 100644
--- a/osu.Game.Rulesets.Taiko.Tests.Android/Properties/AndroidManifest.xml
+++ b/osu.Game.Rulesets.Taiko.Tests.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/osu.Game.Tests.Android/Properties/AndroidManifest.xml b/osu.Game.Tests.Android/Properties/AndroidManifest.xml
index 146f96c2a3..bb996dc5ca 100644
--- a/osu.Game.Tests.Android/Properties/AndroidManifest.xml
+++ b/osu.Game.Tests.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index 869005d05c..8134cfb42d 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Graphics.UserInterface
text.Colour = AccentColour;
icon.Colour = AccentColour;
}
+
+ updateFade();
}
}
@@ -48,39 +50,6 @@ namespace osu.Game.Graphics.UserInterface
private const float transition_length = 500;
- private void fadeIn()
- {
- box.FadeIn(transition_length, Easing.OutQuint);
- text.FadeColour(Color4.White, transition_length, Easing.OutQuint);
- }
-
- private void fadeOut()
- {
- box.FadeOut(transition_length, Easing.OutQuint);
- text.FadeColour(AccentColour, transition_length, Easing.OutQuint);
- }
-
- protected override bool OnHover(HoverEvent e)
- {
- fadeIn();
- return base.OnHover(e);
- }
-
- protected override void OnHoverLost(HoverLostEvent e)
- {
- if (!Current.Value)
- fadeOut();
-
- base.OnHoverLost(e);
- }
-
- [BackgroundDependencyLoader]
- private void load(OsuColour colours)
- {
- if (accentColour == null)
- AccentColour = colours.Blue;
- }
-
public OsuTabControlCheckbox()
{
AutoSizeAxes = Axes.Both;
@@ -115,19 +84,34 @@ namespace osu.Game.Graphics.UserInterface
}
};
- Current.ValueChanged += selected =>
- {
- if (selected.NewValue)
- {
- fadeIn();
- icon.Icon = FontAwesome.Regular.CheckCircle;
- }
- else
- {
- fadeOut();
- icon.Icon = FontAwesome.Regular.Circle;
- }
- };
+ Current.ValueChanged += selected => { icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle; };
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(OsuColour colours)
+ {
+ if (accentColour == null)
+ AccentColour = colours.Blue;
+ }
+
+ protected override bool OnHover(HoverEvent e)
+ {
+ updateFade();
+ return base.OnHover(e);
+ }
+
+ protected override void OnHoverLost(HoverLostEvent e)
+ {
+ if (!Current.Value)
+ updateFade();
+
+ base.OnHoverLost(e);
+ }
+
+ private void updateFade()
+ {
+ box.FadeTo(IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
+ text.FadeColour(IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint);
}
}
}
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index b91de93a4a..dea2ff1a21 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -231,12 +231,6 @@ namespace osu.Game.Online.Leaderboards
if (getScoresRequest == null)
return;
- if (api?.IsLoggedIn != true)
- {
- PlaceholderState = PlaceholderState.NotLoggedIn;
- return;
- }
-
getScoresRequest.Failure += e => Schedule(() =>
{
if (e is OperationCanceledException)
diff --git a/osu.Game/Screens/Select/EditSongSelect.cs b/osu.Game/Screens/Select/EditSongSelect.cs
deleted file mode 100644
index bdf5f905fe..0000000000
--- a/osu.Game/Screens/Select/EditSongSelect.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Screens;
-
-namespace osu.Game.Screens.Select
-{
- public class EditSongSelect : SongSelect
- {
- protected override bool ShowFooter => false;
-
- protected override bool OnStart()
- {
- this.Exit();
- return true;
- }
- }
-}
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 62f93afbbb..68f153a97d 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -62,6 +62,12 @@ namespace osu.Game.Screens.Select.Leaderboards
return null;
}
+ if (api?.IsLoggedIn != true)
+ {
+ PlaceholderState = PlaceholderState.NotLoggedIn;
+ return null;
+ }
+
if (Beatmap?.OnlineBeatmapID == null)
{
PlaceholderState = PlaceholderState.Unavailable;