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 8e78bc4..b688348 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/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); 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 ccadc94..2a6d721 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/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); diff --git a/GSKMTOrange/src/main/res/layout/storelist.xml b/GSKMTOrange/src/main/res/layout/storelist.xml index c06fa91..d0970ac 100644 --- a/GSKMTOrange/src/main/res/layout/storelist.xml +++ b/GSKMTOrange/src/main/res/layout/storelist.xml @@ -50,6 +50,7 @@ android:weightSum="10" android:visibility="gone" + > @@ -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" /> diff --git a/GSKMTOrange/src/main/res/layout/storeviewlist.xml b/GSKMTOrange/src/main/res/layout/storeviewlist.xml index 3dfe5f1..0ef657d 100644 --- a/GSKMTOrange/src/main/res/layout/storeviewlist.xml +++ b/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" /> diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 13c35e6..a7520f0 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -194,7 +194,8 @@ Veri kaydedilmedi. İlerlemek Veri başarıyla indirildi Kaydedilen veriler kaybolacak - Devam etmek istiyor musunuz? - + Veri yok + Lütfen verileri indirin diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index a5b8b60..53c8740 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -230,6 +230,7 @@ Please Upload Previous Data First Error Uploading Saved data will be lost - Do you want to continue? - + No data available + Please download data