From afa82973d62ee85c1d2201bfe1de290ec71ac40e Mon Sep 17 00:00:00 2001
From: protolambda <protolambdamail@gmail.com>
Date: Tue, 13 Dec 2016 21:37:56 +0100
Subject: [PATCH] NBT editor has better error UI for invalid input now +
 improve input layouts for performance

---
 .../blocktopograph/nbt/EditorFragment.java    | 23 +++++++-------
 .../main/res/layout/tag_boolean_layout.xml    | 26 ++++++----------
 app/src/main/res/layout/tag_byte_layout.xml   | 30 +++++++------------
 .../main/res/layout/tag_compound_layout.xml   | 21 +++++--------
 .../main/res/layout/tag_default_layout.xml    | 21 +++++--------
 app/src/main/res/layout/tag_double_layout.xml | 30 +++++++------------
 app/src/main/res/layout/tag_float_layout.xml  | 30 +++++++------------
 app/src/main/res/layout/tag_int_layout.xml    | 30 +++++++------------
 app/src/main/res/layout/tag_list_layout.xml   | 21 +++++--------
 app/src/main/res/layout/tag_long_layout.xml   | 30 +++++++------------
 app/src/main/res/layout/tag_root_layout.xml   | 22 ++++++--------
 app/src/main/res/layout/tag_short_layout.xml  | 30 +++++++------------
 app/src/main/res/layout/tag_string_layout.xml |  5 ++--
 13 files changed, 121 insertions(+), 198 deletions(-)

diff --git a/app/src/main/java/com/protolambda/blocktopograph/nbt/EditorFragment.java b/app/src/main/java/com/protolambda/blocktopograph/nbt/EditorFragment.java
index 3fbe52d0..371a0bca 100644
--- a/app/src/main/java/com/protolambda/blocktopograph/nbt/EditorFragment.java
+++ b/app/src/main/java/com/protolambda/blocktopograph/nbt/EditorFragment.java
@@ -227,11 +227,13 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { }
                         public void afterTextChanged(Editable s) {
                             String sValue = s.toString();
                             try {
-                                byteTag.setValue(Byte.valueOf(sValue));
+                                int value = Integer.parseInt(sValue);
+                                if(value < 0 || value > 0xff)
+                                    throw new NumberFormatException("No unsigned byte.");
+                                byteTag.setValue((byte) value);
                                 nbt.setModified();
                             } catch (NumberFormatException e){
-                                Snackbar.make(editText, String.format(context.getString(R.string.x_is_invalid), sValue), Snackbar.LENGTH_LONG)
-                                        .setAction("Action", null).show();
+                                editText.setError(String.format(context.getString(R.string.x_is_invalid), sValue));
                             }
                         }
                     });
@@ -255,8 +257,7 @@ public void afterTextChanged(Editable s) {
                                 shortTag.setValue(Short.valueOf(sValue));
                                 nbt.setModified();
                             } catch (NumberFormatException e){
-                                Snackbar.make(editText, String.format(context.getString(R.string.x_is_invalid), sValue), Snackbar.LENGTH_LONG)
-                                        .setAction("Action", null).show();
+                                editText.setError(String.format(context.getString(R.string.x_is_invalid), sValue));
                             }
                         }
                     });
@@ -280,8 +281,7 @@ public void afterTextChanged(Editable s) {
                                 intTag.setValue(Integer.valueOf(sValue));
                                 nbt.setModified();
                             } catch (NumberFormatException e){
-                                Snackbar.make(editText, String.format(context.getString(R.string.x_is_invalid), sValue), Snackbar.LENGTH_LONG)
-                                        .setAction("Action", null).show();
+                                editText.setError(String.format(context.getString(R.string.x_is_invalid), sValue));
                             }
                         }
                     });
@@ -305,8 +305,7 @@ public void afterTextChanged(Editable s) {
                                 longTag.setValue(Long.valueOf(sValue));
                                 nbt.setModified();
                             } catch (NumberFormatException e){
-                                Snackbar.make(editText,  String.format(context.getString(R.string.x_is_invalid), sValue), Snackbar.LENGTH_LONG)
-                                        .setAction("Action", null).show();
+                                editText.setError(String.format(context.getString(R.string.x_is_invalid), sValue));
                             }
                         }
                     });
@@ -330,8 +329,7 @@ public void afterTextChanged(Editable s) {
                                 floatTag.setValue(Float.valueOf(sValue));
                                 nbt.setModified();
                             } catch (NumberFormatException e){
-                                Snackbar.make(editText, String.format(context.getString(R.string.x_is_invalid), sValue), Snackbar.LENGTH_LONG)
-                                        .setAction("Action", null).show();
+                                editText.setError(String.format(context.getString(R.string.x_is_invalid), sValue));
                             }
                         }
                     });
@@ -355,8 +353,7 @@ public void afterTextChanged(Editable s) {
                                 doubleTag.setValue(Double.valueOf(sValue));
                                 nbt.setModified();
                             } catch (NumberFormatException e){
-                                Snackbar.make(editText, String.format(context.getString(R.string.x_is_invalid), sValue), Snackbar.LENGTH_LONG)
-                                        .setAction("Action", null).show();
+                                editText.setError(String.format(context.getString(R.string.x_is_invalid), sValue));
                             }
                         }
                     });
diff --git a/app/src/main/res/layout/tag_boolean_layout.xml b/app/src/main/res/layout/tag_boolean_layout.xml
index e60ad74c..802efe54 100644
--- a/app/src/main/res/layout/tag_boolean_layout.xml
+++ b/app/src/main/res/layout/tag_boolean_layout.xml
@@ -1,39 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_byte"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp" />
 
     <CheckBox
