This commit is contained in:
ashishandroid
2017-01-20 18:14:52 +05:30
parent 648a3c21d2
commit bac28fa8b5
6 changed files with 29 additions and 5 deletions
@@ -24,7 +24,7 @@ public class SplashScreenActivity extends AppCompatActivity {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_splash_screen); setContentView(R.layout.activity_splash_main_layout);
StartAnimations(); StartAnimations();
@@ -482,7 +482,7 @@ public class StoreListActivity extends AppCompatActivity {
if (checkout_status.equals(CommonString.KEY_INVALID) || checkout_status.equals(CommonString.KEY_VALID)) { if (checkout_status.equals(CommonString.KEY_INVALID) || checkout_status.equals(CommonString.KEY_VALID)) {
AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this); AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
builder.setMessage(CommonString.DATA_DELETE_ALERT_MESSAGE) builder.setMessage(R.string.DELETE_ALERT_MESSAGE)
.setCancelable(false) .setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), .setPositiveButton(getResources().getString(R.string.yes),
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.SplashScreenActivity">
<include layout="@layout/activity_splash_screen" />
</android.support.design.widget.CoordinatorLayout>
+1 -1
View File
@@ -35,7 +35,7 @@
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:paddingBottom="20dp" android:paddingBottom="20dp"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:text="Uploading Data" android:text="@string/uploaddata"
android:textSize="@dimen/text_size_small" /> android:textSize="@dimen/text_size_small" />
<ProgressBar <ProgressBar
@@ -192,6 +192,9 @@
<string name="previous_data_upload">Lütfen Önceki Verileri Paylaşın</string> <string name="previous_data_upload">Lütfen Önceki Verileri Paylaşın</string>
<string name="error">Hata! paylaşılıyor</string> <string name="error">Hata! paylaşılıyor</string>
<string name="data_will_be_lost">Veri kaydedilmedi. İlerlemek</string> <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>
</resources> </resources>
+5 -2
View File
@@ -101,7 +101,7 @@
<string name="title_store_list_activity_store_already_done">Store Already Uploaded</string> <string name="title_store_list_activity_store_already_done">Store Already Uploaded</string>
<string name="title_store_list_activity_store_data_uploaded">Store Data Uploaded</string> <string name="title_store_list_activity_store_data_uploaded">Store Data Uploaded</string>
<string name="title_store_list_activity_store_already_checkout">Store Already Checkout</string> <string name="title_store_list_activity_store_already_checkout">Store Already Checkout</string>
<string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string> <string name="title_store_list_activity_store_again_uploaded">Please Upload data again</string>
<string name="title_store_list_activity_store_closed">Store Closed</string> <string name="title_store_list_activity_store_closed">Store Closed</string>
<string name="title_store_list_activity_already_store_closed">Store Already Closed</string> <string name="title_store_list_activity_already_store_closed">Store Already Closed</string>
@@ -181,7 +181,7 @@
<string name="click_image">Please click image</string> <string name="click_image">Please click image</string>
<string name="fill_sku_data">Please fill SKU data</string> <string name="fill_sku_data">Please fill SKU data</string>
<string name="fill_gaps_data">Please fill GAP data</string> <string name="fill_gaps_data">Please fill GAP data</string>
<string name="data_will_be_lost">Want to proceed usaved data will be deleted</string> <string name="data_will_be_lost">Want to proceed unsaved data will be deleted</string>
<string name="download_data">Downloading Data</string> <string name="download_data">Downloading Data</string>
<string name="store_visited">Store Visited</string> <string name="store_visited">Store Visited</string>
@@ -229,4 +229,7 @@
<string name="previous_data_upload">Please Upload Previous Data First</string> <string name="previous_data_upload">Please Upload Previous Data First</string>
<string name="error">Error Uploading</string> <string name="error">Error Uploading</string>
<string name="DELETE_ALERT_MESSAGE">Saved data will be lost - Do you want to continue?</string>
</resources> </resources>