From 497df6fec5351b9fb16eb58a2b6fdb47bc525817 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 24 Feb 2017 18:11:28 +0530 Subject: [PATCH 1/2] camera handle for arabic language --- .../gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java index 33e9f45..1f07969 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java @@ -320,7 +320,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { AlertDialog alert = builder.create(); alert.show(); } - } }); From a6dbcef607ac1008cff61afa1e743bb6476d0d83 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Mon, 27 Feb 2017 14:08:39 +0530 Subject: [PATCH 2/2] login,checkout,geotag time problem --- .../gskmtorange/GeoTag/GeoTagActivity.java | 33 +++++++++++++++++-- .../cpm/com/gskmtorange/LoginActivity.java | 31 ++++++++++++++--- .../dailyentry/CheckoutActivity.java | 28 ++++++++++++++-- .../gsk_dailyentry/Stock_FacingActivity.java | 31 +++++++++++++++-- .../src/main/res/layout/activity_geo_tag.xml | 8 ++--- 5 files changed, 113 insertions(+), 18 deletions(-) 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 652ea33..958a251 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -430,18 +430,45 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb stopLocationUpdates(); } - public String getCurrentTime() { + /*public String getCurrentTime() { Calendar m_cal = Calendar.getInstance(); SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm"); String cdate = formatter.format(m_cal.getTime()); - /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":" - + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/ + *//* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":" + + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*//* return cdate; + }*/ + + private static String arabicToenglish(String number) { + char[] chars = new char[number.length()]; + for (int i = 0; i < number.length(); i++) { + char ch = number.charAt(i); + if (ch >= 0x0660 && ch <= 0x0669) + ch -= 0x0660 - '0'; + else if (ch >= 0x06f0 && ch <= 0x06F9) + ch -= 0x06f0 - '0'; + chars[i] = ch; + } + + return new String(chars); + } + + public String getCurrentTime() { + Calendar m_cal = Calendar.getInstance(); + + SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm"); + String cdate = formatter.format(m_cal.getTime()); + + if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + cdate = arabicToenglish(cdate); + } + + return cdate; } protected void startCameraActivity() { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 094424f..499334f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -127,7 +127,7 @@ public class LoginActivity extends AppCompatActivity { e.printStackTrace(); } - tv_version.setText("Version/Versiyon - " + app_ver); + tv_version.setText("Version/Versiyon - " + app_ver+"T"); preferences = PreferenceManager.getDefaultSharedPreferences(this); editor = preferences.edit(); @@ -673,19 +673,40 @@ public class LoginActivity extends AppCompatActivity { alert.show(); } - public String getCurrentTime() { + /*public String getCurrentTime() { Calendar m_cal = Calendar.getInstance(); SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); String intime = formatter.format(m_cal.getTime()); - /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":" - + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/ - return intime; + }*/ + private static String arabicToenglish(String number) { + char[] chars = new char[number.length()]; + for (int i = 0; i < number.length(); i++) { + char ch = number.charAt(i); + if (ch >= 0x0660 && ch <= 0x0669) + ch -= 0x0660 - '0'; + else if (ch >= 0x06f0 && ch <= 0x06F9) + ch -= 0x06f0 - '0'; + chars[i] = ch; + } + return new String(chars); + } + public String getCurrentTime() { + Calendar m_cal = Calendar.getInstance(); + + SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); + String cdate = formatter.format(m_cal.getTime()); + + if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + cdate = arabicToenglish(cdate); + } + + return cdate; } private static boolean updateResources(Context context, String language) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java index 0ff1212..65849bb 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -354,14 +354,38 @@ public class CheckoutActivity extends AppCompatActivity { return true; } + /*public String getCurrentTime() { + Calendar m_cal = Calendar.getInstance(); + + SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm"); + String cdate = formatter.format(m_cal.getTime()); + + return cdate; + }*/ + + private static String arabicToenglish(String number) { + char[] chars = new char[number.length()]; + for (int i = 0; i < number.length(); i++) { + char ch = number.charAt(i); + if (ch >= 0x0660 && ch <= 0x0669) + ch -= 0x0660 - '0'; + else if (ch >= 0x06f0 && ch <= 0x06F9) + ch -= 0x06f0 - '0'; + chars[i] = ch; + } + + return new String(chars); + } + public String getCurrentTime() { Calendar m_cal = Calendar.getInstance(); SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm"); String cdate = formatter.format(m_cal.getTime()); - /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":" - + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/ + if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + cdate = arabicToenglish(cdate); + } return cdate; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 1b38496..03359f8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -1124,12 +1124,37 @@ public class Stock_FacingActivity extends AppCompatActivity { super.onActivityResult(requestCode, resultCode, data); } - public String getCurrentTime() { + /*public String getCurrentTime() { Calendar m_cal = Calendar.getInstance(); SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); String cdate = formatter.format(m_cal.getTime()); - /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":" - + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/ + + return cdate; + }*/ + + private static String arabicToenglish(String number) { + char[] chars = new char[number.length()]; + for (int i = 0; i < number.length(); i++) { + char ch = number.charAt(i); + if (ch >= 0x0660 && ch <= 0x0669) + ch -= 0x0660 - '0'; + else if (ch >= 0x06f0 && ch <= 0x06F9) + ch -= 0x06f0 - '0'; + chars[i] = ch; + } + + return new String(chars); + } + + public String getCurrentTime() { + Calendar m_cal = Calendar.getInstance(); + + SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); + String cdate = formatter.format(m_cal.getTime()); + + if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + cdate = arabicToenglish(cdate); + } return cdate; } diff --git a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml index b15d425..cc9de9a 100644 --- a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml +++ b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml @@ -27,11 +27,10 @@ android:id="@+id/fab" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|end" + android:layout_gravity="bottom|right" android:layout_margin="@dimen/fab_margin" - app:srcCompat="@drawable/save_icon" app:backgroundTint="@color/colorAccent" - /> + app:srcCompat="@drawable/save_icon" /> + app:backgroundTint="@color/colorAccent" />