From 783a8ed103db8bb2a4e689304986d69ba8cb0649 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Fri, 20 Jan 2017 13:44:46 +0530 Subject: [PATCH] newcode --- .../dailyentry/AdditionalVisibility.java | 32 +++++++++---------- .../src/main/res/layout/activity_geo_tag.xml | 4 +-- .../res/layout/additionalvisibilitylayout.xml | 2 +- GSKMTOrange/src/main/res/values/strings.xml | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java index 10b63c5..a787601 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -301,10 +301,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_save)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_save_data)) + .setMessage(getResources().getString(R.string.title_activity_Want_save)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -355,10 +355,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_save)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_save_data)) + .setMessage(getResources().getString(R.string.title_activity_Want_save)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -419,10 +419,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_add)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.adddatatoclick)) + .setMessage(getResources().getString(R.string.title_activity_Want_to_add)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -501,10 +501,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -550,10 +550,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -612,11 +612,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -1288,11 +1288,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -1418,11 +1418,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { diff --git a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml index bf1afd1..c68fe9e 100644 --- a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml +++ b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml @@ -30,7 +30,7 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" app:srcCompat="@android:drawable/ic_menu_save" - app:backgroundTint="@color/colorPrimary" + app:backgroundTint="@color/colorAccent" /> diff --git a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml index cd601f1..3234393 100644 --- a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml @@ -16,7 +16,7 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" app:srcCompat="@android:drawable/ic_menu_save" - app:backgroundTint="@color/colorPrimary" + app:backgroundTint="@color/colorAccent" /> diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index eb0a1b5..1ab6d91 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -165,7 +165,7 @@ Please click the image GPS IS DISABLED... Click ok to enable GPS. - Please Take Image Before Save + Please Take Image This device is not supported. Uploading Data Uploading Geotag Data...