Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java

@@ -101,18 +101,18 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
 
                     //if (validateData(listDataHeader, listDataChild)) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(MSL_AvailabilityActivity.this);
-                    builder.setMessage("Are you sure you want to save")
+                    builder.setMessage(getResources().getString(R.string.check_save_message))
                             .setCancelable(false)
-                            .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+                            .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
                                     db.open();
 
                                     if (db.checkMsl_AvailabilityData(store_id, categoryId)) {
                                         db.updateMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
-                                        Snackbar.make(view, "Data has been updated", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                                        Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
                                     } else {
                                         db.InsertMSL_Availability(store_id, categoryId, hashMapListHeaderData, hashMapListChildData);
-                                        Snackbar.make(view, "Data has been saved", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                                        Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show();
                                     }
 
                                     //Toast.makeText(getApplicationContext(), "Data has been saved", Toast.LENGTH_LONG).show();
@@ -120,7 +120,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
                                     overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
                                 }
                             })
-                            .setNegativeButton("No", new DialogInterface.OnClickListener() {
+                            .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
                                     dialog.cancel();
                                 }
@@ -255,8 +255,24 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
         int id = item.getItemId();
 
         if (id == android.R.id.home) {
+            android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(MSL_AvailabilityActivity.this);
+            builder.setTitle(getResources().getString(R.string.dialog_title));
+            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) {
                             finish();
                         }
+                    })
+                    .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+
+                        }
+                    });
+            android.app.AlertDialog alert = builder.create();
+            alert.show();
+            //finish();
+        }
 
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
@@ -271,15 +287,14 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
         //super.onBackPressed();
 
         android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(MSL_AvailabilityActivity.this);
-        builder.setTitle("Parinaam");
+        builder.setTitle(getResources().getString(R.string.dialog_title));
         builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
-                .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-
                         finish();
                     }
                 })
-                .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() {
+                .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java

@@ -422,8 +422,24 @@ public class PromoComplianceActivity extends AppCompatActivity {
         int id = item.getItemId();
 
         if (id == android.R.id.home) {
+            android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(PromoComplianceActivity.this);
+            builder.setTitle(getResources().getString(R.string.dialog_title));
+            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) {
                             finish();
                         }
+                    })
+                    .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+
+                        }
+                    });
+            android.app.AlertDialog alert = builder.create();
+            alert.show();
+            //finish();
+        }
 
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
@@ -438,15 +454,14 @@ public class PromoComplianceActivity extends AppCompatActivity {
         //super.onBackPressed();
 
         android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(PromoComplianceActivity.this);
-        builder.setTitle("Parinaam");
+        builder.setTitle(getResources().getString(R.string.dialog_title));
         builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
-                .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-
                         finish();
                     }
                 })
-                .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() {
+                .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 

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

@@ -150,6 +150,16 @@
 
     <!--Gagan start new code 2-->
     <string name="stock_facing_planogram_dialog_title">Planogram</string>
+
+    <string name="ok">OK</string>
+    <string name="check_save_message">Are you sure you want to save</string>
+    <string name="save_message">Data has been saved</string>
+    <string name="update_message">Data has been updated</string>
+    <string name="empty_field">Fill the value </string>
+    <string name="fill_data">Please fill all the data</string>
+    <string name="dialog_title">Parinaam</string>
+
+
     <!--Gagan end new code 2-->
 
 </resources>