Msl_Availability_StockFacing_New Merge into Main Project

GSKMTOrange/src/main/res/layout/additionallistlayout.xml

@@ -2,20 +2,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:weightSum="100">
+    android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="96dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:weightSum="100">
-
+        android:paddingRight="10dp">
 
         <LinearLayout
-
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="2dp"
@@ -26,10 +22,8 @@
             android:weightSum="25">
 
             <TextView
-
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-
                 android:layout_weight="10"
                 android:text="@string/brandname"
                 android:textStyle="bold" />
@@ -39,41 +33,34 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="15"
-                android:inputType="text">
-
-            </TextView>
+                android:inputType="text" />
         </LinearLayout>
 
-
         <LinearLayout
-
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="2dp"
-            android:layout_weight="10"
             android:orientation="horizontal"
-            android:weightSum="50">
+            android:weightSum="2">
 
             <TextView
-
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
-
-                android:layout_weight="30"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="10dp"
                 android:text="@string/displayname"
+                android:textAppearance="?android:attr/textAppearanceListItem"
                 android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/display_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
-
-                android:layout_weight="15">
-
-            </TextView>
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="10dp"
+                android:textAppearance="?android:attr/textAppearanceListItem" />
         </LinearLayout>
 
-
         <LinearLayout
             android:id="@+id/third"
             android:layout_width="match_parent"
@@ -88,7 +75,6 @@
                 android:id="@+id/facing"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-
                 android:layout_weight="10"
                 android:text="Quantity"
                 android:textStyle="bold" />
@@ -98,35 +84,23 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="15"
-                android:inputType="number">
-
-            </TextView>
+                android:inputType="number" />
         </LinearLayout>
 
-
-        <!--         </LinearLayout> -->
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="10"
-            android:orientation="vertical"
-            android:weightSum="25">
+            android:orientation="vertical">
 
             <Button
                 android:id="@+id/delete_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="right"
                 android:layout_marginRight="30dp"
-                android:layout_weight="7"
                 android:background="@color/grey_background"
-                android:text="@string/delete"
-                android:layout_gravity="right"/>
-
+                android:text="@string/delete" />
         </LinearLayout>
 
-
     </LinearLayout>
-
-
 </LinearLayout>

GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml

@@ -15,10 +15,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@drawable/save_icon"
         app:backgroundTint="@color/colorAccent"
-        />
-
-
+        app:srcCompat="@drawable/save_icon" />
 
 </android.support.design.widget.CoordinatorLayout>

GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml

@@ -100,6 +100,7 @@
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:inputType="number"
+                            android:maxLength="5"
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:textColor="#222"
                             android:textColorHint="#666" />
@@ -118,6 +119,7 @@
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:inputType="number"
+                            android:maxLength="5"
                             android:textAppearance="?android:attr/textAppearanceSmall"
                             android:textColor="#222"
                             android:textColorHint="#666"