Skip to content
Snippets Groups Projects
Commit d2ab52b0 authored by FurWaz's avatar FurWaz
Browse files

Fixed toString crashes and added text ellipsis

parent 0693d880
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 73 additions and 24 deletions
Sources/app/src/main/java/Structures/BuildingInfo.java
+ 4
− 1
View file @ d2ab52b0
......@@ -88,6 +88,9 @@ public class BuildingInfo implements Serializable {
@Override
public String toString() {
return this.name;
return "BuildingInfo{" +
"name='" + name + '\'' +
", date=" + date +
'}';
}
}
Sources/app/src/main/java/Structures/PathInfo.java
+ 7
− 0
View file @ d2ab52b0
......@@ -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 + '\'' +
'}';
}
}
Sources/app/src/main/java/Structures/PhotoInfo.java
+ 7
− 0
View file @ d2ab52b0
......@@ -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 +
'}';
}
}
Sources/app/src/main/java/Structures/RoomInfo.java
+ 3
− 1
View file @ d2ab52b0
......@@ -113,6 +113,8 @@ public class RoomInfo implements Serializable {
@Override
public String toString() {
return this.name;
return "RoomInfo{" +
"name='" + name + '\'' +
'}';
}
}
Sources/app/src/main/java/Structures/ZoneInfo.java
+ 7
− 0
View file @ d2ab52b0
......@@ -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 + '\'' +
'}';
}
}
Sources/app/src/main/res/layout/activity_building.xml
+ 5
− 2
View file @ d2ab52b0
......@@ -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
......
Sources/app/src/main/res/layout/activity_main.xml
+ 3
− 0
View file @ d2ab52b0
......@@ -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
......
Sources/app/src/main/res/layout/activity_room.xml
+ 11
− 6
View file @ d2ab52b0
......@@ -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>
......
Sources/app/src/main/res/layout/building_tile.xml
+ 7
− 4
View file @ d2ab52b0
......@@ -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" />
......
Sources/app/src/main/res/layout/pathway_tile.xml
+ 7
− 4
View file @ d2ab52b0
......@@ -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"
......
Sources/app/src/main/res/layout/room_tile.xml
+ 6
− 3
View file @ d2ab52b0
......@@ -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"
......
Sources/app/src/main/res/layout/zone_tile.xml
+ 6
− 3
View file @ d2ab52b0
......@@ -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"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment