AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

camera handle for arabic language

Browse Source
This commit is contained in:
Gagan290
2017-02-24 12:24:26 +05:30
parent a88d1e5260
commit 74f4a6fbd9
8 changed files with 146 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+22 -19
View File
@@ -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(); Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm"); SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime()); 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; return cdate;
} }
@Override @Override
@@ -957,15 +969,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
protected void startCameraActivity() { protected void startCameraActivity() {
try { 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()"); Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path); 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); List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
for (int n = 0; n < list.size(); n++) { for (int n = 0; n < list.size(); n++) {
if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { 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); Log.e("TAG", "package name : " + list.get(n).packageName);
*/
//temp value in case camera is gallery app above jellybean //temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString(); 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; gallery_package = list.get(n).packageName;
} }
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { 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; defaultCameraPackage = list.get(n).packageName;
break; break;
} }
} else { } else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName; defaultCameraPackage = list.get(n).packageName;
break; break;
@@ -1651,7 +1654,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
}else{ } else {
lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
} }
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
+21 -7
View File
@@ -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() { public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance(); Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm"); SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime()); 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; return cdate;
} }
private static boolean updateResources(Context context, String language) { 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); List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
for (int n = 0; n < list.size(); n++) { for (int n = 0; n < list.size(); n++) {
if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { 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(); 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; gallery_package = list.get(n).packageName;
} }
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { 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; defaultCameraPackage = list.get(n).packageName;
break; break;
} }
} else { } else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName; defaultCameraPackage = list.get(n).packageName;
break; break;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+22 -19
View File
@@ -228,15 +228,6 @@ public class NonWorkingReason extends AppCompatActivity implements
protected void startCameraActivity() { protected void startCameraActivity() {
try { 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()"); Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path); File file = new File(_path);
@@ -247,23 +238,23 @@ public class NonWorkingReason extends AppCompatActivity implements
List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
for (int n = 0; n < list.size(); n++) { for (int n = 0; n < list.size(); n++) {
if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { 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); Log.e("TAG", "package name : " + list.get(n).packageName);
*/
//temp value in case camera is gallery app above jellybean //temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString(); 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; gallery_package = list.get(n).packageName;
} }
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { 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; defaultCameraPackage = list.get(n).packageName;
break; break;
} }
} else { } else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName; defaultCameraPackage = list.get(n).packageName;
break; 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(); 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 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; return cdate;
} }
@Override @Override
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+26 -12
View File
@@ -85,10 +85,10 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
private FailureGetterSetter failureGetterSetter = null; private FailureGetterSetter failureGetterSetter = null;
String _pathforcheck, _path, str; String _pathforcheck, _path, str;
String store_id, visit_date, username, intime, date,_UserId; String store_id, visit_date, username, intime, date, _UserId;
private SharedPreferences preferences; private SharedPreferences preferences;
AlertDialog alert; AlertDialog alert;
String img_str,strflag; String img_str, strflag;
private GSKOrangeDB database; private GSKOrangeDB database;
String lat, lon; String lat, lon;
@@ -97,12 +97,13 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
Toolbar toolbar; Toolbar toolbar;
boolean ResultFlag = true; boolean ResultFlag = true;
ArrayList<CoverageBean> coverage = new ArrayList<CoverageBean>(); ArrayList<CoverageBean> coverage = new ArrayList<CoverageBean>();
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_storeimage); setContentView(R.layout.activity_storeimage);
preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar = (Toolbar) findViewById(R.id.toolbar); toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setHomeButtonEnabled(true);
@@ -182,7 +183,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
case R.id.img_cam_selfie: 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; _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 //temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString(); 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; gallery_package = list.get(n).packageName;
} }
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { 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; defaultCameraPackage = list.get(n).packageName;
break; break;
} }
} else { } else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName; defaultCameraPackage = list.get(n).packageName;
break; break;
@@ -348,8 +349,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm"); SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime()); 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; return cdate;
} }
@@ -376,7 +378,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(R.string.title_activity_store_image); toolbar.setTitle(R.string.title_activity_store_image);
} }
@@ -415,7 +417,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
} else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
}else{ } else {
lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
} }
@@ -636,6 +638,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
} }
} }
public void showAlert(String str) { public void showAlert(String str) {
AlertDialog.Builder builder = new AlertDialog.Builder(StoreimageActivity.this); 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
+24 -6
View File
@@ -766,12 +766,28 @@ public class T2PComplianceActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item); 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() { public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance(); 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 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; return cdate;
} }
@@ -793,17 +809,19 @@ public class T2PComplianceActivity extends AppCompatActivity {
//temp value in case camera is gallery app above jellybean //temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString(); 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; gallery_package = list.get(n).packageName;
} }
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { 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; defaultCameraPackage = list.get(n).packageName;
break; break;
} }
} else { } else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName; defaultCameraPackage = list.get(n).packageName;
break; break;
} }
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
+26 -54
View File
@@ -51,12 +51,11 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
Spinner spinner_brand; Spinner spinner_brand;
Button add; Button add;
ArrayList<BrandAvabilityGetterSetter> brand_list; ArrayList<BrandAvabilityGetterSetter> brand_list;
String categoryName,categoryId,brand_name="",brand_id=""; String categoryName, categoryId, brand_name = "", brand_id = "";
RecyclerView recyclerView; RecyclerView recyclerView;
ArrayList<BrandAvabilityGetterSetter> brand_new_list=new ArrayList<BrandAvabilityGetterSetter>(); ArrayList<BrandAvabilityGetterSetter> brand_new_list = new ArrayList<BrandAvabilityGetterSetter>();
T2pBrand_Avaibility.ValueAdapter adapteravabiblity; T2pBrand_Avaibility.ValueAdapter adapteravabiblity;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -64,7 +63,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
spinner_brand = (Spinner) findViewById(R.id.spinner); spinner_brand = (Spinner) findViewById(R.id.spinner);
add = (Button) findViewById(R.id.button2); add = (Button) findViewById(R.id.button2);
recyclerView = (RecyclerView) findViewById(R.id.layout_recycle); recyclerView = (RecyclerView) findViewById(R.id.layout_recycle);
@@ -87,7 +86,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName"); categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId"); categoryId = getIntent().getStringExtra("categoryId");
///// /////
brand_list = db.getBrandAvailbilitydata(store_id, categoryId,keyAccount_id,class_id,storeType_id); brand_list = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id);
BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter(); BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
String str = getResources().getString(R.string.select); String str = getResources().getString(R.string.select);
brand.setBRAND(str); brand.setBRAND(str);
@@ -99,29 +98,25 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if(brand_new_list.size()>0) if (brand_new_list.size() > 0) {
{ BrandAvabilityGetterSetter br = new BrandAvabilityGetterSetter();
BrandAvabilityGetterSetter br=new BrandAvabilityGetterSetter();
br.setCategoryId(categoryId); br.setCategoryId(categoryId);
br.setClass_id(class_id); br.setClass_id(class_id);
br.setKeyAccount_id(keyAccount_id); br.setKeyAccount_id(keyAccount_id);
br.setStoreType_id(storeType_id); br.setStoreType_id(storeType_id);
br.setStore_id(store_id); br.setStore_id(store_id);
db.InsertBrandAvabilitydata( br, brand_new_list); db.InsertBrandAvabilitydata(br, brand_new_list);
brand_new_list.clear(); brand_new_list.clear();
finish(); finish();
} } else {
else{
Snackbar.make(view, "Please add data", Snackbar.LENGTH_LONG).setAction("Action", null).show(); Snackbar.make(view, "Please add data", Snackbar.LENGTH_LONG).setAction("Action", null).show();
} }
} }
}); });
@@ -130,29 +125,27 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (!brand_name.equalsIgnoreCase("") && brand_name!=null){ if (!brand_name.equalsIgnoreCase("") && brand_name != null) {
BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter(); BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
brand.setBRAND(brand_name); brand.setBRAND(brand_name);
brand.setBRAND_ID(brand_id); brand.setBRAND_ID(brand_id);
brand_new_list.add(brand); brand_new_list.add(brand);
adapteravabiblity = new T2pBrand_Avaibility.ValueAdapter(T2pBrand_Avaibility.this, brand_new_list); adapteravabiblity = new T2pBrand_Avaibility.ValueAdapter(T2pBrand_Avaibility.this, brand_new_list);
recyclerView.setAdapter(adapteravabiblity); recyclerView.setAdapter(adapteravabiblity);
recyclerView.setLayoutManager(new LinearLayoutManager(T2pBrand_Avaibility.this)); recyclerView.setLayoutManager(new LinearLayoutManager(T2pBrand_Avaibility.this));
spinner_brand.setSelection(0); spinner_brand.setSelection(0);
brand_name=""; brand_name = "";
brand_id=""; brand_id = "";
} } else {
else Snackbar.make(view, "Please select dropdown", Snackbar.LENGTH_LONG)
{ .setAction("Action", null).show();
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> { public class CustomAdapter extends ArrayAdapter<String> {
private Activity activity; private Activity activity;
@@ -243,23 +234,6 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
} }
} }
private static boolean updateResources(Context context, String language) { private static boolean updateResources(Context context, String language) {
/*String lang; /*String lang;
@@ -285,7 +259,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
} else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
}else{ } else {
lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
} }
@@ -302,7 +276,6 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
return true; return true;
} }
public class ValueAdapter extends RecyclerView.Adapter<T2pBrand_Avaibility.ValueAdapter.MyViewHolder> { public class ValueAdapter extends RecyclerView.Adapter<T2pBrand_Avaibility.ValueAdapter.MyViewHolder> {
private LayoutInflater inflator; private LayoutInflater inflator;
@@ -356,5 +329,4 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
} }
} }
GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml
+4 -3
View File
@@ -212,7 +212,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:padding="10dp"> android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp">
<Button <Button
android:id="@+id/dialog_btn_addShelf" android:id="@+id/dialog_btn_addShelf"
@@ -221,7 +224,6 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:padding="5dp"
android:text="@string/stock_planogram_add_shelf" android:text="@string/stock_planogram_add_shelf"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" /> android:textColor="@color/white" />
@@ -233,7 +235,6 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:padding="5dp"
android:text="@string/cancel" android:text="@string/cancel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" /> android:textColor="@color/white" />
GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml
-2
View File
@@ -72,7 +72,6 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:padding="5dp"
android:text="@string/stock_planogram_add_sku_to_shelf" android:text="@string/stock_planogram_add_sku_to_shelf"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" /> android:textColor="@color/white" />
@@ -84,7 +83,6 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:padding="5dp"
android:text="@string/cancel" android:text="@string/cancel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" /> android:textColor="@color/white" />