Merge pull request #21 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Camera_Change_Arabic

camera handle for arabic language

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

@@ -741,18 +741,30 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
     }
 
-    public String getCurrentTime() {
+    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) + ":"
+        if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
-                + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+            cdate = arabicToenglish(cdate);
+        }
 
         return cdate;
-
     }
 
     @Override
@@ -957,15 +969,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
 
     protected void startCameraActivity() {
         try {
-            /*Log.i("MakeMachine", "startCameraActivity()");
-            File file = new File(_path);
-            Uri outputFileUri = Uri.fromFile(file);
-
-            Intent intent = new Intent(
-                    MediaStore.ACTION_IMAGE_CAPTURE);
-            intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
-
-            startActivityForResult(intent, 0);*/
 
             Log.i("MakeMachine", "startCameraActivity()");
             File file = new File(_path);
@@ -976,23 +979,23 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
             List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
             for (int n = 0; n < list.size(); n++) {
                 if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
-                   /* Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
+                    Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
                     Log.e("TAG", "package name  : " + list.get(n).packageName);
-*/
+
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;

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

@@ -251,19 +251,30 @@ public class CategoryPicture extends AppCompatActivity {
         });
     }
 
+    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) + ":"
+        if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
-                + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+            cdate = arabicToenglish(cdate);
+        }
 
         return cdate;
-
     }
 
     private static boolean updateResources(Context context, String language) {
@@ -312,20 +323,23 @@ public class CategoryPicture extends AppCompatActivity {
             List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
             for (int n = 0; n < list.size(); n++) {
                 if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
+                    Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
+                    Log.e("TAG", "package name  : " + list.get(n).packageName);
 
+                    //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;

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

@@ -228,15 +228,6 @@ public class NonWorkingReason extends AppCompatActivity implements
 
     protected void startCameraActivity() {
         try {
-            /*Log.i("MakeMachine", "startCameraActivity()");
-            File file = new File(_path);
-            Uri outputFileUri = Uri.fromFile(file);
-
-            Intent intent = new Intent(
-                    MediaStore.ACTION_IMAGE_CAPTURE);
-            intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
-
-            startActivityForResult(intent, 0);*/
 
             Log.i("MakeMachine", "startCameraActivity()");
             File file = new File(_path);
@@ -247,23 +238,23 @@ public class NonWorkingReason extends AppCompatActivity implements
             List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
             for (int n = 0; n < list.size(); n++) {
                 if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
-                   /* Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
+                    Log.e("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
                     Log.e("TAG", "package name  : " + list.get(n).packageName);
-*/
+
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;
@@ -513,18 +504,30 @@ public class NonWorkingReason extends AppCompatActivity implements
 
     }
 
-    public String getCurrentTime() {
+    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");
+        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
         String cdate = formatter.format(m_cal.getTime());
 
-       /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+        if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
-                + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+            cdate = arabicToenglish(cdate);
+        }
 
         return cdate;
-
     }
 
     @Override

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

@@ -97,6 +97,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
     Toolbar toolbar;
     boolean ResultFlag = true;
     ArrayList<CoverageBean> coverage = new ArrayList<CoverageBean>();
+
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_storeimage);
@@ -182,7 +183,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
             case R.id.img_cam_selfie:
 
-                _pathforcheck = store_id +"SI" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
+                _pathforcheck = store_id + "SI_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
 
                 _path = CommonString.FILE_PATH + _pathforcheck;
 
@@ -276,18 +277,18 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
 
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
 
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
 
                             defaultCameraPackage = list.get(n).packageName;
                             break;
@@ -348,8 +349,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
         String cdate = formatter.format(m_cal.getTime());
 
-       /* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+        if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
-                + m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
+            cdate = arabicToenglish(cdate);
+        }
 
         return cdate;
     }
@@ -636,6 +638,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
         }
 
     }
+
     public void showAlert(String str) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(StoreimageActivity.this);
@@ -654,5 +657,16 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
     }
 
 
-
+    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);
+    }
 }

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

@@ -766,12 +766,28 @@ public class T2PComplianceActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    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");
+
+        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;
     }
@@ -793,17 +809,19 @@ public class T2PComplianceActivity extends AppCompatActivity {
 
                     //temp value in case camera is gallery app above jellybean
                     String packag = list.get(n).loadLabel(packageManager).toString();
-                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
+                    if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
                         gallery_package = list.get(n).packageName;
                     }
 
                     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }
                     } else {
-                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
+
+                        if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
+
                             defaultCameraPackage = list.get(n).packageName;
                             break;
                         }

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

@@ -54,9 +54,8 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
     String categoryName, categoryId, brand_name = "", brand_id = "";
     RecyclerView recyclerView;
     ArrayList<BrandAvabilityGetterSetter> brand_new_list = new ArrayList<BrandAvabilityGetterSetter>();
-
-
     T2pBrand_Avaibility.ValueAdapter adapteravabiblity;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -99,8 +98,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if(brand_new_list.size()>0)
+                if (brand_new_list.size() > 0) {
-                {
                     BrandAvabilityGetterSetter br = new BrandAvabilityGetterSetter();
 
                     br.setCategoryId(categoryId);
@@ -114,14 +112,11 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
                     finish();
 
 
-                }
+                } else {
-                else{
                     Snackbar.make(view, "Please add data", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                 }
 
 
-
-
             }
         });
 
@@ -147,9 +142,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
                     brand_name = "";
                     brand_id = "";
 
-            }
+                } else {
-                else
-            {
                     Snackbar.make(view, "Please select dropdown", Snackbar.LENGTH_LONG)
                             .setAction("Action", null).show();
                 }
@@ -177,10 +170,8 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         });
 
 
-
     }
 
-
     public class CustomAdapter extends ArrayAdapter<String> {
 
         private Activity activity;
@@ -243,23 +234,6 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         }
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     private static boolean updateResources(Context context, String language) {
 
         /*String lang;
@@ -302,7 +276,6 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
         return true;
     }
 
-
     public class ValueAdapter extends RecyclerView.Adapter<T2pBrand_Avaibility.ValueAdapter.MyViewHolder> {
 
         private LayoutInflater inflator;
@@ -356,5 +329,4 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
 
     }
 
-
 }

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

@@ -212,7 +212,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:padding="10dp">
+                android:paddingBottom="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="5dp">
 
                 <Button
                     android:id="@+id/dialog_btn_addShelf"
@@ -221,7 +224,6 @@
                     android:layout_alignParentLeft="true"
                     android:layout_marginLeft="10dp"
                     android:background="@color/colorPrimary"
-                    android:padding="5dp"
                     android:text="@string/stock_planogram_add_shelf"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/white" />
@@ -233,7 +235,6 @@
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="10dp"
                     android:background="@color/colorPrimary"
-                    android:padding="5dp"
                     android:text="@string/cancel"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/white" />

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

@@ -72,7 +72,6 @@
                         android:layout_alignParentLeft="true"
                         android:layout_marginLeft="10dp"
                         android:background="@color/colorPrimary"
-                        android:padding="5dp"
                         android:text="@string/stock_planogram_add_sku_to_shelf"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/white" />
@@ -84,7 +83,6 @@
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="10dp"
                         android:background="@color/colorPrimary"
-                        android:padding="5dp"
                         android:text="@string/cancel"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/white" />