From 8688d94554fb2acde7f3f49ee17ffe66ad97a6e8 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Thu, 23 Feb 2017 18:00:21 +0530
Subject: [PATCH 1/4] //language change

---
 .../gsk_dailyentry/Stock_FacingActivity.java      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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 11e3e4f..1b38496 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
@@ -198,6 +198,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
 
             str = CommonString.FILE_PATH + _pathforcheck;
 
+            prepareDefaultList();
+
             //Camera
             cameraMethod();
 
@@ -215,7 +217,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                         db.InsertStore_wise_camera(cameraData);
                     }*/
 
-                    if (validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) {
+                    if (validateData(hashMapListHeaderData, hashMapListChildData)) {
                         AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
                         builder.setMessage(getResources().getString(R.string.check_save_message))
                                 .setCancelable(false)
@@ -540,8 +542,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
     }
 
     boolean validateData(List<Stock_FacingGetterSetter> listDataHeader,
-                         HashMap<Stock_FacingGetterSetter, List<Stock_FacingGetterSetter>> listDataChild,
-                         Store_wise_camera_DataGetterSetter cameraData) {
+                         HashMap<Stock_FacingGetterSetter, List<Stock_FacingGetterSetter>> listDataChild) {
         boolean flag = true;
         checkHeaderArray.clear();
 
@@ -1114,7 +1115,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                 prepareDefaultList();
                 if (db.isPlanogramAddShelfSaveData(store_id, categoryId)) {
                     camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit);
-                }else {
+                } else {
                     camera1.setBackgroundResource(R.mipmap.new_no_camera);
                 }
 
@@ -1149,7 +1150,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
             builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
                     .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
-                            if (!validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) {
+
+                            if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
                                 if (!camera_allow.equals("1")) {
                                     db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
                                             planogramShelfHeaderDataList, planogramHashMapListChildData);
@@ -1261,7 +1263,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
         builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
                 .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-                        if (!validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) {
+
+                        if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
                             if (!camera_allow.equals("1")) {
                                 db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
                                         planogramShelfHeaderDataList, planogramHashMapListChildData);

From 74f4a6fbd9b61d1ed919258519678b95898135b0 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Fri, 24 Feb 2017 12:24:26 +0530
Subject: [PATCH 2/4] camera handle for arabic language

---
 .../dailyentry/AdditionalVisibility.java      | 43 +++++-----
 .../dailyentry/CategoryPicture.java           | 28 +++++--
 .../dailyentry/NonWorkingReason.java          | 41 +++++-----
 .../dailyentry/StoreimageActivity.java        | 38 ++++++---
 .../dailyentry/T2PComplianceActivity.java     | 30 +++++--
 .../dailyentry/T2pBrand_Avaibility.java       | 80 ++++++-------------
 .../dialog_stock_facing_planogram_tracker.xml |  7 +-
 ...stock_facing_planogram_tracker_add_sku.xml |  2 -
 8 files changed, 146 insertions(+), 123 deletions(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
index 1541dd2..74ef983 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
@@ -741,18 +741,30 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
     }
 
-    public String getCurrentTime() {
+    private static String arabicToenglish(String number) {
+        char[] chars = new char[number.length()];
+        for (int i = 0; i < number.length(); i++) {
+            char ch = number.charAt(i);
+            if (ch >= 0x0660 && ch <= 0x0669)
+                ch -= 0x0660 - '0';
+            else if (ch >= 0x06f0 && ch <= 0x06F9)
+                ch -= 0x06f0 - '0';
+            chars[i] = ch;
+        }
+        return new String(chars);
+    }
 
+    public String getCurrentTime() {
         Calendar m_cal = Calendar.getInstance();
 
         SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
         String cdate = formatter.format(m_cal.getTime());
 
-       /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
-                + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+        if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
+            cdate = arabicToenglish(cdate);
+        }
 
         return cdate;
-
     }
 
     @Override
@@ -957,15 +969,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
     protected void startCameraActivity() {
         try {
-            /*Log.i("MakeMachine", "startCameraActivity()");
-            File file = new File(_path);
-            Uri outputFileUri = Uri.fromFile(file);
-
-            Intent intent = new Intent(
-                    MediaStore.ACTION_IMAGE_CAPTURE);
-            intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
-
-            startActivityForResult(intent, 0);*/
 
             Log.i("MakeMachine", "startCameraActivity()");
             File file = new File(_path);
@@ -976,23 +979,23 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
             for (int n = 0; n < list.size(); n++) {
                 if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
-                   /* Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
+                    Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
                     Log.e("TAG", "package name  : " + list.get(n).packageName);
-*/
+
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;
@@ -1636,7 +1639,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
 
     private static boolean updateResources(Context context, String language) {
-       
+
 
         String lang;
 
@@ -1651,7 +1654,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
         } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
             lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
-        }else{
+        } else {
             lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
         }
 
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
index 5e7357d..5eae2cc 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
@@ -251,19 +251,30 @@ public class CategoryPicture extends AppCompatActivity {
         });
     }
 
+    private static String arabicToenglish(String number) {
+        char[] chars = new char[number.length()];
+        for (int i = 0; i < number.length(); i++) {
+            char ch = number.charAt(i);
+            if (ch >= 0x0660 && ch <= 0x0669)
+                ch -= 0x0660 - '0';
+            else if (ch >= 0x06f0 && ch <= 0x06F9)
+                ch -= 0x06f0 - '0';
+            chars[i] = ch;
+        }
+        return new String(chars);
+    }
 
     public String getCurrentTime() {
-
         Calendar m_cal = Calendar.getInstance();
 
         SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
         String cdate = formatter.format(m_cal.getTime());
 
-       /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
-                + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+        if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
+            cdate = arabicToenglish(cdate);
+        }
 
         return cdate;
-
     }
 
     private static boolean updateResources(Context context, String language) {
@@ -312,20 +323,23 @@ public class CategoryPicture extends AppCompatActivity {
             List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
             for (int n = 0; n < list.size(); n++) {
                 if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
+                    Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
+                    Log.e("TAG", "package name  : " + list.get(n).packageName);
 
+                    //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
index bcd663a..9244542 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
@@ -228,15 +228,6 @@ public class NonWorkingReason extends AppCompatActivity implements
 
     protected void startCameraActivity() {
         try {
-            /*Log.i("MakeMachine", "startCameraActivity()");
-            File file = new File(_path);
-            Uri outputFileUri = Uri.fromFile(file);
-
-            Intent intent = new Intent(
-                    MediaStore.ACTION_IMAGE_CAPTURE);
-            intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
-
-            startActivityForResult(intent, 0);*/
 
             Log.i("MakeMachine", "startCameraActivity()");
             File file = new File(_path);
@@ -247,23 +238,23 @@ public class NonWorkingReason extends AppCompatActivity implements
             List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
             for (int n = 0; n < list.size(); n++) {
                 if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
-                   /* Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
+                    Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
                     Log.e("TAG", "package name  : " + list.get(n).packageName);
-*/
+
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;
@@ -513,18 +504,30 @@ public class NonWorkingReason extends AppCompatActivity implements
 
     }
 
-    public String getCurrentTime() {
+    private static String arabicToenglish(String number) {
+        char[] chars = new char[number.length()];
+        for (int i = 0; i < number.length(); i++) {
+            char ch = number.charAt(i);
+            if (ch >= 0x0660 && ch <= 0x0669)
+                ch -= 0x0660 - '0';
+            else if (ch >= 0x06f0 && ch <= 0x06F9)
+                ch -= 0x06f0 - '0';
+            chars[i] = ch;
+        }
+        return new String(chars);
+    }
 
+    public String getCurrentTime() {
         Calendar m_cal = Calendar.getInstance();
 
-        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
+        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
         String cdate = formatter.format(m_cal.getTime());
 
-       /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
-                + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+        if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
+            cdate = arabicToenglish(cdate);
+        }
 
         return cdate;
-
     }
 
     @Override
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
index 08c4c2f..d769b59 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
@@ -85,10 +85,10 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
     private FailureGetterSetter failureGetterSetter = null;
     String _pathforcheck, _path, str;
 
-    String store_id, visit_date, username, intime, date,_UserId;
+    String store_id, visit_date, username, intime, date, _UserId;
     private SharedPreferences preferences;
     AlertDialog alert;
-    String img_str,strflag;
+    String img_str, strflag;
     private GSKOrangeDB database;
 
     String lat, lon;
@@ -97,12 +97,13 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
     Toolbar toolbar;
     boolean ResultFlag = true;
     ArrayList<CoverageBean> coverage = new ArrayList<CoverageBean>();
+
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_storeimage);
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+        updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setHomeButtonEnabled(true);
@@ -182,7 +183,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
             case R.id.img_cam_selfie:
 
-                _pathforcheck = store_id +"SI" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+                _pathforcheck = store_id + "SI_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
 
                 _path = CommonString.FILE_PATH + _pathforcheck;
 
@@ -276,18 +277,18 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;
@@ -348,8 +349,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
         String cdate = formatter.format(m_cal.getTime());
 
-       /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
-                + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+        if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
+            cdate = arabicToenglish(cdate);
+        }
 
         return cdate;
     }
@@ -376,7 +378,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
     @Override
     protected void onResume() {
         super.onResume();
-        updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+        updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
         toolbar.setTitle(R.string.title_activity_store_image);
     }
 
@@ -415,7 +417,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
         } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
             lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
-        }else{
+        } else {
             lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
         }
 
@@ -636,6 +638,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         }
 
     }
