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 6ff18bb..fda1a28 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -11,6 +11,7 @@ import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.CardView; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; @@ -63,6 +64,7 @@ public class StoreListActivity extends AppCompatActivity { private Dialog dialog; boolean result_flag = false, leaveflag = false; FloatingActionButton fab; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -103,10 +105,7 @@ public class StoreListActivity extends AppCompatActivity { super.onResume(); storelist = db.getStoreData(date); - coverage=db.getCoverageData(date); - - - + coverage = db.getCoverageData(date); if (storelist.size() > 0) { @@ -132,8 +131,6 @@ public class StoreListActivity extends AppCompatActivity { int id = item.getItemId(); - - if (id == android.R.id.home) { // NavUtils.navigateUpFromSameTask(this); @@ -188,35 +185,29 @@ public class StoreListActivity extends AppCompatActivity { viewHolder.imageview.setVisibility(View.INVISIBLE); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tick_u); + viewHolder.imageview.setBackgroundResource(R.mipmap.tick); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tick_d); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_C)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tick_c); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_P)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tick_p); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_L)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.tickl); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); - } - else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { + } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.leave_tick); + viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); viewHolder.chkbtn.setVisibility(View.INVISIBLE); - } - - - - - else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) { + } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) { if (coverage.size() > 0) { @@ -232,8 +223,10 @@ public class StoreListActivity extends AppCompatActivity { if (storeid.equals(coverage.get(i).getStoreId())) { viewHolder.imageview.setVisibility(View.VISIBLE); - viewHolder.imageview.setBackgroundResource(R.mipmap.checkin); + // viewHolder.imageview.setBackgroundResource(R.mipmap.checkin); viewHolder.chkbtn.setVisibility(View.INVISIBLE); + viewHolder.Cardbtn.setBackgroundColor(getResources().getColor(R.color.green)); + } break; @@ -244,6 +237,8 @@ public class StoreListActivity extends AppCompatActivity { } } } else { + + viewHolder.Cardbtn.setBackgroundColor(getResources().getColor(R.color.colorOrange)); viewHolder.imageview.setVisibility(View.INVISIBLE); viewHolder.chkbtn.setVisibility(View.INVISIBLE); } @@ -269,12 +264,9 @@ public class StoreListActivity extends AppCompatActivity { Snackbar.make(v, R.string.title_store_list_activity_store_again_uploaded, Snackbar.LENGTH_LONG).setAction("Action", null).show(); } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_L)) { Snackbar.make(v, R.string.title_store_list_activity_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } - else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { + } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) { Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } - - else { + } else { // PUT IN PREFERENCES editor = preferences.edit(); @@ -322,6 +314,17 @@ public class StoreListActivity extends AppCompatActivity { } } }); + + + viewHolder.chkbtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + + } + }); + + } @Override @@ -336,6 +339,7 @@ public class StoreListActivity extends AppCompatActivity { RelativeLayout relativelayout; ImageView imageview; Button chkbtn; + CardView Cardbtn; public MyViewHolder(View itemView) { super(itemView); @@ -346,6 +350,8 @@ public class StoreListActivity extends AppCompatActivity { imageview = (ImageView) itemView.findViewById(R.id.imageView2); chkbtn = (Button) itemView.findViewById(R.id.chkout); + Cardbtn = (CardView) itemView.findViewById(R.id.card_view); + } } @@ -366,25 +372,22 @@ public class StoreListActivity extends AppCompatActivity { public void onCheckedChanged(RadioGroup group, int checkedId) { // find which radio button is selected if (checkedId == R.id.yes) { - boolean flag=true; - if(coverage.size()>0) { + boolean flag = true; + if (coverage.size() > 0) { for (int i = 0; i < coverage.size(); i++) { if (store_id.equals(coverage.get(i).getStoreId())) { - flag=false; + flag = false; break; } } } - if(flag==true) - { + if (flag == true) { Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog.cancel(); - } - else - { - Intent in=new Intent(StoreListActivity.this,CategoryListActivity.class); + } else { + Intent in = new Intent(StoreListActivity.this, CategoryListActivity.class); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog.cancel(); @@ -407,8 +410,7 @@ public class StoreListActivity extends AppCompatActivity { UpdateStore(store_id); - - Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); + Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); startActivity(in); } @@ -428,7 +430,7 @@ public class StoreListActivity extends AppCompatActivity { } else { - Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); + Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); startActivity(in); } diff --git a/GSKMTOrange/src/main/res/layout/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml index 8f3af54..7faa727 100644 --- a/GSKMTOrange/src/main/res/layout/storeviewlist.xml +++ b/GSKMTOrange/src/main/res/layout/storeviewlist.xml @@ -63,10 +63,11 @@