From 53e769d234eb514f15f1abb235f92902d84d49ea Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Sat, 21 Jan 2017 16:13:20 +0530 Subject: [PATCH 1/2] //Stock_FacingActivity Changes today --- .../com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1f2edc9..ad8523f 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 @@ -872,7 +872,7 @@ public class Stock_FacingActivity extends AppCompatActivity { } else if (headerTitle.getSos_target().equals("-")) { headerTitle.setSos_target("-"); } - txt_sosHeader.setText(headerTitle.getSos_target().toString()); + txt_sosHeader.setText(getResources().getString(R.string.stock_facing_sos) + ": \n" + headerTitle.getSos_target().toString()); txt_sosHeader.setVisibility(View.VISIBLE); img_camera1.setVisibility(View.VISIBLE); From 6c94212f603d2074942fce753239894b3bc7e867 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Sat, 21 Jan 2017 16:13:58 +0530 Subject: [PATCH 2/2] //Stock_FacingActivity Changes today --- .../cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java | 1 - 1 file changed, 1 deletion(-) 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 ad8523f..d8e6383 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 @@ -863,7 +863,6 @@ public class Stock_FacingActivity extends AppCompatActivity { txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD); txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand()); - if (headerTitle.getCompany_id().equals("1")) { txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));