diff --git a/Sources/app/src/main/java/Structures/BuildingInfo.java b/Sources/app/src/main/java/Structures/BuildingInfo.java
index c5716d40b8a9fcaf92b9ba9757862ee77d4df704..cff2e232858c06a24311a0b16ea6f1689078e4a5 100644
--- a/Sources/app/src/main/java/Structures/BuildingInfo.java
+++ b/Sources/app/src/main/java/Structures/BuildingInfo.java
@@ -88,6 +88,9 @@ public class BuildingInfo implements Serializable {
@Override
public String toString() {
- return this.name;
+ return "BuildingInfo{" +
+ "name='" + name + '\'' +
+ ", date=" + date +
+ '}';
}
}
diff --git a/Sources/app/src/main/java/Structures/PathInfo.java b/Sources/app/src/main/java/Structures/PathInfo.java
index 2441879111ab01cf06f3133e6efa0dfc3a0eef75..6eb9b0cd95e57ac809105994a4109913537d77f5 100644
--- a/Sources/app/src/main/java/Structures/PathInfo.java
+++ b/Sources/app/src/main/java/Structures/PathInfo.java
@@ -45,4 +45,11 @@ public class PathInfo implements Serializable {
public void setDestination(RoomInfo destination) {
this.destination = destination;
}
+
+ @Override
+ public String toString() {
+ return "PathInfo{" +
+ "name='" + name + '\'' +
+ '}';
+ }
}
diff --git a/Sources/app/src/main/java/Structures/PhotoInfo.java b/Sources/app/src/main/java/Structures/PhotoInfo.java
index 8ffb536dded3d10f71706a210efb518a10f655f0..76cb2c4bc3b3a1bb2f65d8b175267ebb3bcd7c70 100644
--- a/Sources/app/src/main/java/Structures/PhotoInfo.java
+++ b/Sources/app/src/main/java/Structures/PhotoInfo.java
@@ -62,4 +62,11 @@ public class PhotoInfo implements Serializable {
public void removePathView(PathView pathView) {
this.pathViews.remove(pathView);
}
+
+ @Override
+ public String toString() {
+ return "PhotoInfo{" +
+ "orientation=" + orientation +
+ '}';
+ }
}
diff --git a/Sources/app/src/main/java/Structures/RoomInfo.java b/Sources/app/src/main/java/Structures/RoomInfo.java
index 0987b8160d3e45dd8c3162d3e2fcfb14e8130e56..cf85fc2b985eec76655610be2861ffeb92f357e5 100644
--- a/Sources/app/src/main/java/Structures/RoomInfo.java
+++ b/Sources/app/src/main/java/Structures/RoomInfo.java
@@ -113,6 +113,8 @@ public class RoomInfo implements Serializable {
@Override
public String toString() {
- return this.name;
+ return "RoomInfo{" +
+ "name='" + name + '\'' +
+ '}';
}
}
diff --git a/Sources/app/src/main/java/Structures/ZoneInfo.java b/Sources/app/src/main/java/Structures/ZoneInfo.java
index 57056610c5c68b4cb0c051f2fe2dd60fac59e45e..317096cc40e96ef176646e5d68a8ee2508d5acc1 100644
--- a/Sources/app/src/main/java/Structures/ZoneInfo.java
+++ b/Sources/app/src/main/java/Structures/ZoneInfo.java
@@ -105,4 +105,11 @@ public class ZoneInfo implements Serializable {
public void removeWalk(WalkInfo walk) {
this.walks.remove(walk);
}
+
+ @Override
+ public String toString() {
+ return "ZoneInfo{" +
+ "name='" + name + '\'' +
+ '}';
+ }
}
diff --git a/Sources/app/src/main/res/layout/activity_building.xml b/Sources/app/src/main/res/layout/activity_building.xml
index 608e6980934a3ba15dbbb28c27f9728343933dfa..05d32650c7eb901abece1294c5053cc4563c3dc9 100644
--- a/Sources/app/src/main/res/layout/activity_building.xml
+++ b/Sources/app/src/main/res/layout/activity_building.xml
@@ -18,8 +18,11 @@
android:gravity="center"
android:paddingBottom="20dp"
android:paddingTop="20dp"
- android:textSize="40dp"
- android:text="Building name"
+ android:textSize="40sp"
+ android:text=""
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:scrollHorizontally="true"
android:textStyle="bold"
android:textColor="@color/blue_500"/>
<LinearLayout
diff --git a/Sources/app/src/main/res/layout/activity_main.xml b/Sources/app/src/main/res/layout/activity_main.xml
index 79cf8e12336bbf17f1de371a29cb6e102b4d5214..5070497e49481ed7032750cb26c16ea3cd81f7e9 100644
--- a/Sources/app/src/main/res/layout/activity_main.xml
+++ b/Sources/app/src/main/res/layout/activity_main.xml
@@ -18,6 +18,9 @@
android:paddingTop="20dp"
android:textSize="40dp"
android:text="@string/app_name"
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:scrollHorizontally="true"
android:textStyle="bold"
android:textColor="@color/blue_500"/>
<LinearLayout
diff --git a/Sources/app/src/main/res/layout/activity_room.xml b/Sources/app/src/main/res/layout/activity_room.xml
index 84289c1a503f463725fa2e661fd94ef85edac70b..e8eb78156c5fc8da258b8cd15680cdc3bb820f29 100644
--- a/Sources/app/src/main/res/layout/activity_room.xml
+++ b/Sources/app/src/main/res/layout/activity_room.xml
@@ -18,8 +18,11 @@
android:gravity="center"
android:paddingBottom="20dp"
android:paddingTop="20dp"
- android:textSize="40dp"
- android:text="Room name"
+ android:textSize="40sp"
+ android:text=""
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:scrollHorizontally="true"
android:textStyle="bold"
android:textColor="@color/blue_500"/>
<LinearLayout
@@ -49,9 +52,10 @@
android:textColor="@color/slate_400"
android:textStyle="bold"
android:textAlignment="center"
- android:textSize="20dp"
+ android:textSize="20sp"
android:padding="12dp"
- android:clickable="true"/>
+ android:clickable="true"
+ android:focusable="true" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
@@ -69,8 +73,9 @@
android:padding="10dp"
android:textStyle="bold"
android:textAlignment="center"
- android:textSize="20dp"
- android:clickable="true"/>
+ android:textSize="20sp"
+ android:clickable="true"
+ android:focusable="true" />
</LinearLayout>
</LinearLayout>
diff --git a/Sources/app/src/main/res/layout/building_tile.xml b/Sources/app/src/main/res/layout/building_tile.xml
index a2f3f68b00cda292aa41d2b4d5ed56c096275747..7d7bb4fd77b76ae1749c15acee99a8c5cd14faf6 100644
--- a/Sources/app/src/main/res/layout/building_tile.xml
+++ b/Sources/app/src/main/res/layout/building_tile.xml
@@ -21,7 +21,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:text="Building name"
+ android:text=""
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:scrollHorizontally="true"
android:textSize="20sp"
android:textColor="@color/blue_500" />
<LinearLayout
@@ -29,13 +32,13 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center"
- android:gravity="right">
+ android:gravity="end">
<TextView
android:id="@+id/building_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="normal"
- android:text="XX / XX / XXXX"
+ android:text=""
android:textSize="16sp"
android:textColor="@color/slate_500" />
</LinearLayout>
@@ -49,7 +52,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="normal"
- android:text="XX"
+ android:text=""
android:layout_marginEnd="4dp"
android:textSize="16sp"
android:textColor="@color/slate_500" />
diff --git a/Sources/app/src/main/res/layout/pathway_tile.xml b/Sources/app/src/main/res/layout/pathway_tile.xml
index 5defbbf179a5403499e6a29839c8282a30a40307..09230c6823252b0413817933e7ab61c35f3cffb8 100644
--- a/Sources/app/src/main/res/layout/pathway_tile.xml
+++ b/Sources/app/src/main/res/layout/pathway_tile.xml
@@ -21,20 +21,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:text="Room name"
+ android:text=""
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:scrollHorizontally="true"
android:textSize="20sp"
android:textColor="@color/blue_500" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:gravity="right">
+ android:gravity="end">
<TextView
android:id="@+id/pathway_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="normal"
- android:text="X"
+ android:text=""
android:textSize="18sp"
android:textColor="@color/slate_500" />
</LinearLayout>
@@ -79,7 +82,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:gravity="right">
+ android:gravity="end">
<Button
android:id="@+id/tile_edit"
android:layout_width="wrap_content"
diff --git a/Sources/app/src/main/res/layout/room_tile.xml b/Sources/app/src/main/res/layout/room_tile.xml
index 655aea2a95d3dd69ce0f0222dee37a7cb815db20..3326757416608cdb3171408bf6edcabbac71a29d 100644
--- a/Sources/app/src/main/res/layout/room_tile.xml
+++ b/Sources/app/src/main/res/layout/room_tile.xml
@@ -21,7 +21,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:text="Room name"
+ android:text=""
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:scrollHorizontally="true"
android:textSize="20sp"
android:textColor="@color/blue_500" />
</LinearLayout>
@@ -34,7 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="normal"
- android:text="XX"
+ android:text="X"
android:layout_marginEnd="4dp"
android:textSize="16sp"
android:textColor="@color/slate_500" />
@@ -65,7 +68,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:gravity="right">
+ android:gravity="end">
<Button
android:id="@+id/tile_edit"
android:layout_width="wrap_content"
diff --git a/Sources/app/src/main/res/layout/zone_tile.xml b/Sources/app/src/main/res/layout/zone_tile.xml
index a56a07d5c7bd5753f2b079c493754e07502a3005..ee2e1530cce0473c006dd203d480bcef50d8877f 100644
--- a/Sources/app/src/main/res/layout/zone_tile.xml
+++ b/Sources/app/src/main/res/layout/zone_tile.xml
@@ -21,7 +21,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
- android:text="Zone name"
+ android:text=""
+ android:maxLines="1"
+ android:ellipsize="end"
+ android:scrollHorizontally="true"
android:textSize="20sp"
android:textColor="@color/blue_500" />
</LinearLayout>
@@ -34,7 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="normal"
- android:text="XX"
+ android:text="X"
android:layout_marginEnd="4dp"
android:textSize="16sp"
android:textColor="@color/slate_500" />
@@ -65,7 +68,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:gravity="right">
+ android:gravity="end">
<Button
android:id="@+id/tile_edit"
android:layout_width="wrap_content"