From 432654869276a84c906984368de02cc586874d35 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Fri, 15 Mar 2019 16:20:07 +0530 Subject: [PATCH] YSY commit --- GSKMTOrange/build.gradle | 8 +- .../gskmtorange/GeoTag/GeoTagStoreList.java | 2 +- .../dailyentry/AdditionalVisibility.java | 2 +- .../dailyentry/CoachingVisitActivity.java | 2 +- .../dailyentry/FutureJCPActivity.java | 2 +- .../dailyentry/NonWorkingReason.java | 2 +- .../dailyentry/POGQuestionsActivity.java | 79 ++++++++++--------- .../StoreCheckoutImageActivity.java | 2 +- .../dailyentry/StoreListActivity.java | 2 +- .../dailyentry/StoreimageActivity.java | 2 +- .../gsk_dailyentry/CategoryListActivity.java | 21 ++++- .../CategoryWisePerformanceActivity.java | 2 +- .../gsk_dailyentry/DailyDataMenuActivity.java | 2 +- .../MSL_AvailabilityActivity.java | 2 +- .../MSL_Availability_StockFacingActivity.java | 2 +- .../PromoComplianceActivity.java | 2 +- .../StockFacing_PlanogramTrackerActivity.java | 2 +- .../gsk_dailyentry/Stock_FacingActivity.java | 2 +- .../StoreWisePerformanceActivity.java | 2 +- .../compile-file-map.properties | 2 +- 20 files changed, 82 insertions(+), 60 deletions(-) diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index f09dc7c..39e08b0 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -21,12 +21,12 @@ android { targetSdkVersion 26 //For Egypt - versionCode 23 - versionName "3.5" + /*versionCode 23 + versionName "3.5"*/ //For UAE - /*versionCode 19 - versionName "3.1"*/ + versionCode 20 + versionName "3.2" //For Turkey /*versionCode 21 diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java index 9baece1..c2e1092 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java @@ -68,7 +68,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); preferences = PreferenceManager.getDefaultSharedPreferences(this); 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 6f516b0..ee2920c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -129,7 +129,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); preferences = PreferenceManager.getDefaultSharedPreferences(this); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java index 8490a16..83b7b9f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java @@ -80,7 +80,7 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV multi_spinner_supervisor = (MultiSpinnerSearch) findViewById(R.id.multi_spinner_supervisor); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); preferences = PreferenceManager.getDefaultSharedPreferences(this); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java index 502d188..c2b675f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java @@ -138,7 +138,7 @@ public class FutureJCPActivity extends AppCompatActivity implements View.OnClick void declaration() { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); fab = (FloatingActionButton) findViewById(R.id.fab); //calenderBtn = (ImageButton) findViewById(R.id.iconCalender); 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 ff6a6b6..a674447 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -128,7 +128,7 @@ public class NonWorkingReason extends AppCompatActivity implements Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); preferences = PreferenceManager.getDefaultSharedPreferences(this); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java index d37e017..15b1e26 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java @@ -61,15 +61,15 @@ public class POGQuestionsActivity extends AppCompatActivity { GSKOrangeDB db; - List headerDataList; + List headerDataList = new ArrayList<>(); HashMap> hashMapListChildData = new HashMap<>(); ExpandableListAdapter adapter; List checkHeaderArray = new ArrayList<>(); - String error_msg=""; + String error_msg = ""; boolean checkflag = true; - int selectedPOSMTypePosition =0; + int selectedPOSMTypePosition = 0; boolean userSelect = false, changedFlag = false; @Override @@ -108,7 +108,7 @@ public class POGQuestionsActivity extends AppCompatActivity { //txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability)); toolbar.setTitle(getResources().getString(R.string.pog)); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); @@ -117,7 +117,7 @@ public class POGQuestionsActivity extends AppCompatActivity { public void onClick(View view) { if (validateData()) { - db.savePOGQuestionAnswerData(hashMapListChildData, headerDataList,store_id, categoryId); + db.savePOGQuestionAnswerData(hashMapListChildData, headerDataList, store_id, categoryId); finish(); overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); @@ -141,14 +141,18 @@ public class POGQuestionsActivity extends AppCompatActivity { alert.show();*/ } else { - adapter.notifyDataSetChanged(); - expandableListView.invalidateViews(); - Snackbar.make(expandableListView,error_msg , Snackbar.LENGTH_SHORT).show(); + + if(adapter!=null){ + adapter.notifyDataSetChanged(); + expandableListView.invalidateViews(); + } + + Snackbar.make(expandableListView, error_msg, Snackbar.LENGTH_SHORT).show(); } } }); - if(country_id.equals("2") && (storeType_id.equals("9")|| storeType_id.equals("15"))){ + if (country_id.equals("2") && (storeType_id.equals("9") || storeType_id.equals("15"))) { linPlanogramType.setVisibility(View.VISIBLE); final ArrayAdapter planogramTypeAdapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item); @@ -184,7 +188,7 @@ public class POGQuestionsActivity extends AppCompatActivity { userSelect = false; - if(changedFlag){ + if (changedFlag) { AlertDialog.Builder builder = new AlertDialog.Builder(POGQuestionsActivity.this); builder.setMessage(R.string.DELETE_ALERT_MESSAGE) .setCancelable(false) @@ -209,8 +213,7 @@ public class POGQuestionsActivity extends AppCompatActivity { AlertDialog alert = builder.create(); alert.show(); - } - else { + } else { selectedPOSMTypePosition = position; prepareListData(planogramTypeAdapter.getItem(position).toString(), true); } @@ -226,20 +229,19 @@ public class POGQuestionsActivity extends AppCompatActivity { ArrayList pogSavedList = db.getAfterSavePOGUploadQuestionAnswerData(store_id, categoryId); - if(pogSavedList.size()>0){ + if (pogSavedList.size() > 0) { String qType = pogSavedList.get(0).getQTYPE(); - for(int i=0; i(); headerDataList = db.getSubCategoryMasterForPOG(categoryId, storeType_id, pog_type_id, planogramType); @@ -323,22 +323,22 @@ public class POGQuestionsActivity extends AppCompatActivity { for (int i = 0; i < headerDataList.size(); i++) { ArrayList quizDataList = new ArrayList<>(); - if(!clearFlag){ + if (!clearFlag) { quizDataList = db.getAfterSavePOGQuestionAnswerData(store_id, categoryId, headerDataList.get(i).getSub_category_id()); } - if(quizDataList.size()==0){ + if (quizDataList.size() == 0) { quizDataList = db.getPOGSubCategoryWise(headerDataList.get(i).getSub_category_id(), pog_type_id, storeType_id, planogramType); } - //hashMapListChildData = new HashMap<>(); + //hashMapListChildData = new HashMap<>(); ArrayList childListData = new ArrayList<>(); if (quizDataList.size() > 0) { String select = getString(R.string.title_activity_select_dropdown); // Adding child data - for (int j = 0; j < quizDataList.size();j++) { + for (int j = 0; j < quizDataList.size(); j++) { childListData = db.getPOGAnswerData(quizDataList.get(j).getQUESTION_ID(), headerDataList.get(i).getSub_category_id(), select); quizDataList.get(j).setAnswerList(childListData); } @@ -494,20 +494,20 @@ public class POGQuestionsActivity extends AppCompatActivity { } }); - holder.txt_question.setText(childData.getQUESTION() + " ("+childData.getQTYPE()+")"); + holder.txt_question.setText(childData.getQUESTION() + " (" + childData.getQTYPE() + ")"); for (int i = 0; i < ans_list.size(); i++) { - if ( ans_list.get(i).getANSWER_ID().equals(childData.getANSWER_ID())) { + if (ans_list.get(i).getANSWER_ID().equals(childData.getANSWER_ID())) { holder.sp_auditAnswer.setSelection(i); break; } } - if(!checkflag){ - if(childData.getANSWER_ID().equals("0")){ + if (!checkflag) { + if (childData.getANSWER_ID().equals("0")) { holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark)); - }else { + } else { holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white)); } } @@ -578,7 +578,14 @@ public class POGQuestionsActivity extends AppCompatActivity { checkHeaderArray.clear(); checkflag = true; - for(int l=0; l child_data = hashMapListChildData.get(headerDataList.get(l)); for (int i = 0; i < child_data.size(); i++) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java index aca57da..a1520a0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java @@ -109,7 +109,7 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); img_cam = (ImageView) findViewById(R.id.img_selfie); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 1273dcf..39b3b0f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -220,7 +220,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli setContentView(R.layout.storelistfablayout); toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); preferences = PreferenceManager.getDefaultSharedPreferences(this); 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 24b1319..55fd12a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -129,7 +129,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); img_cam = (ImageView) findViewById(R.id.img_selfie); 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 822829a..e841003 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 @@ -42,7 +42,7 @@ public class CategoryListActivity extends AppCompatActivity { CategoryListAdapter adapter; GSKOrangeDB db; - String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id,camera_allow, country_id, store_flag_str; + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id,camera_allow, country_id, store_flag_str, pog_type_id; private SharedPreferences preferences; @Override @@ -70,13 +70,13 @@ public class CategoryListActivity extends AppCompatActivity { camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, ""); country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null); store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null); - + pog_type_id = preferences.getString(CommonString.KEY_POG_TYPE_ID, ""); /*txt_categoryName = (TextView) findViewById(R.id.txt_categoryName); txt_categoryName.setText(getResources().getString(R.string.title_activity_category_list));*/ toolbar.setTitle(getResources().getString(R.string.title_activity_category_list)); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category); @@ -217,6 +217,14 @@ public class CategoryListActivity extends AppCompatActivity { } } + if(flag){ + if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) { + if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) { + flag = false; + } + } + } + if (flag){ //Counterfeit Product Option - Egypt @@ -562,6 +570,13 @@ public class CategoryListActivity extends AppCompatActivity { } } + if (db.getSubCategoryMasterForPOG(category_id, storeType_id, pog_type_id, null).size() > 0) { + if (db.getAfterSavePOGUploadQuestionAnswerData(store_id, category_id).size() == 0) { + flag_filled = false; + break; + } + } + //Counterfeit Product Option - Egypt if(country_id.equals("6")){ 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 28c7779..035a92e 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 @@ -77,7 +77,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { //txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); toolbar.setTitle(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); 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 bada3d2..ad7df36 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 @@ -96,7 +96,7 @@ public class DailyDataMenuActivity extends AppCompatActivity { //txt_categoryName.setText(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName); toolbar.setTitle(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); /*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); 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 01f814c..63cceaf 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 @@ -94,7 +94,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { //txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability)); toolbar.setTitle(getResources().getString(R.string.title_activity_msl__availability)); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); prepareList(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java index 74dc689..34d2f96 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java @@ -140,7 +140,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl //txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability)); toolbar.setTitle(getResources().getString(R.string.title_activity_msl__availability)); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); str_planogram = CommonString.FILE_PATH_PLANOGRAM; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index fa763cd..cd77092 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -94,7 +94,7 @@ public class PromoComplianceActivity extends AppCompatActivity { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); toolbar.setTitle(getResources().getString(R.string.title_activity_promo_compliance)); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); lin_promo_sku = (LinearLayout) findViewById(R.id.lin_promo_sku); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java index da858ba..f2ffb9c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java @@ -93,7 +93,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); toolbar.setTitle(getResources().getString(R.string.stock_planogram_planogram_tracker)); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); db = new GSKOrangeDB(this); 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 516c57a..ab58545 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 @@ -152,7 +152,7 @@ public class Stock_FacingActivity extends AppCompatActivity { //txt_stockFacingName.setText(getResources().getString(R.string.title_activity_stock_facing)); toolbar.setTitle(getResources().getString(R.string.title_activity_stock_facing)); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); //Stock Facing List diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java index 3c3288d..7b1d4c9 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java @@ -75,7 +75,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { toolbar.setTitle(getResources().getString(R.string.title_activity_store_wise_performance)); setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); diff --git a/library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties index 971da82..2a23d25 100644 --- a/library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties +++ b/library/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Mar 13 18:14:05 IST 2019 +#Fri Mar 15 09:43:47 IST 2019 D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\item_listview_single.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_single.xml D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\item_listview_multiple.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\activity_main.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml