From b6c0e92c2c219bf3012ff2c62cd384b4d09c425f Mon Sep 17 00:00:00 2001
From: zethnest <16971676+zethnest@users.noreply.github.com>
Date: Mon, 1 Jun 2020 10:56:23 +0800
Subject: [PATCH 1/2] readability and redundant (#2129)

---
 core/src/mindustry/input/MobileInput.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java
index 35f42dec93..16f7261a24 100644
--- a/core/src/mindustry/input/MobileInput.java
+++ b/core/src/mindustry/input/MobileInput.java
@@ -241,7 +241,8 @@ public class MobileInput extends InputHandler implements GestureListener{
         Boolp schem = () -> lastSchematic != null && !selectRequests.isEmpty();
 
         group.fill(t -> {
-            t.bottom().left().visible(() -> (player.builder().isBuilding() || block != null || mode == breaking || !selectRequests.isEmpty()) && !schem.get());
+            t.visible(() -> (player.builder().isBuilding() || block != null || mode == breaking || !selectRequests.isEmpty()) && !schem.get());
+            t.bottom().left();
             t.button("$cancel", Icon.cancel, () -> {
                 player.builder().clearBuilding();
                 selectRequests.clear();
@@ -332,13 +333,11 @@ public class MobileInput extends InputHandler implements GestureListener{
             if(mode == placing && block != null){
                 //draw placing
                 for(int i = 0; i < lineRequests.size; i++){
-                    BuildRequest req = lineRequests.get(i);
-                    if(i == lineRequests.size - 1 && req.block.rotate){
-                        drawArrow(block, req.x, req.y, req.rotation);
-                    }
-
                     BuildRequest request = lineRequests.get(i);
-                    request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(req.x, request.y, request.block.size, null) == null);
+                    if(i == lineRequests.size - 1 && request.block.rotate){
+                        drawArrow(block, request.x, request.y, request.rotation);
+                    }
+                    request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(request.x, request.y, request.block.size, null) == null);
                     drawSelected(request.x, request.y, request.block, Pal.accent);
                 }
             }else if(mode == breaking){

From 0c6b7aa934968db8eb48fa946dd7a2b420c44e5d Mon Sep 17 00:00:00 2001
From: zethnest <16971676+zethnest@users.noreply.github.com>
Date: Mon, 1 Jun 2020 21:05:49 +0800
Subject: [PATCH 2/2] fix export icon (#2130)

---
 core/src/mindustry/ui/dialogs/SettingsMenuDialog.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
index 2a918c4194..cbd6d1cca5 100644
--- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -103,7 +103,7 @@ public class SettingsMenuDialog extends SettingsDialog{
 
             t.row();
 
-            t.button("$data.export", Icon.download, style, () -> {
+            t.button("$data.export", Icon.upload, style, () -> {
                 if(ios){
                     Fi file = Core.files.local("mindustry-data-export.zip");
                     try{