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 337a47e..49865da 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -459,21 +459,22 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb List 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 - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) { gallery_package = list.get(n).packageName; } if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } } else { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } 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 d70e87e..0e2a2b8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -938,21 +938,22 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl List 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 - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) { gallery_package = list.get(n).packageName; } if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } } else { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java index 33a5d5d..2f86714 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -201,21 +201,22 @@ public class NonWorkingReason extends AppCompatActivity implements List 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 - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) { gallery_package = list.get(n).packageName; } if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } } else { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index 61cb227..ac7b9a3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -252,17 +252,18 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic Log.e("TAG", "package name : " + list.get(n).packageName); //temp value in case camera is gallery app above jellybean - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) { gallery_package = list.get(n).packageName; } if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } } else { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 50d54eb..f42cd09 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -623,22 +623,22 @@ public class T2PComplianceActivity extends AppCompatActivity { List 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 - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) { gallery_package = list.get(n).packageName; } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } } else { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } 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 ed5352b..c497662 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 @@ -494,20 +494,22 @@ public class Stock_FacingActivity extends AppCompatActivity { List 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); - + /* 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 - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) { gallery_package = list.get(n).packageName; } + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } } else { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } @@ -576,20 +578,22 @@ public class Stock_FacingActivity extends AppCompatActivity { List 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); - + /* 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 - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Gallery")) { + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) { gallery_package = list.get(n).packageName; } + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } } else { - if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { defaultCameraPackage = list.get(n).packageName; break; } diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/checkout_bg.png b/GSKMTOrange/src/main/res/mipmap-hdpi/checkout_bg.png index cdf97c6..820bb75 100644 Binary files a/GSKMTOrange/src/main/res/mipmap-hdpi/checkout_bg.png and b/GSKMTOrange/src/main/res/mipmap-hdpi/checkout_bg.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-tr/checkout_bg.png b/GSKMTOrange/src/main/res/mipmap-tr/checkout_bg.png index 6aa707a..2dad632 100644 Binary files a/GSKMTOrange/src/main/res/mipmap-tr/checkout_bg.png and b/GSKMTOrange/src/main/res/mipmap-tr/checkout_bg.png differ diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index e0113be..75ff02a 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -195,6 +195,9 @@ Hata! paylaşılıyor Veri kaydedilmedi. İlerlemek + Galeri + kamera + diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 2e5ec18..915e4c3 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -233,4 +233,7 @@ Error Uploading + Gallery + Camera +