AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Icons

Browse Source
This commit is contained in:
Gagan290
2017-01-09 16:29:10 +05:30
parent f4b812d965
commit f03119e0ae
12 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java
+6 -6
View File
@@ -47,9 +47,6 @@ public class CategoryListActivity extends AppCompatActivity {
setContentView(R.layout.activity_category_list); setContentView(R.layout.activity_category_list);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
db = new GSKOrangeDB(this); db = new GSKOrangeDB(this);
db.open(); db.open();
@@ -65,9 +62,12 @@ public class CategoryListActivity extends AppCompatActivity {
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
txt_categoryName = (TextView) findViewById(R.id.txt_categoryName); /*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.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); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category);
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java
+6 -6
View File
@@ -37,18 +37,18 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity {
setContentView(R.layout.activity_category_wise_performance); setContentView(R.layout.activity_category_wise_performance);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
recyclerView = (RecyclerView) findViewById(R.id.recyclerView); 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"); categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId"); 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); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java
+6 -6
View File
@@ -48,12 +48,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
setContentView(R.layout.activity_daily_data_menu); setContentView(R.layout.activity_daily_data_menu);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
recyclerView = (RecyclerView) findViewById(R.id.recyclerView); 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 = new GSKOrangeDB(this);
db.open(); db.open();
@@ -73,8 +70,11 @@ public class DailyDataMenuActivity extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName"); categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId"); 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); /*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+5 -6
View File
@@ -65,9 +65,6 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
setContentView(R.layout.activity_msl__availability); setContentView(R.layout.activity_msl__availability);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName); txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName);
@@ -90,9 +87,11 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName"); categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId"); categoryId = getIntent().getStringExtra("categoryId");
//txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
//txt_mslAvailabilityName.setText(categoryName); toolbar.setTitle(getResources().getString(R.string.title_activity_msl__availability));
txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability)); setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
prepareList(); prepareList();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+1
View File
@@ -52,6 +52,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
setContentView(R.layout.activity_promo_compliance); setContentView(R.layout.activity_promo_compliance);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
toolbar.setTitle(getResources().getString(R.string.title_activity_promo_compliance));
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+6 -6
View File
@@ -81,15 +81,12 @@ public class Stock_FacingActivity extends AppCompatActivity {
setContentView(R.layout.activity_stock_facing); setContentView(R.layout.activity_stock_facing);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
db = new GSKOrangeDB(this); db = new GSKOrangeDB(this);
db.open(); db.open();
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName); //txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName);
//preference data //preference data
preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -105,8 +102,11 @@ public class Stock_FacingActivity extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName"); categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId"); 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(); prepareList();
GSKMTOrange/src/main/res/layout/content_category_list.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="Category Performance" android:text="Category Performance"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" /> android:textColor="@android:color/black"
android:visibility="gone"/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="Category Performance" android:text="Category Performance"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" /> android:textColor="@android:color/black"
android:visibility="gone"/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
GSKMTOrange/src/main/res/layout/content_daily_main_menu.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="Daily Data Menu" android:text="Daily Data Menu"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" /> android:textColor="@android:color/black"
android:visibility="gone"/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
GSKMTOrange/src/main/res/layout/content_msl__availability.xml
+2 -1
View File
@@ -24,7 +24,8 @@
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="Must Have Availability" android:text="Must Have Availability"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" /> android:textColor="@android:color/black"
android:visibility="gone"/>
<LinearLayout <LinearLayout
android:id="@+id/lin_category" android:id="@+id/lin_category"
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+2 -1
View File
@@ -25,7 +25,8 @@
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="@string/title_activity_promo_compliance" android:text="@string/title_activity_promo_compliance"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" /> android:textColor="@android:color/black"
android:visibility="gone" />
<ScrollView <ScrollView
android:id="@+id/scrollView_promoCompliance" android:id="@+id/scrollView_promoCompliance"
GSKMTOrange/src/main/res/layout/content_stock_facing.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="Stock Facing" android:text="Stock Facing"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" /> android:textColor="@android:color/black"
android:visibility="gone"/>
<LinearLayout <LinearLayout
android:id="@+id/lin_category" android:id="@+id/lin_category"