newcode

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java

@@ -430,7 +430,10 @@ public class StoreListActivity extends AppCompatActivity {
                 address = (TextView) itemView.findViewById(R.id.storelistviewxml_storeaddress);
 
                 relativelayout = (RelativeLayout) itemView.findViewById(R.id.storenamelistview_layout);
-                imageview = (ImageView) itemView.findViewById(R.id.imageView2);
+                //imageview = (ImageView) itemView.findViewById(R.id.imageView2);
+
+                imageview = (ImageView) itemView.findViewById(R.id.storelistviewxml_storeico);
+
 
                 chkbtn = (Button) itemView.findViewById(R.id.chkout);
                 Cardbtn = (CardView) itemView.findViewById(R.id.card_view);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java

@@ -920,7 +920,7 @@ public class DownloadActivity extends AppCompatActivity {
         AlertDialog.Builder builder = new AlertDialog.Builder(DownloadActivity.this);
         builder.setTitle("Parinaam");
         builder.setMessage(str).setCancelable(false)
-                .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
 
                        /* Intent i = new Intent(activity, StorelistActivity.class);

GSKMTOrange/src/main/res/layout/storelist.xml

@@ -50,6 +50,7 @@
         android:weightSum="10"
         android:visibility="gone"
 
+
         >
 
         <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
@@ -67,7 +68,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="No data available"
+                android:text="@string/NodataAvailable"
                 android:textSize="25sp"
                 android:textStyle="bold" />
         </android.support.v7.widget.CardView>
@@ -107,7 +108,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="Please download data"
+                android:text="@string/Pleasedownaloaddata"
                 android:textSize="25sp"
                 android:textStyle="bold" />
         </android.support.v7.widget.CardView>

GSKMTOrange/src/main/res/layout/storeviewlist.xml

@@ -34,7 +34,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true"
                 android:layout_marginRight="6sp"
-                android:background="@mipmap/store"
+
                 android:layout_marginTop="10dp"
                 android:paddingTop="25sp" />
 

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -194,7 +194,8 @@
     <string name="data_will_be_lost">Veri kaydedilmedi. İlerlemek</string>
     <string name="data_downloaded_successfully">Veri başarıyla indirildi</string>
     <string name="DELETE_ALERT_MESSAGE">Kaydedilen veriler kaybolacak - Devam etmek istiyor musunuz?</string>
-
+    <string name="NodataAvailable">Veri yok</string>
+    <string name="Pleasedownaloaddata">Lütfen verileri indirin</string>
 </resources>
 
 

GSKMTOrange/src/main/res/values/strings.xml

@@ -230,6 +230,7 @@
     <string name="previous_data_upload">Please Upload Previous Data First</string>
     <string name="error">Error Uploading</string>
     <string name="DELETE_ALERT_MESSAGE">Saved data will be lost - Do you want to continue?</string>
-
+    <string name="NodataAvailable">No data available</string>
+    <string name="Pleasedownaloaddata">Please download data</string>
 
 </resources>