From 74b4aa7589ab4bd6b3035d2a33f906abdbac9531 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Thu, 23 Feb 2017 09:40:37 +0530
Subject: [PATCH] //Add language method in stock facing planogram

---
 .../src/main/java/cpm/com/gskmtorange/LoginActivity.java      | 2 +-
 .../main/java/cpm/com/gskmtorange/SelectLanguageActivity.java | 2 +-
 .../com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java  | 4 ++--
 GSKMTOrange/src/main/res/values-ar/string.xml                 | 3 +++
 GSKMTOrange/src/main/res/values-tr/string.xml                 | 3 +++
 GSKMTOrange/src/main/res/values/strings.xml                   | 3 +++
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
index a6435b6..2e51eab 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
@@ -694,7 +694,7 @@ public class LoginActivity extends AppCompatActivity {
 
         if (language.equalsIgnoreCase("English")) {
             lang = "EN";
-        } else if (language.equalsIgnoreCase("UAE")) {
+        } else if (language.equalsIgnoreCase("ARABIC-KSA")) {
             lang = "AR";
         } else {
             lang = "TR";
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
index e7a92c7..1d7134d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java
@@ -130,7 +130,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
         if(language.equalsIgnoreCase("English")){
             lang = "EN";
         }
-        else if(language.equalsIgnoreCase("UAE")) {
+        else if(language.equalsIgnoreCase("ARABIC-KSA")) {
 
             lang = "AR";
         } else {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
index 81488db..24e3d3d 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
@@ -462,7 +462,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
             lin_camera3.setVisibility(View.GONE);
             lin_camera4.setVisibility(View.GONE);
 
-            camera1.setBackgroundResource(R.mipmap.camera_grey);
+            camera1.setBackgroundResource(R.mipmap.new_no_camera);
 
            lin_camera1.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -1093,7 +1093,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                 //Planogram List for check and delete on backPress
                 prepareDefaultList();
                 if (planogramShelfHeaderDataList.size() > 0) {
-                    camera1.setBackgroundResource(R.mipmap.camera_grey);
+                    camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit);
                 }
 
                 break;
diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml
index 1834fb2..85e259c 100644
--- a/GSKMTOrange/src/main/res/values-ar/string.xml
+++ b/GSKMTOrange/src/main/res/values-ar/string.xml
@@ -213,4 +213,7 @@
     <string name="stock_planogram_already_exists">is already exists</string>
     <string name="stock_planogram_data_select_one_sku">Please select atleast one sku</string>
     <string name="stock_planogram_data_add_shelf">Add sku, shelf can not be empty</string>
+
+    <string name="language">ARABIC-KSA</string>
+    <string name="language_return">AR</string>
 </resources>
diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml
index ca8ce80..fba174e 100644
--- a/GSKMTOrange/src/main/res/values-tr/string.xml
+++ b/GSKMTOrange/src/main/res/values-tr/string.xml
@@ -251,6 +251,9 @@
     <string name="stock_planogram_already_exists">Zaten var</string>
     <string name="stock_planogram_data_select_one_sku">En azindan 1 SKU seçmelisiniz</string>
     <string name="stock_planogram_data_add_shelf">SKU ekleyin, raf boş olamaz</string>
+
+    <string name="language">English</string>
+    <string name="language_return">TR</string>
 </resources>
 
 
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 6d8cc87..b6e77c3 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -286,4 +286,7 @@
     <string name="stock_planogram_data_select_one_sku">Please select atleast one sku</string>
     <string name="stock_planogram_data_add_shelf">Add sku, shelf can not be empty</string>
 
+    <string name="language">English</string>
+    <string name="language_return">EN</string>
+
 </resources>