+
     public void showAlert(String str) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(StoreimageActivity.this);
@@ -654,5 +657,16 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
     }
 
 
-
+    private static String arabicToenglish(String number) {
+        char[] chars = new char[number.length()];
+        for (int i = 0; i < number.length(); i++) {
+            char ch = number.charAt(i);
+            if (ch >= 0x0660 && ch <= 0x0669)
+                ch -= 0x0660 - '0';
+            else if (ch >= 0x06f0 && ch <= 0x06F9)
+                ch -= 0x06f0 - '0';
+            chars[i] = ch;
+        }
+        return new String(chars);
+    }
 }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
index 0253136..af14e11 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -766,12 +766,28 @@ public class T2PComplianceActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    private static String arabicToenglish(String number) {
+        char[] chars = new char[number.length()];
+        for (int i = 0; i < number.length(); i++) {
+            char ch = number.charAt(i);
+            if (ch >= 0x0660 && ch <= 0x0669)
+                ch -= 0x0660 - '0';
+            else if (ch >= 0x06f0 && ch <= 0x06F9)
+                ch -= 0x06f0 - '0';
+            chars[i] = ch;
+        }
+        return new String(chars);
+    }
+
     public String getCurrentTime() {
         Calendar m_cal = Calendar.getInstance();
-        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
+
+        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
         String cdate = formatter.format(m_cal.getTime());
-       /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
-                + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+
+        if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
+            cdate = arabicToenglish(cdate);
+        }
 
         return cdate;
     }