-        android:layout_centerVertical="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/tag_name"
         android:id="@+id/checkBox"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/tag_name" />
+        android:layout_marginLeft="10dp" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_byte_layout.xml b/app/src/main/res/layout/tag_byte_layout.xml
index 814739ac..9e5e7eb0 100644
--- a/app/src/main/res/layout/tag_byte_layout.xml
+++ b/app/src/main/res/layout/tag_byte_layout.xml
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_byte"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp" />
 
     <EditText
-        android:layout_centerVertical="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="64dp"
+        android:layout_height="40dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/tag_name"
         android:inputType="number"
         android:ems="3"
         android:id="@+id/byteField"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/tag_name" />
+        android:layout_marginLeft="10dp" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_compound_layout.xml b/app/src/main/res/layout/tag_compound_layout.xml
index a8903a84..ace5d964 100644
--- a/app/src/main/res/layout/tag_compound_layout.xml
+++ b/app/src/main/res/layout/tag_compound_layout.xml
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_compound"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp"/>
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_default_layout.xml b/app/src/main/res/layout/tag_default_layout.xml
index 8e18c5dc..7446a222 100644
--- a/app/src/main/res/layout/tag_default_layout.xml
+++ b/app/src/main/res/layout/tag_default_layout.xml
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_default"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon"/>
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_double_layout.xml b/app/src/main/res/layout/tag_double_layout.xml
index f9fb6b0a..fc71012d 100644
--- a/app/src/main/res/layout/tag_double_layout.xml
+++ b/app/src/main/res/layout/tag_double_layout.xml
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_double"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp" />
 
     <EditText
-        android:layout_centerVertical="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="188dp"
+        android:layout_height="40dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/tag_name"
         android:inputType="numberSigned|numberDecimal"
         android:ems="10"
         android:id="@+id/doubleField"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/tag_name" />
+        android:layout_marginLeft="10dp" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_float_layout.xml b/app/src/main/res/layout/tag_float_layout.xml
index 0cd11c44..b901456a 100644
--- a/app/src/main/res/layout/tag_float_layout.xml
+++ b/app/src/main/res/layout/tag_float_layout.xml
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_float"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp" />
 
     <EditText
-        android:layout_centerVertical="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="188dp"
+        android:layout_height="40dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/tag_name"
         android:inputType="numberSigned|numberDecimal"
         android:ems="10"
         android:id="@+id/floatField"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/tag_name" />
+        android:layout_marginLeft="10dp" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_int_layout.xml b/app/src/main/res/layout/tag_int_layout.xml
index 08da557f..b75a11e2 100644
--- a/app/src/main/res/layout/tag_int_layout.xml
+++ b/app/src/main/res/layout/tag_int_layout.xml
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_int"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp" />
 
     <EditText
-        android:layout_centerVertical="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="188dp"
+        android:layout_height="40dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/tag_name"
         android:inputType="numberSigned"
         android:ems="10"
         android:id="@+id/intField"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/tag_name" />
+        android:layout_marginLeft="10dp" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_list_layout.xml b/app/src/main/res/layout/tag_list_layout.xml
index 22392c9f..8fb5ad6b 100644
--- a/app/src/main/res/layout/tag_list_layout.xml
+++ b/app/src/main/res/layout/tag_list_layout.xml
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_list"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp"/>
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_long_layout.xml b/app/src/main/res/layout/tag_long_layout.xml
index de4c9845..419a39d8 100644
--- a/app/src/main/res/layout/tag_long_layout.xml
+++ b/app/src/main/res/layout/tag_long_layout.xml
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_long"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp"/>
 
     <EditText
-        android:layout_centerVertical="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="320dp"
+        android:layout_height="40dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/tag_name"
         android:inputType="numberSigned"
         android:ems="20"
         android:id="@+id/longField"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/tag_name" />
+        android:layout_marginLeft="10dp" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_root_layout.xml b/app/src/main/res/layout/tag_root_layout.xml
index e820fb9e..15b5f25e 100644
--- a/app/src/main/res/layout/tag_root_layout.xml
+++ b/app/src/main/res/layout/tag_root_layout.xml
@@ -1,30 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_root"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:textStyle="bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="Root"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp" />
 
-</RelativeLayout>
\ No newline at end of file
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tag_short_layout.xml b/app/src/main/res/layout/tag_short_layout.xml
index 0c9a8b8f..872cb4c8 100644
--- a/app/src/main/res/layout/tag_short_layout.xml
+++ b/app/src/main/res/layout/tag_short_layout.xml
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@mipmap/ic_tag_short"
-        android:id="@+id/icon"
-        android:layout_alignParentLeft="true" />
+        android:id="@+id/icon" />
 
     <TextView
-        android:layout_centerVertical="true"
         android:textSize="19sp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/icon"
         android:id="@+id/tag_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="Tag name here"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/icon" />
+        android:layout_marginLeft="10dp"/>
 
     <EditText
-        android:layout_centerVertical="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="160dp"
+        android:layout_height="40dp"
         android:layout_marginStart="10dp"
-        android:layout_toEndOf="@+id/tag_name"
         android:inputType="numberSigned"
         android:ems="6"
         android:id="@+id/shortField"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@+id/tag_name" />
+        android:layout_marginLeft="10dp" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/tag_string_layout.xml b/app/src/main/res/layout/tag_string_layout.xml
index c9621798..fbf4b3f5 100644
--- a/app/src/main/res/layout/tag_string_layout.xml
+++ b/app/src/main/res/layout/tag_string_layout.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:orientation="horizontal"
+    android:gravity="center_vertical"
     xmlns:tools="http://schemas.android.com/tools">
 
     <ImageView