Merge branch 'master' into ysy_temp_f

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

@@ -92,7 +92,7 @@
             android:layout_above="@+id/reasontxt"
 
             android:paddingLeft="10dp"
-            android:text="Remark"
+            android:text="@string/Remark"
             android:textColor="@color/colorPrimary"
             android:textSize="18sp"
             android:textStyle="bold" />
@@ -120,7 +120,7 @@
             android:layout_height="40sp"
             android:layout_centerInParent="true"
             android:background="@color/colorPrimary"
-            android:text="SAVE"
+            android:text="@string/save"
             android:textColor="#ffffff"
             android:textSize="17sp" />
     </RelativeLayout>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="cpm.com.gskmtorange.dailyentry.NonWorkingReason">
+
+    <!--<android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>-->
+
+    <include layout="@layout/nonworking" />
+
+
+
+</android.support.design.widget.CoordinatorLayout>

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -163,9 +163,19 @@
     <string name="uploadeddata">Veriler Paylaşılıyor ,</string>
     <string name="DataNot">Veriler Paylaşılmadı ,</string>
     <string name="delete">Sil</string>
-    <string name="adddatatoclick">Click Yes To Add Data</string>
+    <string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string>
     <string name="displayname">Teşhir Türü</string>
 
+    <string name="storefront">Click Store Front Image</string>
+    <string name="brandname">Brand Name</string>
+    <string name="skuname">SKU Name</string>
+    <string name="quantity">Teşhir Sayısı</string>
+    <string name="title_activity_store_geotag">Coğrafi Konum</string>
+    <string name="title_activity_store_list">Store List</string>
+    <string name="Remark">Remark</string>
+    <string name="pleaseenterRemarks">Please fill Remark</string>
+
+
     <!--Gagan start new code 2-->
     <string name="stock_facing_planogram_dialog_title">Örnek Fotoğraf</string>
     <string name="title_activity_settings">Ayarlar</string>

GSKMTOrange/src/main/res/values/strings.xml

@@ -50,7 +50,7 @@
     <string name="select_language">Please select language</string>
     <string name="title_activity_select_language">Select Language</string>
 
-    <string name="title_activity_store_list_geotag">Store List</string>
+    <string name="title_activity_store_list">Store List</string>
 
     <string name="title_activity_store_geotag">Geo Tag</string>
 
@@ -216,6 +216,8 @@
     <string name="DataNot"> Data Not Uploaded ,</string>
     <string name="displayname">Display Name</string>
     <string name="adddatatoclick">Click Yes To Add Data</string>
+    <string name="Remark">Remark</string>
+    <string name="pleaseenterRemarks">Please fill Remark</string>
 
     <string name="title_activity_service">Service</string>