Add some crap

ppy · Jan 11, 2021 · 2a4084c · 2a4084c
1 parent 2703f91
commit 2a4084c
Show file tree

Hide file tree

Showing 43 changed files with 1,419 additions and 1,404 deletions.
diff --git a/osu!stream/AssetManager/NativeAssetManager.cs b/osu!stream/AssetManager/NativeAssetManager.cs
@@ -25,17 +25,17 @@ public NativeAssetManager()
 
         internal virtual bool FileExists(string filename)
         {
-            return File.Exists(filename);
+            return File.Exists("/sdcard/" + filename);
         }
 
         internal virtual Stream GetFileStream(string filename)
         {
-            return File.OpenRead(filename);
+            return File.OpenRead("/sdcard/" + filename);
         }
 
         internal virtual byte[] GetFileBytes(string filename)
         {
-            return File.ReadAllBytes(filename);
+            return File.ReadAllBytes("/sdcard/" + filename);
         }
     }
 }
diff --git a/osu!stream/Bass.Net.Android.dll b/osu!stream/Bass.Net.Android.dll
diff --git a/osu!stream/Graphics/pTexture.cs b/osu!stream/Graphics/pTexture.cs
@@ -349,6 +349,13 @@ public static pTexture FromStream(Stream stream, string assetname, bool saveToFi
                 pTexture pt;
 #if iOS
                 pt = FromUIImage(UIImage.LoadFromData(NSData.FromStream(stream)),assetname);
+#elif ANDROID
+                using (Android.Graphics.Bitmap b = Android.Graphics.BitmapFactory.DecodeStream(stream))
+                {
+                    pt = FromRawBytes(b.LockPixels(), b.Width, b.Height);
+                    pt.assetName = assetname;
+                    b.UnlockPixels();
+                }
 #else
                 using (Bitmap b = (Bitmap)Image.FromStream(stream, false, false))
                 {

diff --git a/osu!stream/Libraries/Android/arm64-v8a/libbass.so b/osu!stream/Libraries/Android/arm64-v8a/libbass.so
diff --git a/osu!stream/Libraries/Android/arm64-v8a/libbass_aac.so b/osu!stream/Libraries/Android/arm64-v8a/libbass_aac.so
diff --git a/osu!stream/Libraries/Android/armeabi-v7a/libbass.so b/osu!stream/Libraries/Android/armeabi-v7a/libbass.so
diff --git a/osu!stream/Libraries/Android/armeabi-v7a/libbass_aac.so b/osu!stream/Libraries/Android/armeabi-v7a/libbass_aac.so
diff --git a/osu!stream/Libraries/Android/x86/libbass.so b/osu!stream/Libraries/Android/x86/libbass.so
diff --git a/osu!stream/Libraries/Android/x86/libbass_aac.so b/osu!stream/Libraries/Android/x86/libbass_aac.so
diff --git a/osu!stream/Libraries/Android/x86_64/libbass.so b/osu!stream/Libraries/Android/x86_64/libbass.so
diff --git a/osu!stream/Libraries/Android/x86_64/libbass_aac.so b/osu!stream/Libraries/Android/x86_64/libbass_aac.so
diff --git a/osu!stream/Main.cs b/osu!stream/Main.cs
@@ -15,25 +15,36 @@
 namespace osum
 {
 #if ANDROID
-    [Activity(Label = "@string/app_name", Theme = "@style/default", MainLauncher = true)]
+    [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true, ScreenOrientation = ScreenOrientation.UserLandscape)]
     public class Application : AppCompatActivity
 #else
     public class Application
 #endif
     {
+#if ANDROID
+        private static Activity _this;
+#endif
+
         private static void Main(string[] args)
         {
 #if iOS
             GameBase game = new GameBaseIphone();
             game.Run();
 #elif ANDROID
+            GameBase game = new GameBaseAndroid(_this);
+            game.Run();
 #else
             GameBase game = new GameBaseDesktop();
             game.Run();
 #endif
         }
 
 #if ANDROID
+        public Application()
+        {
+            _this = this;
+        }
+
         protected override void OnCreate(Bundle savedInstanceState)
         {
             // Hide Status Bar, etc...

diff --git a/osu!stream/Properties/AndroidManifest.xml b/osu!stream/Properties/AndroidManifest.xml
@@ -1,10 +1,8 @@
 <?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="com.companyname.osu_stream_android">
-  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
-  <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme">
-  </application>
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="sh.ppy.osustream" android:installLocation="auto">
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+	<application android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme" android:icon="@drawable/icon"></application>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+</manifest>
diff --git a/osu!stream/Properties/AssemblyInfo.cs b/osu!stream/Properties/AssemblyInfo.cs
@@ -6,12 +6,12 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("osu_stream_android")]
+[assembly: AssemblyTitle("osu!stream")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("osu_stream_android")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyProduct("osu!stream")]
+[assembly: AssemblyCopyright("Copyright © peppy 2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

diff --git a/osu!stream/Resources/AboutResources.txt b/osu!stream/Resources/AboutResources.txt