Merge pull request #13 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G

Category g

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

@@ -29,6 +29,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         android:backgroundTint="@color/colorPrimary"
-        app:srcCompat="@drawable/save_icon" />
+        app:srcCompat="@drawable/right_arrow" />
 
 </android.support.design.widget.CoordinatorLayout>

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

@@ -29,6 +29,7 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         android:backgroundTint="@color/colorPrimary"
+        android:visibility="gone"
         app:srcCompat="@drawable/save_icon" />
 
 </android.support.design.widget.CoordinatorLayout>

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

@@ -19,7 +19,6 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:fitsSystemWindows="true"
-
         app:menu="@menu/activity_main_drawer" />
 
 </android.support.v4.widget.DrawerLayout>

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

@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
+    android:id="@+id/coordinate"
     tools:context="cpm.com.gskmtorange.MainActivity">
 
     <android.support.design.widget.AppBarLayout

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

@@ -21,7 +21,7 @@
             android:paddingBottom="10dp"
             android:paddingLeft="20dp"
             android:paddingTop="10dp"
-            android:text="Category Performance"
+            android:text="Daily Data Menu"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@android:color/black" />
 

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

@@ -46,7 +46,7 @@
                     android:gravity="center"
                     android:paddingBottom="5dp"
                     android:paddingTop="5dp"
-                    android:text="SKU"
+                    android:text="@string/msl_availability_sku"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="#222" />
             </LinearLayout>
@@ -63,7 +63,7 @@
                     android:gravity="center"
                     android:paddingBottom="5dp"
                     android:paddingTop="5dp"
-                    android:text="MBQ"
+                    android:text="@string/msl_availability_mbq"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="#222" />
             </LinearLayout>
@@ -80,7 +80,7 @@
                     android:gravity="center"
                     android:paddingBottom="5dp"
                     android:paddingTop="5dp"
-                    android:text="Available"
+                    android:text="@string/msl_availability_availability"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="#222" />
             </LinearLayout>

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

@@ -61,23 +61,11 @@
                     android:layout_weight="1.25"
                     android:orientation="vertical">
 
-                    <!--<TextView
+                    <TextView
+                        android:id="@+id/txt_mbq"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:gravity="center"
-                        android:paddingBottom="5dp"
-                        android:paddingTop="5dp"
-                        android:text="MBQ"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="#222" />-->
-
-                    <EditText
-                        android:id="@+id/ed_mbq"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:inputType="number"
-                        android:maxLength="7"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="#222"
                         android:textColorHint="#666" />