diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index 741d9b4..2ddd1c5 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -44,7 +44,7 @@
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index 6040362..e7fff1a 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -1,4 +1,4 @@
-package cpm.com.gskmtorange.Database;
+package cpm.com.gskmtorange.database;
import android.content.ContentValues;
import android.content.Context;
@@ -9,10 +9,10 @@ import android.util.Log;
import java.util.ArrayList;
-import cpm.com.gskmtorange.GetterSetter.StoreBean;
-import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.gettersetter.StoreBean;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
-import cpm.com.gskmtorange.xmlHandlers.TableBean;
+import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
+
/**
* Created by ashishc on 29-12-2016.
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
index eca3c27..3644f03 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
@@ -1,4 +1,4 @@
-package cpm.com.gskmtorange.GeoTag;
+package cpm.com.gskmtorange.geotag;
import android.content.SharedPreferences;
import android.location.Location;
@@ -9,10 +9,7 @@ import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.location.LocationListener;
import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.SupportMapFragment;
import cpm.com.gskmtorange.R;
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
index 230add1..85e989f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
@@ -1,11 +1,32 @@
-package cpm.com.gskmtorange.GeoTag;
+package cpm.com.gskmtorange.geotag;
+import android.content.Context;
+import android.content.SharedPreferences;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+import java.util.ArrayList;
+
+import cpm.com.gskmtorange.dailyentry.StoreListActivity;
+import cpm.com.gskmtorange.database.GSKOrangeDB;
+import cpm.com.gskmtorange.gettersetter.StoreBean;
import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
/**
* Created by ashishc on 27-12-2016.
@@ -13,28 +34,147 @@ import cpm.com.gskmtorange.R;
public class GeoTagStoreList extends AppCompatActivity {
-
- ListView lv;
+ private SharedPreferences preferences;
+ ArrayList storelist = new ArrayList();
+ String date,visit_status;
+ GSKOrangeDB db;
+ ListView list;
LinearLayout parent_linear,nodata_linear;
protected void onCreate(Bundle savedInstanceState) {
// TODO Auto-generated method stub
super.onCreate(savedInstanceState);
setContentView(R.layout.storelistlayout);
- lv = (ListView) findViewById(R.id.list);
- nodata_linear = (LinearLayout) findViewById(R.id.no_data_lay);
- parent_linear = (LinearLayout) findViewById(R.id.parent_linear);
-
+ list = (ListView) findViewById(R.id.list_id);
+ // nodata_linear = (LinearLayout) findViewById(R.id.no_data_lay);
+ //parent_linear = (LinearLayout) findViewById(R.id.parent_linear);
+
+
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ getSupportActionBar().setHomeButtonEnabled(true);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+
+ preferences = PreferenceManager.getDefaultSharedPreferences(this);
+ date = preferences.getString(CommonString.KEY_DATE, null);
+ visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, "");
+
+ db = new GSKOrangeDB(GeoTagStoreList.this);
+ db.open();
+
+
+ list = (ListView)findViewById(R .id.list_id);
+
+
+ storelist = db.getStoreData(date);
+
+
+ if (storelist.size()>0) {
+ list.setAdapter(new MyAdaptor());
+ }
+
+ list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+
+ @Override
+ public void onItemClick(AdapterView> parent, View view,
+ int position, long id) {
+
+
+ Toast.makeText(getApplicationContext(),"Click",Toast.LENGTH_LONG).show();
+ }
+ });
}
+ private class MyAdaptor extends BaseAdapter {
+
+ @Override
+ public int getCount() {
+
+ return storelist.size();
+ }
+
+ @Override
+ public Object getItem(int position) {
+
+ return position;
+ }
+
+ @Override
+ public long getItemId(int position) {
+
+ return position;
+ }
+
+ @Override
+ public View getView(final int position, View convertView, ViewGroup parent) {
+ GeoTagStoreList.ViewHolder holder = null;
+ if (convertView == null) {
+ holder = new GeoTagStoreList.ViewHolder();
+
+ LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ convertView = inflater.inflate(R.layout.geotagstorelist, null);
+
+ holder.storename = (TextView) convertView.findViewById(R.id.geolistviewxml_storename);
+
+ holder.imgtick = (ImageView) convertView
+ .findViewById(R.id.imageView1);
+
+ convertView.setTag(holder);
+
+ } else {
+ holder = (GeoTagStoreList.ViewHolder) convertView.getTag();
+ }
+ holder.storename.setText(storelist.get(position).getSTORE_NAME());
+ //holder.storeaddress.setText(storelist.get(position).getCITY());
+
+
+
+ return convertView;
+ }
+
+ }
+
+ private class ViewHolder {
+ TextView storename, storeaddress;
+ ImageView imgtick;
+ Button checkout;
+
+ RelativeLayout l1;
+
+ }
+
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle action bar item clicks here. The action bar will
+ // automatically handle clicks on the Home/Up button, so long
+ // as you specify a parent activity in AndroidManifest.xml.
+ int id = item.getItemId();
+
+ if(id==android.R.id.home){
+
+ // NavUtils.navigateUpFromSameTask(this);
+ finish();
+
+ overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+
+
}
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java
index 31cf805..139ca38 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java
@@ -1,4 +1,4 @@
-package cpm.com.gskmtorange.GetterSetter;
+package cpm.com.gskmtorange.gettersetter;
/**
* Created by ashishc on 29-12-2016.
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
index 91abe52..f3da5dd 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -13,14 +13,13 @@ import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.view.Menu;
import android.view.MenuItem;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.TextView;
-import cpm.com.gskmtorange.GeoTag.GeoTagStoreList;
+import cpm.com.gskmtorange.geotag.GeoTagStoreList;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.dailyentry.StoreListActivity;
import cpm.com.gskmtorange.download.DownloadActivity;
@@ -165,7 +164,7 @@ public class MainActivity extends AppCompatActivity
- }
+ //}
else if (id == R.id.nav_export) {
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 a7884d4..ba2bcee 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -3,7 +3,6 @@ package cpm.com.gskmtorange.dailyentry;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
@@ -24,8 +23,8 @@ import android.widget.Toast;
import java.util.ArrayList;
-import cpm.com.gskmtorange.Database.GSKOrangeDB;
-import cpm.com.gskmtorange.GetterSetter.StoreBean;
+import cpm.com.gskmtorange.database.GSKOrangeDB;
+import cpm.com.gskmtorange.gettersetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
index f9d1685..873d2ab 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
@@ -26,8 +26,7 @@ import java.io.StringReader;
import java.net.MalformedURLException;
-import cpm.com.gskmtorange.Database.GSKOrangeDB;
-import cpm.com.gskmtorange.LoginActivity;
+import cpm.com.gskmtorange.database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
diff --git a/GSKMTOrange/src/main/res/drawable-v21/list_selector.xml b/GSKMTOrange/src/main/res/animator-hdpi/list_selector.xml
similarity index 100%
rename from GSKMTOrange/src/main/res/drawable-v21/list_selector.xml
rename to GSKMTOrange/src/main/res/animator-hdpi/list_selector.xml
diff --git a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
index bf1afd1..1740f82 100644
--- a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
+++ b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
- tools:context="cpm.com.gskmtorange.GeoTag.GeoTagActivity">
+ tools:context="cpm.com.gskmtorange.geotag.GeoTagActivity">
diff --git a/GSKMTOrange/src/main/res/layout/geotagstorelist.xml b/GSKMTOrange/src/main/res/layout/geotagstorelist.xml
new file mode 100644
index 0000000..f1f0dcd
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/geotagstorelist.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/storelist.xml b/GSKMTOrange/src/main/res/layout/storelist.xml
index 1078dae..c6562b7 100644
--- a/GSKMTOrange/src/main/res/layout/storelist.xml
+++ b/GSKMTOrange/src/main/res/layout/storelist.xml
@@ -68,7 +68,7 @@
android:layout_height="wrap_content"
android:cacheColorHint="#00000000"
android:choiceMode="singleChoice"
- android:divider="#ff9933"
+
android:dividerHeight="2dp"
android:drawSelectorOnTop="false"
android:fastScrollEnabled="true"
diff --git a/GSKMTOrange/src/main/res/layout/storelistlayout.xml b/GSKMTOrange/src/main/res/layout/storelistlayout.xml
index 514a114..486545b 100644
--- a/GSKMTOrange/src/main/res/layout/storelistlayout.xml
+++ b/GSKMTOrange/src/main/res/layout/storelistlayout.xml
@@ -1,143 +1,79 @@
-
-
-
-
-
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:weightSum="100">
-
-
-
+
-
-
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/layout/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml
index 09ee2cb..4124904 100644
--- a/GSKMTOrange/src/main/res/layout/storeviewlist.xml
+++ b/GSKMTOrange/src/main/res/layout/storeviewlist.xml
@@ -1,16 +1,28 @@
+
+
@@ -54,5 +66,5 @@
android:focusable="false"
android:visibility="invisible" />
-
+
\ No newline at end of file
diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/geopin.png b/GSKMTOrange/src/main/res/mipmap-hdpi/geopin.png
new file mode 100644
index 0000000..8f19c77
Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/geopin.png differ
diff --git a/GSKMTOrange/src/main/res/drawable-v21/store.png b/GSKMTOrange/src/main/res/mipmap-hdpi/store.png
similarity index 100%
rename from GSKMTOrange/src/main/res/drawable-v21/store.png
rename to GSKMTOrange/src/main/res/mipmap-hdpi/store.png