mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-30 06:37:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert theme removal / Android jar import bugfixes

Browse Source
This commit is contained in:
Anuken
2021-07-11 10:13:34 -04:00
parent 8a84ebb58d
commit 308176ee81
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/AndroidManifest.xml
View File

@ -14,6 +14,7 @@
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:isGame="true"
android:theme="@style/ArcTheme"
android:usesCleartextTraffic="true"
android:appCategory="game"
android:label="@string/app_name"

11
android/res/values-v21/styles.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="ArcTheme" parent="android:Theme.Material.NoActionBar">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowFullscreen">true</item>
</style>
</resources>

10
android/res/values/styles.xml Normal file
View File

@ -0,0 +1,10 @@
<resources>
<style name="ArcTheme" parent="android:Theme">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowFullscreen">true</item>
</style>
</resources>

13
core/src/mindustry/mod/Mods.java
View File

@ -86,7 +86,8 @@ public class Mods implements Loadable{
/** Imports an external mod file. Folders are not supported here. */
public LoadedMod importMod(Fi file) throws IOException{
String baseName = file.nameWithoutExtension();
//for some reason, android likes to add colons to file names, e.g. primary:ExampleJavaMod.jar, which breaks dexing
String baseName = file.nameWithoutExtension().replace(':', '_');
String finalName = baseName;
//find a name to prevent any name conflicts
int count = 1;
@ -300,12 +301,12 @@ public class Mods implements Loadable{
}
private PageType getPage(Fi file){
String parent = file.parent().name();
String path = file.path();
return
parent.equals("environment") ? PageType.environment :
parent.equals("editor") ? PageType.editor :
parent.equals("rubble") ? PageType.editor :
parent.equals("ui") || file.parent().parent().name().equals("ui") ? PageType.ui :
path.contains("sprites/environment") ? PageType.environment :
path.contains("sprites/editor") ? PageType.editor :
path.contains("sprites/rubble") ? PageType.editor :
path.contains("sprites/ui") ? PageType.ui :
PageType.main;
}