@@ -793,17 +809,19 @@ public class T2PComplianceActivity extends AppCompatActivity {
 
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
+
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
index 01a1b18..5b58000 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
@@ -51,12 +51,11 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
     Spinner spinner_brand;
     Button add;
     ArrayList<BrandAvabilityGetterSetter> brand_list;
-    String categoryName,categoryId,brand_name="",brand_id="";
+    String categoryName, categoryId, brand_name = "", brand_id = "";
     RecyclerView recyclerView;
-    ArrayList<BrandAvabilityGetterSetter> brand_new_list=new ArrayList<BrandAvabilityGetterSetter>();
-
-
+    ArrayList<BrandAvabilityGetterSetter> brand_new_list = new ArrayList<BrandAvabilityGetterSetter>();
     T2pBrand_Avaibility.ValueAdapter adapteravabiblity;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -64,7 +63,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         spinner_brand = (Spinner) findViewById(R.id.spinner);
-         add = (Button) findViewById(R.id.button2);
+        add = (Button) findViewById(R.id.button2);
         recyclerView = (RecyclerView) findViewById(R.id.layout_recycle);
 
 
@@ -87,7 +86,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         categoryName = getIntent().getStringExtra("categoryName");
         categoryId = getIntent().getStringExtra("categoryId");
 /////
-        brand_list = db.getBrandAvailbilitydata(store_id, categoryId,keyAccount_id,class_id,storeType_id);
+        brand_list = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id);
         BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
         String str = getResources().getString(R.string.select);
         brand.setBRAND(str);
@@ -99,29 +98,25 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if(brand_new_list.size()>0)
-                {
-                    BrandAvabilityGetterSetter br=new BrandAvabilityGetterSetter();
+                if (brand_new_list.size() > 0) {
+                    BrandAvabilityGetterSetter br = new BrandAvabilityGetterSetter();
 
                     br.setCategoryId(categoryId);
                     br.setClass_id(class_id);
                     br.setKeyAccount_id(keyAccount_id);
                     br.setStoreType_id(storeType_id);
                     br.setStore_id(store_id);
-                    db.InsertBrandAvabilitydata( br, brand_new_list);
+                    db.InsertBrandAvabilitydata(br, brand_new_list);
 
                     brand_new_list.clear();
-                        finish();
+                    finish();
 
 
-                }
-                else{
+                } else {
                     Snackbar.make(view, "Please add data", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                 }
 
 
-
-
             }
         });
 
@@ -130,29 +125,27 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
             @Override
             public void onClick(View view) {
 
-            if (!brand_name.equalsIgnoreCase("") && brand_name!=null){
+                if (!brand_name.equalsIgnoreCase("") && brand_name != null) {
 
-                BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
+                    BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
 
-                brand.setBRAND(brand_name);
-                brand.setBRAND_ID(brand_id);
+                    brand.setBRAND(brand_name);
+                    brand.setBRAND_ID(brand_id);
 
-                brand_new_list.add(brand);
+                    brand_new_list.add(brand);
 
-                adapteravabiblity = new T2pBrand_Avaibility.ValueAdapter(T2pBrand_Avaibility.this, brand_new_list);
-                recyclerView.setAdapter(adapteravabiblity);
-                recyclerView.setLayoutManager(new LinearLayoutManager(T2pBrand_Avaibility.this));
+                    adapteravabiblity = new T2pBrand_Avaibility.ValueAdapter(T2pBrand_Avaibility.this, brand_new_list);
+                    recyclerView.setAdapter(adapteravabiblity);
+                    recyclerView.setLayoutManager(new LinearLayoutManager(T2pBrand_Avaibility.this));
 
-                spinner_brand.setSelection(0);
-                brand_name="";
-                brand_id="";
+                    spinner_brand.setSelection(0);
+                    brand_name = "";
+                    brand_id = "";
 
-            }
-                else
-            {
-                Snackbar.make(view, "Please select dropdown", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
+                } else {
+                    Snackbar.make(view, "Please select dropdown", Snackbar.LENGTH_LONG)
+                            .setAction("Action", null).show();
+                }
 
             }
         });
@@ -177,10 +170,8 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         });
 
 
-
     }
 
