From f03119e0aee01083301085939020a0d9d3cdfabc Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Mon, 9 Jan 2017 16:29:10 +0530 Subject: [PATCH] Icons --- .../gsk_dailyentry/CategoryListActivity.java | 12 ++++++------ .../CategoryWisePerformanceActivity.java | 12 ++++++------ .../gsk_dailyentry/DailyDataMenuActivity.java | 12 ++++++------ .../gsk_dailyentry/MSL_AvailabilityActivity.java | 11 +++++------ .../gsk_dailyentry/PromoComplianceActivity.java | 1 + .../gsk_dailyentry/Stock_FacingActivity.java | 12 ++++++------ .../src/main/res/layout/content_category_list.xml | 3 ++- .../res/layout/content_category_wise_performance.xml | 3 ++- .../src/main/res/layout/content_daily_main_menu.xml | 3 ++- .../main/res/layout/content_msl__availability.xml | 3 ++- .../src/main/res/layout/content_promo_compliance.xml | 3 ++- .../src/main/res/layout/content_stock_facing.xml | 3 ++- 12 files changed, 42 insertions(+), 36 deletions(-) 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 76c6d4c..f6e0362 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 @@ -47,9 +47,6 @@ public class CategoryListActivity extends AppCompatActivity { setContentView(R.layout.activity_category_list); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); db = new GSKOrangeDB(this); db.open(); @@ -65,9 +62,12 @@ public class CategoryListActivity extends AppCompatActivity { storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); - txt_categoryName = (TextView) findViewById(R.id.txt_categoryName); - //txt_categoryName.setText("Category List"); - txt_categoryName.setText(getResources().getString(R.string.title_activity_category_list)); + /*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); fab.setOnClickListener(new View.OnClickListener() { 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 e7985aa..3553a8a 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 @@ -37,18 +37,18 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { setContentView(R.layout.activity_category_wise_performance); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); recyclerView = (RecyclerView) findViewById(R.id.recyclerView); - txt_categoryName = (TextView) findViewById(R.id.txt_categoryName); + //txt_categoryName = (TextView) findViewById(R.id.txt_categoryName); categoryName = getIntent().getStringExtra("categoryName"); categoryId = getIntent().getStringExtra("categoryId"); - //txt_categoryName.setText("CategoryWise Performance " + categoryName); - txt_categoryName.setText(getResources().getString(R.string.title_activity_category_wise_performance) + " " + categoryName); + //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); 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 192bf98..6593bf8 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,12 +48,9 @@ public class DailyDataMenuActivity extends AppCompatActivity { setContentView(R.layout.activity_daily_data_menu); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); recyclerView = (RecyclerView) findViewById(R.id.recyclerView); - txt_categoryName = (TextView) findViewById(R.id.txt_categoryName); + //txt_categoryName = (TextView) findViewById(R.id.txt_categoryName); db = new GSKOrangeDB(this); db.open(); @@ -73,8 +70,11 @@ public class DailyDataMenuActivity extends AppCompatActivity { categoryName = getIntent().getStringExtra("categoryName"); categoryId = getIntent().getStringExtra("categoryId"); - //txt_categoryName.setText("Daily Data Menu - " + categoryName); - txt_categoryName.setText(getResources().getString(R.string.title_activity_daily_main_menu) + " - " + categoryName); + //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); fab.setOnClickListener(new View.OnClickListener() { 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 60f7b10..7513fe0 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 @@ -65,9 +65,6 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { setContentView(R.layout.activity_msl__availability); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName); @@ -90,9 +87,11 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { categoryName = getIntent().getStringExtra("categoryName"); categoryId = getIntent().getStringExtra("categoryId"); - - //txt_mslAvailabilityName.setText(categoryName); - txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability)); + //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/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index 25a9182..e535230 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 @@ -52,6 +52,7 @@ public class PromoComplianceActivity extends AppCompatActivity { setContentView(R.layout.activity_promo_compliance); 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); 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 f1e991d..ec5b0d0 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 @@ -81,15 +81,12 @@ public class Stock_FacingActivity extends AppCompatActivity { setContentView(R.layout.activity_stock_facing); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); db = new GSKOrangeDB(this); db.open(); expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); - txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName); + //txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName); //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); @@ -105,8 +102,11 @@ public class Stock_FacingActivity extends AppCompatActivity { categoryName = getIntent().getStringExtra("categoryName"); categoryId = getIntent().getStringExtra("categoryId"); - //txt_stockFacingName.setText(categoryName); - txt_stockFacingName.setText(getResources().getString(R.string.title_activity_stock_facing)); + //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); prepareList(); diff --git a/GSKMTOrange/src/main/res/layout/content_category_list.xml b/GSKMTOrange/src/main/res/layout/content_category_list.xml index ec1e039..36bcc74 100644 --- a/GSKMTOrange/src/main/res/layout/content_category_list.xml +++ b/GSKMTOrange/src/main/res/layout/content_category_list.xml @@ -23,7 +23,8 @@ android:paddingTop="10dp" android:text="Category Performance" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@android:color/black" /> + android:textColor="@android:color/black" + android:visibility="gone"/> + android:textColor="@android:color/black" + android:visibility="gone"/> + android:textColor="@android:color/black" + android:visibility="gone"/> + android:textColor="@android:color/black" + android:visibility="gone"/> + android:textColor="@android:color/black" + android:visibility="gone" /> + android:textColor="@android:color/black" + android:visibility="gone"/>