diff --git a/android/ic_launcher-web.png b/android/ic_launcher-web.png index e6970c2d7c..4ad2ddd445 100644 Binary files a/android/ic_launcher-web.png and b/android/ic_launcher-web.png differ diff --git a/android/res/drawable/background.png b/android/res/drawable/background.png new file mode 100644 index 0000000000..b02bc10b64 Binary files /dev/null and b/android/res/drawable/background.png differ diff --git a/android/res/drawable/ic_launcher_foreground.png b/android/res/drawable/ic_launcher_foreground.png index a3107eece7..d9ba2d1a9b 100644 Binary files a/android/res/drawable/ic_launcher_foreground.png and b/android/res/drawable/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-hdpi/ic_launcher.png b/android/res/mipmap-hdpi/ic_launcher.png index 9cfcaa3c91..2447c3f621 100644 Binary files a/android/res/mipmap-hdpi/ic_launcher.png and b/android/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/res/mipmap-hdpi/ic_launcher_foreground.png b/android/res/mipmap-hdpi/ic_launcher_foreground.png index 1b4eb14b36..5e0ac93602 100644 Binary files a/android/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-hdpi/ic_launcher_round.png b/android/res/mipmap-hdpi/ic_launcher_round.png index c79dccd9df..686f48cb81 100644 Binary files a/android/res/mipmap-hdpi/ic_launcher_round.png and b/android/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher.png b/android/res/mipmap-mdpi/ic_launcher.png index 5028f0be15..8946c07d2a 100644 Binary files a/android/res/mipmap-mdpi/ic_launcher.png and b/android/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher_foreground.png b/android/res/mipmap-mdpi/ic_launcher_foreground.png index c055944342..29ee0aca67 100644 Binary files a/android/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher_round.png b/android/res/mipmap-mdpi/ic_launcher_round.png index a7a79310c4..1952f47833 100644 Binary files a/android/res/mipmap-mdpi/ic_launcher_round.png and b/android/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher.png b/android/res/mipmap-xhdpi/ic_launcher.png index 09b1898f72..7d2b5292be 100644 Binary files a/android/res/mipmap-xhdpi/ic_launcher.png and b/android/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/res/mipmap-xhdpi/ic_launcher_foreground.png index b4658d2b5a..b18c416546 100644 Binary files a/android/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher_round.png b/android/res/mipmap-xhdpi/ic_launcher_round.png index ed72ae41fb..1d6e1d523c 100644 Binary files a/android/res/mipmap-xhdpi/ic_launcher_round.png and b/android/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher.png b/android/res/mipmap-xxhdpi/ic_launcher.png index 8c38ee9278..96deec6e8a 100644 Binary files a/android/res/mipmap-xxhdpi/ic_launcher.png and b/android/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/res/mipmap-xxhdpi/ic_launcher_foreground.png index 93be9b67ce..7b5c3d24be 100644 Binary files a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher_round.png b/android/res/mipmap-xxhdpi/ic_launcher_round.png index 8a675778ba..375d7b0634 100644 Binary files a/android/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher.png b/android/res/mipmap-xxxhdpi/ic_launcher.png index b994e62db7..12f7a9e6ee 100644 Binary files a/android/res/mipmap-xxxhdpi/ic_launcher.png and b/android/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 0b3da7cabc..3cb7d5ad21 100644 Binary files a/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/res/mipmap-xxxhdpi/ic_launcher_round.png index 2c1ba44a2a..3ce9bec872 100644 Binary files a/android/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-editor.png b/core/assets-raw/sprites/ui/icons/icon-editor.png index d607e2bd4f..4e25b087a0 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-editor.png and b/core/assets-raw/sprites/ui/icons/icon-editor.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-terrain.png b/core/assets-raw/sprites/ui/icons/icon-terrain.png index 449b861973..da5f25366d 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-terrain.png and b/core/assets-raw/sprites/ui/icons/icon-terrain.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 73f2648349..a27c266698 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/ui/FileChooser.java b/core/src/io/anuke/mindustry/ui/FileChooser.java index fc7bb04da3..8caecc0631 100644 --- a/core/src/io/anuke/mindustry/ui/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/FileChooser.java @@ -1,7 +1,5 @@ package io.anuke.mindustry.ui; -import java.util.Arrays; - import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.g2d.GlyphLayout; @@ -9,12 +7,21 @@ import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Pools; +import java.util.Arrays; + import io.anuke.mindustry.Mindustry; import io.anuke.ucore.core.Core; import io.anuke.ucore.function.Consumer; import io.anuke.ucore.function.Predicate; import io.anuke.ucore.scene.event.Touchable; -import io.anuke.ucore.scene.ui.*; +import io.anuke.ucore.scene.ui.ButtonGroup; +import io.anuke.ucore.scene.ui.Dialog; +import io.anuke.ucore.scene.ui.Image; +import io.anuke.ucore.scene.ui.ImageButton; +import io.anuke.ucore.scene.ui.Label; +import io.anuke.ucore.scene.ui.ScrollPane; +import io.anuke.ucore.scene.ui.TextButton; +import io.anuke.ucore.scene.ui.TextField; import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Unit; @@ -43,7 +50,7 @@ public class FileChooser extends FloatingDialog{ } private void setupWidgets(){ - getCell(content()).width(Gdx.graphics.getWidth() / Unit.dp.scl(2f)); + getCell(content()).maxWidth(Gdx.graphics.getWidth()/Unit.dp.scl(2f)); content().pad(-10); Table content = new Table(); @@ -135,7 +142,7 @@ public class FileChooser extends FloatingDialog{ //content.add(navigation).colspan(3).left().padBottom(10f).expandX().fillX().height(40f); //content.row(); - content.center().add(pane).width(Gdx.graphics.getWidth()/2).colspan(3).grow(); + content.center().add(pane).width(Gdx.graphics.getWidth()/Unit.dp.scl(2)).colspan(3).grow(); content.row(); if(!open){