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 fda1a28..3d5b77b 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -6,6 +6,8 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
@@ -225,7 +227,7 @@ public class StoreListActivity extends AppCompatActivity {
viewHolder.imageview.setVisibility(View.VISIBLE);
// viewHolder.imageview.setBackgroundResource(R.mipmap.checkin);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
- viewHolder.Cardbtn.setBackgroundColor(getResources().getColor(R.color.green));
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.green));
}
@@ -238,7 +240,7 @@ public class StoreListActivity extends AppCompatActivity {
}
} else {
- viewHolder.Cardbtn.setBackgroundColor(getResources().getColor(R.color.colorOrange));
+ viewHolder.Cardbtn.setCardBackgroundColor(getResources().getColor(R.color.colorOrange));
viewHolder.imageview.setVisibility(View.INVISIBLE);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
}
@@ -320,13 +322,55 @@ public class StoreListActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(
+ StoreListActivity.this);
+ builder.setMessage(R.string.wantcheckout)
+ .setCancelable(false)
+ .setPositiveButton(R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(
+ DialogInterface dialog, int id) {
+ if (CheckNetAvailability()) {
+
+
+ /*Intent i = new Intent(StoreListActivity.this, CheckOutStoreActivity.class);
+ startActivity(i);*/
+ } else {
+
+ Snackbar.make(recyclerView, R.string.nonetwork, Snackbar.LENGTH_SHORT).setAction("Action", null).show();
+
+ }
+
+ }
+ })
+ .setNegativeButton(R.string.cancel,
+ new DialogInterface.OnClickListener() {
+ public void onClick(
+ DialogInterface dialog, int id) {
+ dialog.cancel();
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+
}
});
-
}
+ public boolean CheckNetAvailability() {
+ boolean connected = false;
+ ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+ if (connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE)
+ .getState() == NetworkInfo.State.CONNECTED
+ || connectivityManager.getNetworkInfo(
+ ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) {
+ // we are connected to a network
+ connected = true;
+ }
+ return connected;
+ }
@Override
public int getItemCount() {
return data.size();
diff --git a/GSKMTOrange/src/main/res/layout/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml
index 7faa727..df55c67 100644
--- a/GSKMTOrange/src/main/res/layout/storeviewlist.xml
+++ b/GSKMTOrange/src/main/res/layout/storeviewlist.xml
@@ -77,7 +77,6 @@
android:layout_alignBottom="@+id/storelistviewxml_storeico"
android:layout_alignParentRight="true"
- android:background="@mipmap/tick_c"
android:visibility="gone"
/>
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 64266c5..df3e6b8 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -161,5 +161,8 @@
failure
Uploading Geotag Images
success
+ Are you sure you want to Checkout
+ No Network
+