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

newcode

Browse Source
This commit is contained in:
ashishandroid
2017-01-13 18:01:17 +05:30
parent 3a127934cc
commit fa9d3a1136
5 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+40 -38
View File
@@ -11,6 +11,7 @@ import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.CardView;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
@@ -63,6 +64,7 @@ public class StoreListActivity extends AppCompatActivity {
private Dialog dialog; private Dialog dialog;
boolean result_flag = false, leaveflag = false; boolean result_flag = false, leaveflag = false;
FloatingActionButton fab; FloatingActionButton fab;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -103,10 +105,7 @@ public class StoreListActivity extends AppCompatActivity {
super.onResume(); super.onResume();
storelist = db.getStoreData(date); storelist = db.getStoreData(date);
coverage=db.getCoverageData(date); coverage = db.getCoverageData(date);
if (storelist.size() > 0) { if (storelist.size() > 0) {
@@ -132,8 +131,6 @@ public class StoreListActivity extends AppCompatActivity {
int id = item.getItemId(); int id = item.getItemId();
if (id == android.R.id.home) { if (id == android.R.id.home) {
// NavUtils.navigateUpFromSameTask(this); // NavUtils.navigateUpFromSameTask(this);
@@ -188,35 +185,29 @@ public class StoreListActivity extends AppCompatActivity {
viewHolder.imageview.setVisibility(View.INVISIBLE); viewHolder.imageview.setVisibility(View.INVISIBLE);
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U)) { } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U)) {
viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.tick_u); viewHolder.imageview.setBackgroundResource(R.mipmap.tick);
viewHolder.chkbtn.setVisibility(View.INVISIBLE); viewHolder.chkbtn.setVisibility(View.INVISIBLE);
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) { } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) {
viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.tick_d); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE); viewHolder.chkbtn.setVisibility(View.INVISIBLE);
} else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_C)) { } else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_C)) {
viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.tick_c); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE); viewHolder.chkbtn.setVisibility(View.INVISIBLE);
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_P)) { } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_P)) {
viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.tick_p); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE); viewHolder.chkbtn.setVisibility(View.INVISIBLE);
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_L)) { } else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_L)) {
viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.tickl); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE); 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.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.leave_tick); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE); 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) { if (coverage.size() > 0) {
@@ -232,8 +223,10 @@ public class StoreListActivity extends AppCompatActivity {
if (storeid.equals(coverage.get(i).getStoreId())) { if (storeid.equals(coverage.get(i).getStoreId())) {
viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.checkin); // viewHolder.imageview.setBackgroundResource(R.mipmap.checkin);
viewHolder.chkbtn.setVisibility(View.INVISIBLE); viewHolder.chkbtn.setVisibility(View.INVISIBLE);
viewHolder.Cardbtn.setBackgroundColor(getResources().getColor(R.color.green));
} }
break; break;
@@ -244,6 +237,8 @@ public class StoreListActivity extends AppCompatActivity {
} }
} }
} else { } else {
viewHolder.Cardbtn.setBackgroundColor(getResources().getColor(R.color.colorOrange));
viewHolder.imageview.setVisibility(View.INVISIBLE); viewHolder.imageview.setVisibility(View.INVISIBLE);
viewHolder.chkbtn.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(); 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)) { } 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(); 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(); Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show();
} } else {
else {
// PUT IN PREFERENCES // PUT IN PREFERENCES
editor = preferences.edit(); 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 @Override
@@ -336,6 +339,7 @@ public class StoreListActivity extends AppCompatActivity {
RelativeLayout relativelayout; RelativeLayout relativelayout;
ImageView imageview; ImageView imageview;
Button chkbtn; Button chkbtn;
CardView Cardbtn;
public MyViewHolder(View itemView) { public MyViewHolder(View itemView) {
super(itemView); super(itemView);
@@ -346,6 +350,8 @@ public class StoreListActivity extends AppCompatActivity {
imageview = (ImageView) itemView.findViewById(R.id.imageView2); imageview = (ImageView) itemView.findViewById(R.id.imageView2);
chkbtn = (Button) itemView.findViewById(R.id.chkout); 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) { public void onCheckedChanged(RadioGroup group, int checkedId) {
// find which radio button is selected // find which radio button is selected
if (checkedId == R.id.yes) { if (checkedId == R.id.yes) {
boolean flag=true; boolean flag = true;
if(coverage.size()>0) { if (coverage.size() > 0) {
for (int i = 0; i < coverage.size(); i++) { for (int i = 0; i < coverage.size(); i++) {
if (store_id.equals(coverage.get(i).getStoreId())) { if (store_id.equals(coverage.get(i).getStoreId())) {
flag=false; flag = false;
break; break;
} }
} }
} }
if(flag==true) if (flag == true) {
{
Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class);
startActivity(in); startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out); overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
dialog.cancel(); dialog.cancel();
} } else {
else Intent in = new Intent(StoreListActivity.this, CategoryListActivity.class);
{
Intent in=new Intent(StoreListActivity.this,CategoryListActivity.class);
startActivity(in); startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out); overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
dialog.cancel(); dialog.cancel();
@@ -407,8 +410,7 @@ public class StoreListActivity extends AppCompatActivity {
UpdateStore(store_id); UpdateStore(store_id);
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
startActivity(in); startActivity(in);
} }
@@ -428,7 +430,7 @@ public class StoreListActivity extends AppCompatActivity {
} else { } else {
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
startActivity(in); startActivity(in);
} }
GSKMTOrange/src/main/res/layout/storeviewlist.xml
+2 -1
View File
@@ -63,10 +63,11 @@
<Button <Button
android:id="@+id/chkout" android:id="@+id/chkout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="45dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:focusable="false" android:focusable="false"
android:background="@mipmap/checkout"
android:visibility="invisible" /> android:visibility="invisible" />
<ImageView <ImageView
GSKMTOrange/src/main/res/mipmap-tr/checkout.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

GSKMTOrange/src/main/res/mipmap-xxhdpi/exclamation.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

GSKMTOrange/src/main/res/mipmap-xxhdpi/tick.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB