mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-08-03 08:29:29 +07:00
Revert theme removal / Android jar import bugfixes
This commit is contained in:
@ -14,6 +14,7 @@
|
|||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:isGame="true"
|
android:isGame="true"
|
||||||
|
android:theme="@style/ArcTheme"
|
||||||
android:usesCleartextTraffic="true"
|
android:usesCleartextTraffic="true"
|
||||||
android:appCategory="game"
|
android:appCategory="game"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
|
11
android/res/values-v21/styles.xml
Normal file
11
android/res/values-v21/styles.xml
Normal 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
10
android/res/values/styles.xml
Normal 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>
|
@ -86,7 +86,8 @@ public class Mods implements Loadable{
|
|||||||
|
|
||||||
/** Imports an external mod file. Folders are not supported here. */
|
/** Imports an external mod file. Folders are not supported here. */
|
||||||
public LoadedMod importMod(Fi file) throws IOException{
|
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;
|
String finalName = baseName;
|
||||||
//find a name to prevent any name conflicts
|
//find a name to prevent any name conflicts
|
||||||
int count = 1;
|
int count = 1;
|
||||||
@ -300,12 +301,12 @@ public class Mods implements Loadable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
private PageType getPage(Fi file){
|
private PageType getPage(Fi file){
|
||||||
String parent = file.parent().name();
|
String path = file.path();
|
||||||
return
|
return
|
||||||
parent.equals("environment") ? PageType.environment :
|
path.contains("sprites/environment") ? PageType.environment :
|
||||||
parent.equals("editor") ? PageType.editor :
|
path.contains("sprites/editor") ? PageType.editor :
|
||||||
parent.equals("rubble") ? PageType.editor :
|
path.contains("sprites/rubble") ? PageType.editor :
|
||||||
parent.equals("ui") || file.parent().parent().name().equals("ui") ? PageType.ui :
|
path.contains("sprites/ui") ? PageType.ui :
|
||||||
PageType.main;
|
PageType.main;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user