From d2ab52b0db640cbb7f1aa46bf249993946a55214 Mon Sep 17 00:00:00 2001
From: FurWaz <fur.waz06@gmail.com>
Date: Fri, 11 Nov 2022 21:41:55 +0100
Subject: [PATCH] Fixed toString crashes and added text ellipsis
---
.../src/main/java/Structures/BuildingInfo.java | 5 ++++-
.../app/src/main/java/Structures/PathInfo.java | 7 +++++++
.../app/src/main/java/Structures/PhotoInfo.java | 7 +++++++
.../app/src/main/java/Structures/RoomInfo.java | 4 +++-
.../app/src/main/java/Structures/ZoneInfo.java | 7 +++++++
.../src/main/res/layout/activity_building.xml | 7 +++++--
.../app/src/main/res/layout/activity_main.xml | 3 +++
.../app/src/main/res/layout/activity_room.xml | 17 +++++++++++------
.../app/src/main/res/layout/building_tile.xml | 11 +++++++----
.../app/src/main/res/layout/pathway_tile.xml | 11 +++++++----
Sources/app/src/main/res/layout/room_tile.xml | 9 ++++++---
Sources/app/src/main/res/layout/zone_tile.xml | 9 ++++++---
12 files changed, 73 insertions(+), 24 deletions(-)
diff --git a/Sources/app/src/main/java/Structures/BuildingInfo.java b/Sources/app/src/main/java/Structures/BuildingInfo.java
index c5716d4..cff2e23 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 2441879..6eb9b0c 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 8ffb536..76cb2c4 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 0987b81..cf85fc2 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 5705661..317096c 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 608e698..05d3265 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 79cf8e1..5070497 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 84289c1..e8eb781 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 a2f3f68..7d7bb4f 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 5defbbf..09230c6 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 655aea2..3326757 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 a56a07d..ee2e153 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"
--
GitLab