-
     public class CustomAdapter extends ArrayAdapter<String> {
 
         private Activity activity;
@@ -243,23 +234,6 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         }
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     private static boolean updateResources(Context context, String language) {
 
         /*String lang;
@@ -285,7 +259,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
 
         } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
             lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
-        }else{
+        } else {
             lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
         }
 
@@ -302,7 +276,6 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         return true;
     }
 
-
     public class ValueAdapter extends RecyclerView.Adapter<T2pBrand_Avaibility.ValueAdapter.MyViewHolder> {
 
         private LayoutInflater inflator;
@@ -356,5 +329,4 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
 
     }
 
-
 }
diff --git a/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml b/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml
index b99187a..f725d87 100644
--- a/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml
+++ b/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml
@@ -212,7 +212,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:padding="10dp">
+                android:paddingBottom="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="5dp">
 
                 <Button
                     android:id="@+id/dialog_btn_addShelf"
@@ -221,7 +224,6 @@
                     android:layout_alignParentLeft="true"
                     android:layout_marginLeft="10dp"
                     android:background="@color/colorPrimary"
-                    android:padding="5dp"
                     android:text="@string/stock_planogram_add_shelf"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/white" />
@@ -233,7 +235,6 @@
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="10dp"
                     android:background="@color/colorPrimary"
-                    android:padding="5dp"
                     android:text="@string/cancel"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/white" />
diff --git a/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml b/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml
index 76ef39c..4a498cb 100644
--- a/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml
+++ b/GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml
@@ -72,7 +72,6 @@
                         android:layout_alignParentLeft="true"
                         android:layout_marginLeft="10dp"
                         android:background="@color/colorPrimary"
-                        android:padding="5dp"
                         android:text="@string/stock_planogram_add_sku_to_shelf"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/white" />
@@ -84,7 +83,6 @@
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="10dp"
                         android:background="@color/colorPrimary"
-                        android:padding="5dp"
                         android:text="@string/cancel"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/white" />

From 2ea7345c0f1684e556912ee6319752062bbf46e9 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Fri, 24 Feb 2017 14:57:33 +0530
Subject: [PATCH 3/4] camera handle for arabic language

---
 .../com/gskmtorange/Database/GSKOrangeDB.java |  28 ++++++-
 .../CategoryPictureGetterSetter.java          |  13 ++--
 .../dailyentry/CategoryPicture.java           |  72 ++++++++----------
 .../dailyentry/T2PComplianceActivity.java     |   6 +-
 .../download/DownloadActivity.java            |  40 ++++++++++
 ...pingSubCategoryImageAllowGetterSetter.java |  48 ++++++++++++
 .../xmlGetterSetter/TableBean.java            |  10 +++
 .../gskmtorange/xmlHandlers/XMLHandlers.java  |  32 ++++++++
 .../res/drawable/camera_orange_star_green.png | Bin 0 -> 10278 bytes
 .../res/layout/activity_category_picture.xml  |   4 +-
 .../res/layout/content_category_picture.xml   |   2 +-
 .../res/layout/contentcatgoryadpterlayout.xml |  14 ++--
 GSKMTOrange/src/main/res/values-ar/string.xml |  10 +--
 13 files changed, 208 insertions(+), 71 deletions(-)
 create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingSubCategoryImageAllowGetterSetter.java
 create mode 100644 GSKMTOrange/src/main/res/drawable/camera_orange_star_green.png

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index a7a382b..b6d3e15 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -27,6 +27,7 @@ import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -60,7 +61,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE_DB";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB1";
     public static final int DATABASE_VERSION = 13;
     TableBean tableBean;
     private SQLiteDatabase db;
@@ -147,6 +148,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
             db.execSQL(CommonString.CREATE_TABLE_INSERT_CATEGORY_PICTURE);
 
+            db.execSQL(TableBean.getMappingSubCategoryImageAllow());
+
         } catch (SQLException e) {
             e.printStackTrace();
             Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
@@ -4164,10 +4167,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         Cursor dbcursor = null;
         try {
 
-            dbcursor = db.rawQuery("SELECT  DISTINCT SB.SUB_CATEGORY_ID, SB.SUB_CATEGORY FROM MAPPING_STOCK M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
+            dbcursor = db.rawQuery("SELECT  DISTINCT SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM MAPPING_STOCK M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
                     " INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID" +
                     " INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID" +
                     " INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID" +
+                    " INNER JOIN MAPPING_SUB_CATEGORY_IMAGE_ALLOW MIA ON SB.SUB_CATEGORY_ID=MIA.SUB_CATEGORY_ID "+
                     " WHERE M.KEYACCOUNT_ID = '" + key_account_id + " 'AND M.STORETYPE_ID = '" + store_type_id + "' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null);
 
 
@@ -4179,6 +4183,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
                     CPGS.setSUB_CATEGORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
                     CPGS.setSUB_CATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
+                    CPGS.setImage_allow(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_ALLOW")));
 
                     CPGS.setSubCategoryCamera1("");
                     CPGS.setSubCategoryCamera2("");
@@ -4676,8 +4681,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     }
 
 
-
-
     public boolean isPlanogramAddShelfSaveData(String store_id, String category_id) {
         boolean filled = false;
         Cursor dbcursor = null;
@@ -4704,4 +4707,21 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return filled;
     }
 
+    public void InsertMappingSubCategoryImageAllow(MappingSubCategoryImageAllowGetterSetter data) {
+        db.delete("MAPPING_SUB_CATEGORY_IMAGE_ALLOW", null, null);
+
+        ContentValues values = new ContentValues();
+        try {
+            for (int i = 0; i < data.getSUB_CATEGORY_ID().size(); i++) {
+
+                values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i));
+                values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
+                values.put("IMAGE_ALLOW", data.getIMAGE_ALLOW().get(i));
+
+                db.insert("MAPPING_SUB_CATEGORY_IMAGE_ALLOW", null, values);
+            }
+        } catch (Exception ex) {
+            Log.d("Exception ", " in MAPPING_SUB_CATEGORY_IMAGE_ALLOW " + ex.toString());
+        }
+    }
 }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/CategoryPictureGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/CategoryPictureGetterSetter.java
index 82c4c3c..bc91b03 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/CategoryPictureGetterSetter.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/CategoryPictureGetterSetter.java
@@ -11,6 +11,8 @@ public class CategoryPictureGetterSetter {
     String CategoryImage3="";
     String CategoryImage4="";
 
+    String image_allow = "0";
+
     public String getCategoryId() {
         return categoryId;
     }
@@ -161,10 +163,11 @@ public class CategoryPictureGetterSetter {
     }
 
 
+    public String getImage_allow() {
+        return image_allow;
+    }
 
-
-
-
-
-
+    public void setImage_allow(String image_allow) {
+        this.image_allow = image_allow;
+    }
 }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
index 5eae2cc..b73165a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
@@ -91,6 +91,8 @@ public class CategoryPicture extends AppCompatActivity {
         im4 = (ImageView) findViewById(R.id.image4);
         listview = (ListView) findViewById(R.id.listview);
 
+        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+
 
         adddata = db.getCategoryPictureData(store_id, categoryId);
 
@@ -107,43 +109,35 @@ public class CategoryPicture extends AppCompatActivity {
                 String image3 = adddata.get(k).getCategoryImage3();
                 String image4 = adddata.get(k).getCategoryImage4();
 
-                if(image1 !=null)
-                {
+                if (image1 != null) {
                     im1.setBackgroundResource(R.mipmap.camera_green);
 
-                    img_str1=image1;
+                    img_str1 = image1;
 
-                }else
-                {
-                    im1.setBackgroundResource(R.mipmap.camera_orange);
+                } else {
+                    im1.setBackgroundResource(R.drawable.camera_orange_star_green);
                 }
 
 
-                if(image2 !=null)
-                {
+                if (image2 != null) {
                     im2.setBackgroundResource(R.mipmap.camera_green);
 
-                    img_str2=image2;
+                    img_str2 = image2;
 
-                }else
-                {
+                } else {
                     im2.setBackgroundResource(R.mipmap.camera_orange);
                 }
-                if(image3 !=null)
-                {
+                if (image3 != null) {
                     im3.setBackgroundResource(R.mipmap.camera_green);
-                    img_str3=image3;
-                }else
-                {
+                    img_str3 = image3;
+                } else {
                     im3.setBackgroundResource(R.mipmap.camera_orange);
                 }
-                if(image4 !=null)
-                {
+                if (image4 != null) {
                     im4.setBackgroundResource(R.mipmap.camera_green);
 
-                    img_str4=image4;
-                }else
-                {
+                    img_str4 = image4;
+                } else {
                     im4.setBackgroundResource(R.mipmap.camera_orange);
                 }
 
@@ -161,8 +155,6 @@ public class CategoryPicture extends AppCompatActivity {
         adapteradditional = new CategoryPicture.CategoryAdapter(CategoryPicture.this, listdat);
         listview.setAdapter(adapteradditional);
 
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -177,14 +169,12 @@ public class CategoryPicture extends AppCompatActivity {
                 CP.setCamera_allow(camera_allow);
 
 
-
                 if (validateData(CP, listdat)) {
 
                     db.InsertCategoryPictureData(CP, listdat, categoryId);
 
                     finish();
 
-
                 } else {
                     Snackbar.make(view, "Please take image", Snackbar.LENGTH_LONG).setAction("Action", null).show();
 
@@ -279,7 +269,6 @@ public class CategoryPicture extends AppCompatActivity {
 
     private static boolean updateResources(Context context, String language) {
 
-       
 
         String lang;
 
@@ -294,7 +283,7 @@ public class CategoryPicture extends AppCompatActivity {
 
         } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
             lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
-        }else{
+        } else {
             lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
         }
 
@@ -328,18 +317,18 @@ public class CategoryPicture extends AppCompatActivity {
 
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") || packag.equalsIgnoreCase("الاستوديو")) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;
@@ -496,7 +485,6 @@ public class CategoryPicture extends AppCompatActivity {
 
                 holder.brand = (TextView) convertView.findViewById(R.id.textviewname);
 
-
                 holder.camera1 = (Button) convertView.findViewById(R.id.button3);
                 holder.camera2 = (Button) convertView.findViewById(R.id.cameranew);
                 convertView.setTag(holder);
@@ -546,6 +534,8 @@ public class CategoryPicture extends AppCompatActivity {
                 holder.camera1.setBackgroundResource(R.mipmap.camera_green);
 
 
+            } else if (listdat.get(position1).getImage_allow().equals("1")) {
+                holder.camera1.setBackgroundResource(R.drawable.camera_orange_star_green);
             } else {
                 holder.camera1.setBackgroundResource(R.mipmap.camera_orange);
             }
@@ -575,26 +565,28 @@ public class CategoryPicture extends AppCompatActivity {
 
         if (cameraImage1 == null) {
             flag = false;
-
         }
 
 
-        for (int i = 0; i < list.size(); i++) {
+        if (flag) {
+            for (int i = 0; i < list.size(); i++) {
 
-            String imageu = list.get(i).getSubCategoryCamera1();
+                if (list.get(i).getImage_allow().equals("1")) {
 
-            if (imageu.equalsIgnoreCase("")) {
+                    String imageu = list.get(i).getSubCategoryCamera1();
+
+                    if (imageu.equalsIgnoreCase("")) {
+
+                        flag = false;
+                        break;
+                    }
+                }
 
-                flag = false;
             }
-
         }
 
-
         return flag;
     }
 
 
-
-
 }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
index af14e11..baa86ab 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -187,10 +187,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
                 t2PGetterSetters.get(i).setGapsChecklist(gapsList);
                 t2PGetterSetters.get(i).setSkulist(skuList);
                 t2PGetterSetters.get(i).setBrandlist(brandList);
-
-
-
-
             }
 
         }
@@ -937,7 +933,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
                     error_msg = getResources().getString(R.string.click_image);
                     break;
                 }
-                else if (t2PGetterSetters.get(i).getBrandlist().size() == 0) {
+                else if (camera_allow.equals("0") && t2PGetterSetters.get(i).getBrandlist().size() == 0) {
                     flag = false;
                     error_msg = getResources().getString(R.string.title_activity_fill_brand);
                     break;
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
index 3de08cc..3299c7e 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -57,6 +57,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter
 import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
@@ -89,6 +90,7 @@ public class DownloadActivity extends AppCompatActivity {
     MAPPING_SOS_TARGET_MasterGetterSetter mapping_sos_target_masterGetterSetter;
     MAPPING_PLANOGRAM_MasterGetterSetter mapping_planogram_masterGetterSetter;
     ShelfMasterGetterSetter shelfMasterGetterSetter;
+    MappingSubCategoryImageAllowGetterSetter mappingSubCategoryImageAllowGetterSetter;
 
     private Dialog dialog;
     private ProgressBar pb;
@@ -813,6 +815,42 @@ public class DownloadActivity extends AppCompatActivity {
                 publishProgress(data);
 
 
+                //MAPPING_SUB_CATEGORY_IMAGE_ALLOW
+                request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
+                request.addProperty("UserName", userId);
+                request.addProperty("Type", "MAPPING_SUB_CATEGORY_IMAGE_ALLOW");
+                request.addProperty("cultureid", culture_id);
+
+                envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+                envelope.dotNet = true;
+                envelope.setOutputSoapObject(request);
+
+                androidHttpTransport = new HttpTransportSE(CommonString.URL);
+                androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
+
+                result = envelope.getResponse();
+
+                if (result.toString() != null) {
+                    xpp.setInput(new StringReader(result.toString()));
+                    xpp.next();
+                    eventType = xpp.getEventType();
+                    mappingSubCategoryImageAllowGetterSetter = XMLHandlers.mappingSubCategoryImageAllowXMLHandler(xpp, eventType);
+
+                    String table_ShelfMaster = mappingSubCategoryImageAllowGetterSetter.getTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW();
+                    if (table_ShelfMaster != null) {
+                        resultHttp = CommonString.KEY_SUCCESS;
+                        TableBean.setMappingSubCategoryImageAllow(table_ShelfMaster);
+                    }
+
+                    if (mappingSubCategoryImageAllowGetterSetter.getSUB_CATEGORY_ID().size() > 0) {
+                        data.value = 96;
+                        data.name = "MAPPING_SUB_CATEGORY_IMAGE_ALLOW " + getResources().getString(R.string.download_data);
+                    }
+                }
+                publishProgress(data);
+
+
+
                 //Images DownLoads
 
                 //MAPPING_PLANOGRAM Image save into folder
@@ -953,6 +991,8 @@ public class DownloadActivity extends AppCompatActivity {
                 db.InsertMAPPING_SOS_TARGET(mapping_sos_target_masterGetterSetter);
                 db.InsertSHELF_MASTER(shelfMasterGetterSetter);
 
+                db.InsertMappingSubCategoryImageAllow(mappingSubCategoryImageAllowGetterSetter);
+
             } catch (MalformedURLException e) {
 
                 ResultFlag = false;
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingSubCategoryImageAllowGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingSubCategoryImageAllowGetterSetter.java
new file mode 100644
index 0000000..36cdab7
--- /dev/null
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingSubCategoryImageAllowGetterSetter.java
@@ -0,0 +1,48 @@
+package cpm.com.gskmtorange.xmlGetterSetter;
+
+import java.util.ArrayList;
+
+/**
+ * Created by yadavendras on 28-12-2016.
+ */
+
+public class MappingSubCategoryImageAllowGetterSetter {
+
+    String table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
+
+    ArrayList<String> COUNTRY_ID = new ArrayList<>();
+    ArrayList<String> SUB_CATEGORY_ID = new ArrayList<>();
+    ArrayList<String> IMAGE_ALLOW = new ArrayList<>();
+
+    public String getTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW() {
+        return table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
+    }
+
+    public void setTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW(String table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW) {
+        this.table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW = table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
+    }
+
+    public ArrayList<String> getCOUNTRY_ID() {
+        return COUNTRY_ID;
+    }
+
+    public void setCOUNTRY_ID(String COUNTRY_ID) {
+        this.COUNTRY_ID.add(COUNTRY_ID);
+    }
+
+    public ArrayList<String> getSUB_CATEGORY_ID() {
+        return SUB_CATEGORY_ID;
+    }
+
+    public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) {
+        this.SUB_CATEGORY_ID.add(SUB_CATEGORY_ID);
+    }
+
+    public ArrayList<String> getIMAGE_ALLOW() {
+        return IMAGE_ALLOW;
+    }
+
+    public void setIMAGE_ALLOW(String IMAGE_ALLOW) {
+        this.IMAGE_ALLOW.add(IMAGE_ALLOW);
+    }
+}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
index b520c85..74fccba 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
@@ -25,6 +25,7 @@ public class TableBean {
     public static String MAPPING_PLANOGRAM;
     public static String MAPPING_SOS_TARGET;
     public static String SHELF_MASTER;
+    public static String MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
 
 
     public static String getAdditionalDisplay() {
@@ -178,4 +179,13 @@ public class TableBean {
     }
 
     //Gagan end code
+
+
+    public static String getMappingSubCategoryImageAllow() {
+        return MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
+    }
+
+    public static void setMappingSubCategoryImageAllow(String mappingSubCategoryImageAllow) {
+        MAPPING_SUB_CATEGORY_IMAGE_ALLOW = mappingSubCategoryImageAllow;
+    }
 }
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
index 863482c..d8641ef 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
@@ -20,6 +20,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter
 import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
@@ -815,4 +816,35 @@ public class XMLHandlers {
         return st;
     }
 
+    public static MappingSubCategoryImageAllowGetterSetter mappingSubCategoryImageAllowXMLHandler(XmlPullParser xpp, int eventType) {
+        MappingSubCategoryImageAllowGetterSetter st = new MappingSubCategoryImageAllowGetterSetter();
+
+        try {
+            while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+                if (xpp.getEventType() == XmlPullParser.START_TAG) {
+
+                    if (xpp.getName().equals("META_DATA")) {
+                        st.setTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("COUNTRY_ID")) {
+                        st.setCOUNTRY_ID(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("SUB_CATEGORY_ID")) {
+                        st.setSUB_CATEGORY_ID(xpp.nextText());
+                    }
+                    if (xpp.getName().equals("IMAGE_ALLOW")) {
+                        st.setIMAGE_ALLOW(xpp.nextText());
+                    }
+
+                }
+                xpp.next();
+            }
+        } catch (XmlPullParserException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return st;
+    }
+
 }
diff --git a/GSKMTOrange/src/main/res/drawable/camera_orange_star_green.png b/GSKMTOrange/src/main/res/drawable/camera_orange_star_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8219e03434c2672cd1f5ef6ca6074f2d023e471
GIT binary patch
literal 10278
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

literal 0
HcmV?d00001

diff --git a/GSKMTOrange/src/main/res/layout/activity_category_picture.xml b/GSKMTOrange/src/main/res/layout/activity_category_picture.xml
index 6542273..74b1e73 100644
--- a/GSKMTOrange/src/main/res/layout/activity_category_picture.xml
+++ b/GSKMTOrange/src/main/res/layout/activity_category_picture.xml
@@ -21,6 +21,8 @@
 
     </android.support.design.widget.AppBarLayout>
 
+    <include layout="@layout/content_category_picture" />
+
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
@@ -29,6 +31,4 @@
         android:layout_margin="@dimen/fab_margin"
         app:srcCompat="@drawable/save_icon" />
 
-    <include layout="@layout/content_category_picture" />
-
 </android.support.design.widget.CoordinatorLayout>
diff --git a/GSKMTOrange/src/main/res/layout/content_category_picture.xml b/GSKMTOrange/src/main/res/layout/content_category_picture.xml
index 3b0b302..b80c9d3 100644
--- a/GSKMTOrange/src/main/res/layout/content_category_picture.xml
+++ b/GSKMTOrange/src/main/res/layout/content_category_picture.xml
@@ -30,7 +30,7 @@
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="5dp"
-                android:background="@mipmap/camera_orange" />
+                android:background="@drawable/camera_orange_star_green" />
 
 
         </LinearLayout>
diff --git a/GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml b/GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml
index e7a40d6..0f07547 100644
--- a/GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml
+++ b/GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml
@@ -21,33 +21,30 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-
-            android:padding="10sp">
+            android:layout_alignParentTop="true">
 
 
             <TextView
                 android:id="@+id/textviewname"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="6sp"
                 android:layout_marginTop="7dp"
+                android:gravity="center"
                 android:text="Text View "
                 android:textSize="15sp"
                 android:textStyle="bold" />
 
-
             <Button
                 android:id="@+id/cameranew"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
                 android:layout_marginRight="20dp"
-                android:layout_alignParentTop="true"
                 android:background="@mipmap/camera_orange"
                 android:focusable="false" />
 
@@ -56,11 +53,10 @@
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
+                android:layout_centerVertical="true"
                 android:layout_marginRight="80dp"
                 android:background="@mipmap/camera_orange" />
 
-
         </RelativeLayout>
     </android.support.v7.widget.CardView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml
index 17de432..5b792a4 100644
--- a/GSKMTOrange/src/main/res/values-ar/string.xml
+++ b/GSKMTOrange/src/main/res/values-ar/string.xml
@@ -216,10 +216,10 @@
 
     <string name="stock_planogram_data_add_shelf_position_already_exists">الرف/ الموقع موجود بالفعل</string>
 
-    <string name="stock_planogram_add_shelf">Add Shelf</string>
-    <string name="stock_planogram_add_sku">Add Sku</string>
-    <string name="stock_planogram_add_sku_to_shelf">Add Sku to Shelf</string>
-    <string name="stock_planogram_planogram_tracker">Planogram Tracker</string>
-    <string name="stock_planogram_position_on_shelf">Position on Shelf</string>
+    <string name="stock_planogram_add_shelf">إضافة الرف</string>
+    <string name="stock_planogram_add_sku">الصنف إضافة</string>
+    <string name="stock_planogram_add_sku_to_shelf">إضافة منتج إلى الجرف</string>
+    <string name="stock_planogram_planogram_tracker">صورة مقطعية المقتفي</string>
+    <string name="stock_planogram_position_on_shelf">موقف بشأن الجرف</string>
 
 </resources>

From 7b6f2179ee5a15c5a609722c3621bfc04aaee540 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Fri, 24 Feb 2017 15:08:29 +0530
Subject: [PATCH 4/4] camera handle for arabic language

---
 GSKMTOrange/src/main/res/layout/activity_login.xml | 8 +-------
 GSKMTOrange/src/main/res/values-ar/string.xml      | 4 ++--
 GSKMTOrange/src/main/res/values-tr/string.xml      | 3 +++
 GSKMTOrange/src/main/res/values/strings.xml        | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/GSKMTOrange/src/main/res/layout/activity_login.xml b/GSKMTOrange/src/main/res/layout/activity_login.xml
index 454e513..66b56da 100644
--- a/GSKMTOrange/src/main/res/layout/activity_login.xml
+++ b/GSKMTOrange/src/main/res/layout/activity_login.xml
@@ -1,4 +1,3 @@
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -20,9 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:layout_marginBottom="8dp"
-
-        />
+        android:layout_marginBottom="8dp"/>
 
     <ScrollView
         android:id="@+id/login_form"
@@ -43,7 +40,6 @@
                 <ImageView
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
-
                     android:layout_centerInParent="true"
                     android:layout_gravity="center_vertical"
                     android:background="@drawable/parinaam_logo" />
@@ -80,10 +76,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:hint="@string/prompt_userid"
-
                             android:maxLines="1"
                             android:singleLine="true" />
-
                     </android.support.design.widget.TextInputLayout>
 
                     <android.support.design.widget.TextInputLayout
diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml
index 5b792a4..3af77db 100644
--- a/GSKMTOrange/src/main/res/values-ar/string.xml
+++ b/GSKMTOrange/src/main/res/values-ar/string.xml
@@ -102,7 +102,8 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="category_performance_oss">OSS</string>
     <string name="dialog_title">Parinaam</string>
-    <string name="prompt_password">كلمة المرور</string>
+    <string name="prompt_userid">Username/Kullanıcı Adı/اسم المستخدم</string>
+    <string name="prompt_password">Password/Şifre/كلمة المرور</string>
     <string name="category_performance_period">الفترة</string>
     <string name="Photo">صور</string>
     <string name="category_performance_PLANOGRAM">بلانوجرام</string>
@@ -197,7 +198,6 @@
     <string name="uploaddata">تحميل البيانات</string>
     <string name="geotagdata">تحميل بيانات جغرافية...</string>
     <string name="uploadimge">تحميل صور جغرافية</string>
-    <string name="prompt_userid">اسم المستخدم</string>
     <string name="data_will_be_lost">هل ترغب في الاستمرار؟ سيتم حذف البيانات الغير المحفوظة</string>
     <string name="yes">نعم</string>
 
diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml
index fb1a01a..a1dfbd9 100644
--- a/GSKMTOrange/src/main/res/values-tr/string.xml
+++ b/GSKMTOrange/src/main/res/values-tr/string.xml
@@ -260,6 +260,9 @@
     <string name="stock_planogram_planogram_tracker">Planogram Tracker</string>
     <string name="stock_planogram_position_on_shelf">Position on Shelf</string>
 
+
+    <string name="prompt_userid">Username/Kullanıcı Adı/اسم المستخدم</string>
+    <string name="prompt_password">Password/Şifre/كلمة المرور</string>
 </resources>
 
 
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 7ffc83b..f182229 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -10,8 +10,8 @@
 
     <!-- Strings related to login -->
     <string name="prompt_email">E Mail</string>
-    <string name="prompt_userid">Username/Kullanıcı Adı</string>
-    <string name="prompt_password">Password/Şifre</string>
+    <string name="prompt_userid">Username/Kullanıcı Adı/اسم المستخدم</string>
+    <string name="prompt_password">Password/Şifre/كلمة المرور</string>
     <string name="action_sign_in">Login/Giriş Yap</string>
     <string name="action_sign_in_short">Sign in</string>
     <string name="error_invalid_email">This email address is invalid</string>