diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
index 319d564..329d695 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
@@ -49,7 +49,8 @@ public class CategoryListActivity extends AppCompatActivity {
db.open();
txt_categoryName = (TextView) findViewById(R.id.txt_categoryName);
- txt_categoryName.setText("Category List");
+ //txt_categoryName.setText("Category List");
+ txt_categoryName.setText(getResources().getString(R.string.title_activity_category_list));
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@@ -68,21 +69,6 @@ public class CategoryListActivity extends AppCompatActivity {
recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
categoryList = new ArrayList<>();
- /*CategoryGetterSetter data = new CategoryGetterSetter();
- data.setCategory_name("Oral Health");
- data.setCategory_img(R.drawable.category);
- categoryList.add(data);
-
- data = new CategoryGetterSetter();
- data.setCategory_name("Nutritionals");
- data.setCategory_img(R.drawable.category);
- categoryList.add(data);
-
- data = new CategoryGetterSetter();
- data.setCategory_name("Wellness");
- data.setCategory_img(R.drawable.category);
- categoryList.add(data);*/
-
categoryList = db.getCategoryListData("1", "1", "1");
adapter = new CategoryListAdapter(CategoryListActivity.this, categoryList);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
index a7686ea..e7985aa 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
@@ -47,7 +47,8 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
- txt_categoryName.setText("CategoryWise Performance " + categoryName);
+ //txt_categoryName.setText("CategoryWise Performance " + categoryName);
+ txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
index a219fa7..9afdba0 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
@@ -48,7 +48,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
- txt_categoryName.setText("Daily Data Menu - " + categoryName);
+ //txt_categoryName.setText("Daily Data Menu - " + categoryName);
+ txt_categoryName.setText(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName);
/*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@@ -67,37 +68,44 @@ public class DailyDataMenuActivity extends AppCompatActivity {
categoryList = new ArrayList<>();
DailyDataMenuGetterSetter data = new DailyDataMenuGetterSetter();
- data.setCategory_name("MSL Availability");
+ //data.setCategory_name("MSL Availability");
+ data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability));
data.setCategory_img(R.drawable.category);
categoryList.add(data);
data = new DailyDataMenuGetterSetter();
- data.setCategory_name("Stock & Facing");
+ data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing));
+ //data.setCategory_name("Stock & Facing");
data.setCategory_img(R.drawable.category);
categoryList.add(data);
data = new DailyDataMenuGetterSetter();
- data.setCategory_name("T2P Compliance");
+ data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p));
+ //data.setCategory_name("T2P Compliance");
data.setCategory_img(R.drawable.category);
categoryList.add(data);
data = new DailyDataMenuGetterSetter();
- data.setCategory_name("Additional Visibility");
+ data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_visibility));
+ //data.setCategory_name("Additional Visibility");
data.setCategory_img(R.drawable.category);
categoryList.add(data);
data = new DailyDataMenuGetterSetter();
- data.setCategory_name("Promo Compliance");
+ data.setCategory_name(getResources().getString(R.string.daily_data_menu_promo_compliance));
+ //data.setCategory_name("Promo Compliance");
data.setCategory_img(R.drawable.category);
categoryList.add(data);
data = new DailyDataMenuGetterSetter();
- data.setCategory_name("Competition Visibility");
+ data.setCategory_name(getResources().getString(R.string.daily_data_menu_competition_tracking));
+ //data.setCategory_name("Competition Tracking");
data.setCategory_img(R.drawable.category);
categoryList.add(data);
data = new DailyDataMenuGetterSetter();
- data.setCategory_name("Competition Promo");
+ data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_promotions));
+ //data.setCategory_name("Competition Promo");
data.setCategory_img(R.drawable.category);
categoryList.add(data);
@@ -134,18 +142,17 @@ public class DailyDataMenuActivity extends AppCompatActivity {
holder.lay_menu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- if (dailyData.getCategory_name().equalsIgnoreCase("MSL Availability")) {
+ if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
Intent intent = new Intent(DailyDataMenuActivity.this, MSL_AvailabilityActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
startActivity(intent);
- } else if (dailyData.getCategory_name().equalsIgnoreCase("Stock & Facing")) {
+ } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_stock_facing))) {
Intent intent = new Intent(DailyDataMenuActivity.this, Stock_FacingActivity.class);
intent.putExtra("categoryName", dailyData.getCategory_name());
intent.putExtra("categoryId", categoryId);
startActivity(intent);
}
-
}
});
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
index dddbdf4..c07156a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
@@ -71,7 +71,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
categoryId = getIntent().getStringExtra("categoryId");
storeId = "";
- txt_mslAvailabilityName.setText(categoryName);
+ //txt_mslAvailabilityName.setText(categoryName);
+ txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
prepareList();
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 4b64158..c6ab317 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
@@ -84,7 +84,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
categoryId = getIntent().getStringExtra("categoryId");
storeId = "";
- txt_stockFacingName.setText(categoryName);
+ //txt_stockFacingName.setText(categoryName);
+ txt_stockFacingName.setText(getResources().getString(R.string.title_activity_stock_facing));
prepareList();
diff --git a/GSKMTOrange/src/main/res/layout/content_msl__availability.xml b/GSKMTOrange/src/main/res/layout/content_msl__availability.xml
index 8e9fda9..9ba8a12 100644
--- a/GSKMTOrange/src/main/res/layout/content_msl__availability.xml
+++ b/GSKMTOrange/src/main/res/layout/content_msl__availability.xml
@@ -46,7 +46,7 @@
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
- android:text="SKU"
+ android:text="@string/msl_availability_sku"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
@@ -63,7 +63,7 @@
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
- android:text="MBQ"
+ android:text="@string/msl_availability_mbq"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
@@ -80,7 +80,7 @@
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
- android:text="Available"
+ android:text="@string/msl_availability_availability"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 184910e..f48146f 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -38,8 +38,27 @@
Services
Category List
- CategoryWise Performance
- DailyMainMenuActivity
- MSL_AvailabilityActivity
+ Categorywise Performance
+ Daily Data Menu
+ Must Stock Availability
+ Stock and Facing
+
+ MSL Availability
+ Stock and Facing
+ T2P Compliance
+ Additional Visibility
+ Promo Compliance
+ Competition Visibility
+ Competition Promo
+
+ SKU Name
+ MBQ
+ Availability
+
+ Reference Image
+ Stock
+ Facing
+ SOS Target
+