Merge remote-tracking branch 'origin/Category_G' into Category_G

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

@@ -0,0 +1,41 @@
+<?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="wrap_content"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+    >
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
+        card_view:cardBackgroundColor="@color/white"
+        card_view:cardCornerRadius="10dp"
+        >
+
+        <LinearLayout
+            android:id="@+id/parent_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:id="@+id/tv_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Checklist"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:gravity="center_vertical"
+                android:padding="10dp"
+                android:textSize="@dimen/text_size_xsmall"
+                android:paddingLeft="@dimen/custom_margin"/>
+
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+</LinearLayout>

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

@@ -17,6 +17,7 @@
         >
 
         <LinearLayout
+            android:id="@+id/parent_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"

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

@@ -48,6 +48,7 @@
                 android:background="@color/grey_background">
 
                 <Button
+                    android:id="@+id/btn_save"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"

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

@@ -38,7 +38,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:weightSum="2"
+                android:weightSum="3"
                 android:background="@color/grey_background"
                 android:padding="5dp">
 
@@ -55,7 +55,7 @@
                     android:id="@+id/spinner_brand"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="2"/>
 
 
 
@@ -65,7 +65,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:weightSum="2"
+                android:weightSum="3"
                 android:background="@color/grey_background"
                 android:padding="5dp">
 
@@ -81,7 +81,7 @@
                     android:id="@+id/spinner_sku"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="2"/>
 
 
 
@@ -91,7 +91,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:weightSum="2"
+                android:weightSum="3"
                 android:background="@color/grey_background"
                 android:padding="5dp">
 
@@ -107,7 +107,8 @@
                     android:id="@+id/et_stock"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="2"
+                    android:inputType="number"/>
 
 
 
@@ -120,6 +121,7 @@
                 android:background="@color/grey_background">
 
                 <Button
+                    android:id="@+id/btn_add"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"