v1.1.2: added inset support for notched iPhones in landscape

SPD-classes/src/main/java/com/watabou/utils/DeviceCompat.java

@@ -71,4 +71,13 @@ public class DeviceCompat {
 		Gdx.app.log( tag, message );
 	}
 
+	public static RectF getSafeInsets(){
+		RectF result = new RectF();
+		result.left =   Gdx.graphics.getSafeInsetLeft();
+		result.top =    Gdx.graphics.getSafeInsetTop();
+		result.right =  Gdx.graphics.getSafeInsetRight();
+		result.bottom = Gdx.graphics.getSafeInsetBottom();
+		return result;
+	}
+
 }

SPD-classes/src/main/java/com/watabou/utils/Rect.java

@@ -148,6 +148,10 @@ public class Rect {
 		return shrink( 1 );
 	}
 
+	public Rect scale( int d ){
+		return new Rect( left * d, top * d, right * d, bottom * d );
+	}
+
 	public ArrayList<Point> getPoints() {
 		ArrayList<Point> points = new ArrayList<>();
 		for (int i = left; i <= right; i++)

SPD-classes/src/main/java/com/watabou/utils/RectF.java

@@ -144,4 +144,8 @@ public class RectF {
 		return shrink( 1 );
 	}
 
+	public RectF scale( float d ){
+		return new RectF( left * d, top * d, right * d, bottom * d );
+	}
+	
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java

@@ -87,6 +87,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.LootIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
 import com.shatteredpixel.shatteredpixeldungeon.ui.ResumeIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.ui.StatusPane;
+import com.shatteredpixel.shatteredpixeldungeon.ui.Tag;
 import com.shatteredpixel.shatteredpixeldungeon.ui.TargetHealthIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.ui.Toast;
 import com.shatteredpixel.shatteredpixeldungeon.ui.Toolbar;
@@ -116,8 +117,10 @@ import com.watabou.noosa.Visual;
 import com.watabou.noosa.audio.Music;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.noosa.particles.Emitter;
+import com.watabou.utils.DeviceCompat;
 import com.watabou.utils.GameMath;
 import com.watabou.utils.Random;
+import com.watabou.utils.RectF;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -725,38 +728,44 @@ public class GameScene extends PixelScene {
 
 		if (scene == null) return;
 
-		float tagLeft = SPDSettings.flipTags() ? 0 : uiCamera.width - scene.attack.width();
+		//primarily for phones displays with notches
+		//TODO Android never draws into notch atm, perhaps allow it for center notches?
+		RectF insets = DeviceCompat.getSafeInsets();
+		insets = insets.scale(1f / uiCamera.zoom);
+
+		boolean tagsOnLeft = SPDSettings.flipTags();
+		float tagWidth = Tag.SIZE + (tagsOnLeft ? insets.left : insets.right);
+		float tagLeft = tagsOnLeft ? 0 : uiCamera.width - tagWidth;
 
 		if (SPDSettings.flipTags()) {
-			scene.log.setRect(scene.attack.width(), scene.toolbar.top()-2, uiCamera.width - scene.attack.width(), 0);
+			scene.log.setRect(tagWidth, scene.toolbar.top()-2, uiCamera.width - tagWidth - insets.right, 0);
 		} else {
-			scene.log.setRect(0, scene.toolbar.top()-2, uiCamera.width - scene.attack.width(),  0 );
+			scene.log.setRect(insets.left, scene.toolbar.top()-2, uiCamera.width - tagWidth - insets.left, 0);
 		}
 
 		float pos = scene.toolbar.top();
 
-		//FIXME adjusting this to position even without visibility resulted in deadlocks
 		if (scene.tagAttack){
-			scene.attack.setPos( tagLeft, pos - scene.attack.height());
+			scene.attack.setRect( tagLeft, pos - Tag.SIZE, tagWidth, Tag.SIZE );
-			scene.attack.flip(tagLeft == 0);
+			scene.attack.flip(tagsOnLeft);
 			pos = scene.attack.top();
 		}
 
 		if (scene.tagLoot) {
-			scene.loot.setPos( tagLeft, pos - scene.loot.height() );
+			scene.loot.setRect( tagLeft, pos - Tag.SIZE, tagWidth, Tag.SIZE );
-			scene.loot.flip(tagLeft == 0);
+			scene.loot.flip(tagsOnLeft);
 			pos = scene.loot.top();
 		}
 
 		if (scene.tagAction) {
-			scene.action.setPos( tagLeft, pos - scene.action.height() );
+			scene.action.setRect( tagLeft, pos - Tag.SIZE, tagWidth, Tag.SIZE );
-			scene.action.flip(tagLeft == 0);
+			scene.action.flip(tagsOnLeft);
 			pos = scene.action.top();
 		}
 
 		if (scene.tagResume) {
-			scene.resume.setPos(tagLeft, pos - scene.resume.height());
+			scene.resume.setRect( tagLeft, pos - Tag.SIZE, tagWidth, Tag.SIZE );
-			scene.resume.flip(tagLeft == 0);
+			scene.resume.flip(tagsOnLeft);
 		}
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ActionIndicator.java

@@ -39,7 +39,7 @@ public class ActionIndicator extends Tag {
 
 		instance = this;
 
-		setSize( 24, 24 );
+		setSize( SIZE, SIZE );
 		visible = false;
 	}
 	
@@ -59,8 +59,9 @@ public class ActionIndicator extends Tag {
 		super.layout();
 		
 		if (icon != null){
-			icon.x = x + (width - icon.width()) / 2;
+			if (!flipped)   icon.x = x + (SIZE - icon.width()) / 2f + 1;
-			icon.y = y + (height - icon.height()) / 2;
+			else            icon.x = x + width - (SIZE + icon.width()) / 2f - 1;
+			icon.y = y + (height - icon.height()) / 2f;
 			PixelScene.align(icon);
 			if (!members.contains(icon))
 				add(icon);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java

@@ -56,7 +56,7 @@ public class AttackIndicator extends Tag {
 			instance = this;
 			lastTarget = null;
 
-			setSize(24, 24);
+			setSize(SIZE, SIZE);
 			visible(false);
 			enable(false);
 		}
@@ -77,8 +77,9 @@ public class AttackIndicator extends Tag {
 		super.layout();
 
 		if (sprite != null) {
-			sprite.x = x + (width - sprite.width()) / 2 + 1;
+			if (!flipped)   sprite.x = x + (SIZE - sprite.width()) / 2f + 1;
-			sprite.y = y + (height - sprite.height()) / 2;
+			else            sprite.x = x + width - (SIZE + sprite.width()) / 2f - 1;
+			sprite.y = y + (height - sprite.height()) / 2f;
 			PixelScene.align(sprite);
 		}
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java

@@ -41,10 +41,12 @@ public class DangerIndicator extends Tag {
 	
 	private int lastNumber = -1;
 
+	public static int HEIGHT = 16;
+	
 	public DangerIndicator() {
 		super( 0xFF4C4C );
 		
-		setSize( 24, 16 );
+		setSize( SIZE, HEIGHT );
 		
 		visible = false;
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/LootIndicator.java

@@ -37,7 +37,7 @@ public class LootIndicator extends Tag {
 	public LootIndicator() {
 		super( 0x1F75CC );
 		
-		setSize( 24, 24 );
+		setSize( SIZE, SIZE );
 		
 		visible = false;
 	}
@@ -67,7 +67,9 @@ public class LootIndicator extends Tag {
 	protected void layout() {
 		super.layout();
 
-		slot.setRect( x + 2, y + 3, width - 3, height - 6 );
+		if (!flipped)   slot.setRect( x + 1, y, SIZE, height );
+		else	        slot.setRect( x + (width() - SIZE) - 1, y, SIZE, height );
+
 	}
 	
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ResumeIndicator.java

@@ -34,7 +34,7 @@ public class ResumeIndicator extends Tag {
 	public ResumeIndicator() {
 		super(0xCDD5C0);
 
-		setSize( 24, 24 );
+		setSize( SIZE, SIZE );
 
 		visible = false;
 
@@ -57,7 +57,8 @@ public class ResumeIndicator extends Tag {
 	protected void layout() {
 		super.layout();
 
-		icon.x = x+1 + (width - icon.width) / 2f;
+		if (!flipped)   icon.x = x + (SIZE - icon.width()) / 2f + 1;
+		else            icon.x = x + width - (SIZE + icon.width()) / 2f - 1;
 		icon.y = y + (height - icon.height) / 2f;
 		PixelScene.align(icon);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Tag.java

@@ -35,6 +35,10 @@ public class Tag extends Button {
 	
 	protected float lightness = 0;
 
+	public static int SIZE = 24;
+
+	protected boolean flipped = false;
+	
 	public Tag( int color ) {
 		super();
 		
@@ -68,7 +72,9 @@ public class Tag extends Button {
 	}
 
 	public void flip(boolean value){
+		flipped = value;
 		bg.flipHorizontal(value);
+		layout();
 	}
 	
 	@Override